integrating offline changes
This commit is contained in:
Lars Brubaker
parent
121623bad3
commit
3f8eeda65b
125 changed files with 5442 additions and 5434 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 2017, Lars Brubaker, John Lewin
|
||||
Copyright (c) 2023, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -54,329 +54,326 @@ using Polygons = System.Collections.Generic.List<System.Collections.Generic.List
|
|||
|
||||
namespace MatterHackers.MatterControl.DesignTools
|
||||
{
|
||||
[Obsolete("Use ImageToPathObject3D_2 instead", false)]
|
||||
public class ImageToPathObject3D : Object3D, IEditorDraw, IObject3DControlsProvider
|
||||
{
|
||||
private ThresholdFunctions _featureDetector = ThresholdFunctions.Silhouette;
|
||||
[Obsolete("Use ImageToPathObject3D_2 instead", false)]
|
||||
public class ImageToPathObject3D : Object3D, IEditorDraw, IObject3DControlsProvider
|
||||
{
|
||||
private ThresholdFunctions _featureDetector = ThresholdFunctions.Silhouette;
|
||||
|
||||
private ImageBuffer _histogramRawCache = null;
|
||||
private ImageBuffer _histogramDisplayCache = null;
|
||||
private ImageBuffer _histogramRawCache = null;
|
||||
private ImageBuffer _histogramDisplayCache = null;
|
||||
|
||||
public ImageToPathObject3D()
|
||||
{
|
||||
Name = "Image to Path".Localize();
|
||||
}
|
||||
public ImageToPathObject3D()
|
||||
{
|
||||
Name = "Image to Path".Localize();
|
||||
}
|
||||
|
||||
public enum ThresholdFunctions
|
||||
{
|
||||
Silhouette,
|
||||
Intensity,
|
||||
Alpha,
|
||||
Hue
|
||||
}
|
||||
public enum ThresholdFunctions
|
||||
{
|
||||
Silhouette,
|
||||
Intensity,
|
||||
Alpha,
|
||||
Hue
|
||||
}
|
||||
|
||||
[EnumRename("Alpha", "Transparency")]
|
||||
public ThresholdFunctions FeatureDetector
|
||||
{
|
||||
get
|
||||
{
|
||||
return _featureDetector;
|
||||
}
|
||||
[EnumRename("Alpha", "Transparency")]
|
||||
public ThresholdFunctions FeatureDetector
|
||||
{
|
||||
get
|
||||
{
|
||||
return _featureDetector;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (value != _featureDetector)
|
||||
{
|
||||
_histogramRawCache = null;
|
||||
_featureDetector = value;
|
||||
// make sure we create it
|
||||
var _ = this.Histogram;
|
||||
}
|
||||
}
|
||||
}
|
||||
set
|
||||
{
|
||||
if (value != _featureDetector)
|
||||
{
|
||||
_histogramRawCache = null;
|
||||
_featureDetector = value;
|
||||
// make sure we create it
|
||||
var _ = this.Histogram;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public ImageBuffer Histogram
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_histogramRawCache == null)
|
||||
{
|
||||
_histogramRawCache = new ImageBuffer(256, 100);
|
||||
var image = Image;
|
||||
if (image != null)
|
||||
{
|
||||
var counts = new int[_histogramRawCache.Width];
|
||||
var function = ThresholdFunction;
|
||||
[JsonIgnore]
|
||||
public ImageBuffer Histogram
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_histogramRawCache == null)
|
||||
{
|
||||
_histogramRawCache = new ImageBuffer(256, 100);
|
||||
var image = Image;
|
||||
if (image != null)
|
||||
{
|
||||
var counts = new int[_histogramRawCache.Width];
|
||||
var function = ThresholdFunction;
|
||||
|
||||
byte[] buffer = image.GetBuffer();
|
||||
int strideInBytes = image.StrideInBytes();
|
||||
for (int y = 0; y < image.Height; y++)
|
||||
{
|
||||
int imageBufferOffset = image.GetBufferOffsetY(y);
|
||||
int thresholdBufferOffset = y * image.Width;
|
||||
byte[] buffer = image.GetBuffer();
|
||||
int strideInBytes = image.StrideInBytes();
|
||||
for (int y = 0; y < image.Height; y++)
|
||||
{
|
||||
int imageBufferOffset = image.GetBufferOffsetY(y);
|
||||
int thresholdBufferOffset = y * image.Width;
|
||||
|
||||
for (int x = 0; x < image.Width; x++)
|
||||
{
|
||||
int imageBufferOffsetWithX = imageBufferOffset + x * 4;
|
||||
var color = GetRGBA(buffer, imageBufferOffsetWithX);
|
||||
counts[(int)(function.Transform(color) * (_histogramRawCache.Width - 1))]++;
|
||||
}
|
||||
}
|
||||
for (int x = 0; x < image.Width; x++)
|
||||
{
|
||||
int imageBufferOffsetWithX = imageBufferOffset + x * 4;
|
||||
var color = GetRGBA(buffer, imageBufferOffsetWithX);
|
||||
counts[(int)(function.Transform(color) * (_histogramRawCache.Width - 1))]++;
|
||||
}
|
||||
}
|
||||
|
||||
double max = counts.Select((value, index) => new { value, index })
|
||||
.OrderByDescending(vi => vi.value)
|
||||
.First().value;
|
||||
var graphics2D2 = _histogramRawCache.NewGraphics2D();
|
||||
graphics2D2.Clear(Color.White);
|
||||
for (int i = 0; i < 256; i++)
|
||||
{
|
||||
graphics2D2.Line(i, 0, i, Easing.Exponential.Out(counts[i] / max) * _histogramRawCache.Height, Color.Black);
|
||||
}
|
||||
}
|
||||
}
|
||||
double max = counts.Select((value, index) => new { value, index })
|
||||
.OrderByDescending(vi => vi.value)
|
||||
.First().value;
|
||||
var graphics2D2 = _histogramRawCache.NewGraphics2D();
|
||||
graphics2D2.Clear(Color.White);
|
||||
for (int i = 0; i < 256; i++)
|
||||
{
|
||||
graphics2D2.Line(i, 0, i, Easing.Exponential.Out(counts[i] / max) * _histogramRawCache.Height, Color.Black);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (_histogramDisplayCache == null)
|
||||
{
|
||||
_histogramDisplayCache = new ImageBuffer(_histogramRawCache);
|
||||
}
|
||||
if (_histogramDisplayCache == null)
|
||||
{
|
||||
_histogramDisplayCache = new ImageBuffer(_histogramRawCache);
|
||||
}
|
||||
|
||||
UpdateHistogramDisplay();
|
||||
UpdateHistogramDisplay();
|
||||
|
||||
return _histogramDisplayCache;
|
||||
}
|
||||
return _histogramDisplayCache;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
}
|
||||
}
|
||||
set
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateHistogramDisplay()
|
||||
{
|
||||
if (_histogramRawCache != null
|
||||
&& _histogramDisplayCache != null)
|
||||
{
|
||||
var graphics2D = _histogramDisplayCache.NewGraphics2D();
|
||||
graphics2D.Clear(Color.Transparent);
|
||||
_histogramDisplayCache.CopyFrom(_histogramRawCache);
|
||||
var rangeStart = RangeStart.Value(this);
|
||||
var rangeEnd = RangeEnd.Value(this);
|
||||
graphics2D.FillRectangle(0, 0, rangeStart * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.Red, 100));
|
||||
graphics2D.FillRectangle(rangeEnd * _histogramDisplayCache.Width, 0, 255, _histogramDisplayCache.Height, new Color(Color.Red, 100));
|
||||
graphics2D.Line(rangeStart * _histogramDisplayCache.Width, 0, rangeStart * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.LightGray, 200));
|
||||
graphics2D.Line(rangeEnd * _histogramDisplayCache.Width, 0, rangeEnd * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.LightGray, 200));
|
||||
}
|
||||
}
|
||||
private void UpdateHistogramDisplay()
|
||||
{
|
||||
if (_histogramRawCache != null
|
||||
&& _histogramDisplayCache != null)
|
||||
{
|
||||
var graphics2D = _histogramDisplayCache.NewGraphics2D();
|
||||
graphics2D.Clear(Color.Transparent);
|
||||
_histogramDisplayCache.CopyFrom(_histogramRawCache);
|
||||
var rangeStart = RangeStart.Value(this);
|
||||
var rangeEnd = RangeEnd.Value(this);
|
||||
graphics2D.FillRectangle(0, 0, rangeStart * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.Red, 100));
|
||||
graphics2D.FillRectangle(rangeEnd * _histogramDisplayCache.Width, 0, 255, _histogramDisplayCache.Height, new Color(Color.Red, 100));
|
||||
graphics2D.Line(rangeStart * _histogramDisplayCache.Width, 0, rangeStart * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.LightGray, 200));
|
||||
graphics2D.Line(rangeEnd * _histogramDisplayCache.Width, 0, rangeEnd * _histogramDisplayCache.Width, _histogramDisplayCache.Height, new Color(Color.LightGray, 200));
|
||||
}
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
private ImageBuffer Image => this.Descendants<ImageObject3D>().FirstOrDefault()?.Image;
|
||||
[JsonIgnore]
|
||||
private ImageBuffer Image => this.Descendants<ImageObject3D>().FirstOrDefault()?.Image;
|
||||
|
||||
[Slider(0, 1)]
|
||||
public DoubleOrExpression RangeStart { get; set; } = .1;
|
||||
[Slider(0, 1)]
|
||||
public DoubleOrExpression RangeStart { get; set; } = .1;
|
||||
|
||||
[Slider(0, 1)]
|
||||
public DoubleOrExpression RangeEnd { get; set; } = 1;
|
||||
[Slider(0, 1)]
|
||||
public DoubleOrExpression RangeEnd { get; set; } = 1;
|
||||
|
||||
private IThresholdFunction ThresholdFunction
|
||||
{
|
||||
get
|
||||
{
|
||||
switch (FeatureDetector)
|
||||
{
|
||||
case ThresholdFunctions.Silhouette:
|
||||
return new SilhouetteThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
private IThresholdFunction ThresholdFunction
|
||||
{
|
||||
get
|
||||
{
|
||||
switch (FeatureDetector)
|
||||
{
|
||||
case ThresholdFunctions.Silhouette:
|
||||
return new SilhouetteThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
|
||||
case ThresholdFunctions.Intensity:
|
||||
return new MapOnMaxIntensity(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
case ThresholdFunctions.Intensity:
|
||||
return new MapOnMaxIntensity(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
|
||||
case ThresholdFunctions.Alpha:
|
||||
return new AlphaThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
case ThresholdFunctions.Alpha:
|
||||
return new AlphaThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
|
||||
case ThresholdFunctions.Hue:
|
||||
return new HueThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
}
|
||||
case ThresholdFunctions.Hue:
|
||||
return new HueThresholdFunction(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
}
|
||||
|
||||
return new MapOnMaxIntensity(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
}
|
||||
}
|
||||
return new MapOnMaxIntensity(RangeStart.Value(this), RangeEnd.Value(this));
|
||||
}
|
||||
}
|
||||
|
||||
public void AddObject3DControls(Object3DControlsLayer object3DControlsLayer)
|
||||
{
|
||||
object3DControlsLayer.AddControls(ControlTypes.Standard2D);
|
||||
}
|
||||
public void AddObject3DControls(Object3DControlsLayer object3DControlsLayer)
|
||||
{
|
||||
object3DControlsLayer.AddControls(ControlTypes.Standard2D);
|
||||
}
|
||||
|
||||
public void DrawEditor(Object3DControlsLayer layer, DrawEventArgs e)
|
||||
{
|
||||
this.DrawPath();
|
||||
}
|
||||
public void DrawEditor(Object3DControlsLayer layer, DrawEventArgs e)
|
||||
{
|
||||
this.DrawPath();
|
||||
}
|
||||
|
||||
public AxisAlignedBoundingBox GetEditorWorldspaceAABB(Object3DControlsLayer layer)
|
||||
{
|
||||
return this.GetWorldspaceAabbOfDrawPath();
|
||||
}
|
||||
public AxisAlignedBoundingBox GetEditorWorldspaceAABB(Object3DControlsLayer layer)
|
||||
{
|
||||
return this.GetWorldspaceAabbOfDrawPath();
|
||||
}
|
||||
|
||||
public override bool CanApply => true;
|
||||
public override bool CanApply => true;
|
||||
|
||||
public override void Apply(UndoBuffer undoBuffer)
|
||||
{
|
||||
this.FlattenToPathObject(undoBuffer);
|
||||
}
|
||||
public override void Apply(UndoBuffer undoBuffer)
|
||||
{
|
||||
this.FlattenToPathObject(undoBuffer);
|
||||
}
|
||||
|
||||
public void GenerateMarchingSquaresAndLines(Action<double, string> progressReporter, ImageBuffer image, IThresholdFunction thresholdFunction)
|
||||
{
|
||||
if (image != null)
|
||||
{
|
||||
// Regenerate outline
|
||||
var marchingSquaresData = new MarchingSquaresByte(
|
||||
image,
|
||||
thresholdFunction.ZeroColor,
|
||||
thresholdFunction.Threshold,
|
||||
0);
|
||||
public void GenerateMarchingSquaresAndLines(Action<double, string> progressReporter, ImageBuffer image, IThresholdFunction thresholdFunction)
|
||||
{
|
||||
if (image != null)
|
||||
{
|
||||
// Regenerate outline
|
||||
var marchingSquaresData = new MarchingSquaresByte(
|
||||
image,
|
||||
thresholdFunction.ZeroColor,
|
||||
thresholdFunction.Threshold,
|
||||
0);
|
||||
|
||||
progressReporter?.Invoke(0, "Creating Outline");
|
||||
progressReporter?.Invoke(0, "Creating Outline");
|
||||
|
||||
marchingSquaresData.CreateLineSegments();
|
||||
progressReporter?.Invoke(.1, null);
|
||||
marchingSquaresData.CreateLineSegments();
|
||||
progressReporter?.Invoke(.1, null);
|
||||
|
||||
int pixelsToIntPointsScale = 1000;
|
||||
var lineLoops = marchingSquaresData.CreateLineLoops(pixelsToIntPointsScale);
|
||||
int pixelsToIntPointsScale = 1000;
|
||||
var lineLoops = marchingSquaresData.CreateLineLoops(pixelsToIntPointsScale);
|
||||
|
||||
progressReporter?.Invoke(.15, null);
|
||||
progressReporter?.Invoke(.15, null);
|
||||
|
||||
var min = new IntPoint(-10, -10);
|
||||
var max = new IntPoint(10 + image.Width * pixelsToIntPointsScale, 10 + image.Height * pixelsToIntPointsScale);
|
||||
var min = new IntPoint(-10, -10);
|
||||
var max = new IntPoint(10 + image.Width * pixelsToIntPointsScale, 10 + image.Height * pixelsToIntPointsScale);
|
||||
|
||||
var boundingPoly = new Polygon();
|
||||
boundingPoly.Add(min);
|
||||
boundingPoly.Add(new IntPoint(min.X, max.Y));
|
||||
boundingPoly.Add(max);
|
||||
boundingPoly.Add(new IntPoint(max.X, min.Y));
|
||||
var boundingPoly = new Polygon();
|
||||
boundingPoly.Add(min);
|
||||
boundingPoly.Add(new IntPoint(min.X, max.Y));
|
||||
boundingPoly.Add(max);
|
||||
boundingPoly.Add(new IntPoint(max.X, min.Y));
|
||||
|
||||
// now clip the polygons to get the inside and outside polys
|
||||
var clipper = new Clipper();
|
||||
clipper.AddPaths(lineLoops, PolyType.ptSubject, true);
|
||||
clipper.AddPath(boundingPoly, PolyType.ptClip, true);
|
||||
// now clip the polygons to get the inside and outside polys
|
||||
var clipper = new Clipper();
|
||||
clipper.AddPaths(lineLoops, PolyType.ptSubject, true);
|
||||
clipper.AddPath(boundingPoly, PolyType.ptClip, true);
|
||||
|
||||
var polygonShape = new Polygons();
|
||||
progressReporter?.Invoke(.3, null);
|
||||
var polygonShape = new Polygons();
|
||||
progressReporter?.Invoke(.3, null);
|
||||
|
||||
clipper.Execute(ClipType.ctIntersection, polygonShape);
|
||||
clipper.Execute(ClipType.ctIntersection, polygonShape);
|
||||
|
||||
progressReporter?.Invoke(.55, null);
|
||||
progressReporter?.Invoke(.55, null);
|
||||
|
||||
polygonShape = Clipper.CleanPolygons(polygonShape, 100);
|
||||
polygonShape = Clipper.CleanPolygons(polygonShape, 100);
|
||||
|
||||
progressReporter?.Invoke(.75, null);
|
||||
progressReporter?.Invoke(.75, null);
|
||||
|
||||
VertexStorage rawVectorShape = polygonShape.PolygonToPathStorage();
|
||||
VertexStorage rawVectorShape = polygonShape.PolygonToPathStorage();
|
||||
|
||||
var aabb = this.VisibleMeshes().FirstOrDefault().GetAxisAlignedBoundingBox();
|
||||
var xScale = aabb.XSize / image.Width;
|
||||
var aabb = this.VisibleMeshes().FirstOrDefault().GetAxisAlignedBoundingBox();
|
||||
var xScale = aabb.XSize / image.Width;
|
||||
|
||||
var affine = Affine.NewScaling(1.0 / pixelsToIntPointsScale * xScale);
|
||||
affine *= Affine.NewTranslation(-aabb.XSize / 2, -aabb.YSize / 2);
|
||||
var affine = Affine.NewScaling(1.0 / pixelsToIntPointsScale * xScale);
|
||||
affine *= Affine.NewTranslation(-aabb.XSize / 2, -aabb.YSize / 2);
|
||||
|
||||
rawVectorShape.transform(affine);
|
||||
this.VertexStorage = rawVectorShape;
|
||||
rawVectorShape.transform(affine);
|
||||
this.VertexStorage = rawVectorShape;
|
||||
|
||||
progressReporter?.Invoke(1, null);
|
||||
}
|
||||
}
|
||||
progressReporter?.Invoke(1, null);
|
||||
}
|
||||
}
|
||||
|
||||
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
|
||||
{
|
||||
if (invalidateArgs.InvalidateType.HasFlag(InvalidateType.Image)
|
||||
&& invalidateArgs.Source != this
|
||||
&& !RebuildLocked)
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
else if (SheetObject3D.NeedsRebuild(this, invalidateArgs))
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
|
||||
{
|
||||
if (invalidateArgs.InvalidateType.HasFlag(InvalidateType.Image)
|
||||
&& invalidateArgs.Source != this
|
||||
&& !RebuildLocked)
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
else if (Expressions.NeedRebuild(this, invalidateArgs))
|
||||
{
|
||||
await Rebuild();
|
||||
}
|
||||
|
||||
base.OnInvalidate(invalidateArgs);
|
||||
}
|
||||
base.OnInvalidate(invalidateArgs);
|
||||
}
|
||||
|
||||
private Color GetRGBA(byte[] buffer, int offset)
|
||||
{
|
||||
return new Color(buffer[offset + 2], buffer[offset + 1], buffer[offset + 0], buffer[offset + 3]);
|
||||
}
|
||||
private Color GetRGBA(byte[] buffer, int offset)
|
||||
{
|
||||
return new Color(buffer[offset + 2], buffer[offset + 1], buffer[offset + 0], buffer[offset + 3]);
|
||||
}
|
||||
|
||||
public override Task Rebuild()
|
||||
{
|
||||
this.DebugDepth("Rebuild");
|
||||
public override Task Rebuild()
|
||||
{
|
||||
this.DebugDepth("Rebuild");
|
||||
|
||||
UpdateHistogramDisplay();
|
||||
bool propertyUpdated = false;
|
||||
var minSeparation = .01;
|
||||
var rangeStart = RangeStart.Value(this);
|
||||
var rangeEnd = RangeEnd.Value(this);
|
||||
if (rangeStart < 0
|
||||
|| rangeStart > 1
|
||||
|| rangeEnd < 0
|
||||
|| rangeEnd > 1
|
||||
|| rangeStart > rangeEnd - minSeparation)
|
||||
{
|
||||
rangeStart = Math.Max(0, Math.Min(1 - minSeparation, rangeStart));
|
||||
rangeEnd = Math.Max(0, Math.Min(1, rangeEnd));
|
||||
if (rangeStart > rangeEnd - minSeparation)
|
||||
{
|
||||
// values are overlapped or too close together
|
||||
if (rangeEnd < 1 - minSeparation)
|
||||
{
|
||||
// move the end up whenever possible
|
||||
rangeEnd = rangeStart + minSeparation;
|
||||
}
|
||||
else
|
||||
{
|
||||
// move the end to the end and the start up
|
||||
rangeEnd = 1;
|
||||
RangeStart = 1 - minSeparation;
|
||||
}
|
||||
}
|
||||
UpdateHistogramDisplay();
|
||||
bool propertyUpdated = false;
|
||||
var minSeparation = .01;
|
||||
var rangeStart = RangeStart.Value(this);
|
||||
var rangeEnd = RangeEnd.Value(this);
|
||||
if (rangeStart < 0
|
||||
|| rangeStart > 1
|
||||
|| rangeEnd < 0
|
||||
|| rangeEnd > 1
|
||||
|| rangeStart > rangeEnd - minSeparation)
|
||||
{
|
||||
rangeStart = Math.Max(0, Math.Min(1 - minSeparation, rangeStart));
|
||||
rangeEnd = Math.Max(0, Math.Min(1, rangeEnd));
|
||||
if (rangeStart > rangeEnd - minSeparation)
|
||||
{
|
||||
// values are overlapped or too close together
|
||||
if (rangeEnd < 1 - minSeparation)
|
||||
{
|
||||
// move the end up whenever possible
|
||||
rangeEnd = rangeStart + minSeparation;
|
||||
}
|
||||
else
|
||||
{
|
||||
// move the end to the end and the start up
|
||||
rangeEnd = 1;
|
||||
RangeStart = 1 - minSeparation;
|
||||
}
|
||||
}
|
||||
|
||||
propertyUpdated = true;
|
||||
}
|
||||
propertyUpdated = true;
|
||||
}
|
||||
|
||||
var rebuildLock = RebuildLock();
|
||||
// now create a long running task to process the image
|
||||
return ApplicationController.Instance.Tasks.Execute(
|
||||
"Calculate Path".Localize(),
|
||||
null,
|
||||
(reporter, cancellationToken) =>
|
||||
{
|
||||
var progressStatus = new ProgressStatus();
|
||||
this.GenerateMarchingSquaresAndLines(
|
||||
(progress0to1, status) =>
|
||||
{
|
||||
progressStatus.Progress0To1 = progress0to1;
|
||||
progressStatus.Status = status;
|
||||
reporter.Report(progressStatus);
|
||||
},
|
||||
Image,
|
||||
ThresholdFunction);
|
||||
var rebuildLock = RebuildLock();
|
||||
// now create a long running task to process the image
|
||||
return ApplicationController.Instance.Tasks.Execute(
|
||||
"Calculate Path".Localize(),
|
||||
null,
|
||||
(reporter, cancellationToken) =>
|
||||
{
|
||||
this.GenerateMarchingSquaresAndLines(
|
||||
(progress0to1, status) =>
|
||||
{
|
||||
reporter?.Invoke(progress0to1, status);
|
||||
},
|
||||
Image,
|
||||
ThresholdFunction);
|
||||
|
||||
if (propertyUpdated)
|
||||
{
|
||||
UpdateHistogramDisplay();
|
||||
this.Invalidate(InvalidateType.Properties);
|
||||
}
|
||||
if (propertyUpdated)
|
||||
{
|
||||
UpdateHistogramDisplay();
|
||||
this.Invalidate(InvalidateType.Properties);
|
||||
}
|
||||
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
rebuildLock.Dispose();
|
||||
this.CancelAllParentBuilding();
|
||||
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Path));
|
||||
});
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
rebuildLock.Dispose();
|
||||
this.CancelAllParentBuilding();
|
||||
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Path));
|
||||
});
|
||||
|
||||
return Task.CompletedTask;
|
||||
});
|
||||
}
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue