nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Making paths behave more consistently

Browse source
This commit is contained in:
Lars Brubaker 2020-10-16 16:25:11 -07:00
parent 7c5a764162
commit 864266bd7a
18 changed files with 466 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs
View file

@ -95,6 +95,8 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
using (RebuildLock())
{
InsetPath();
// set the mesh to show the path
this.Mesh = this.VertexSource.Extrude(Constants.PathPolygonsHeight);
}
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Path));

4
MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs
View file

@ -147,9 +147,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
Mesh = VertexSourceToMesh.Extrude(this.VertexSource,
Height,
bevel);
Mesh = VertexSourceToMesh.Extrude(this.VertexSource, Height, bevel);
if (Mesh.Vertices.Count == 0)
{
Mesh = null;

39
MatterControlLib/DesignTools/Operations/Path/CombinePathObject3D.cs → MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs
View file

@ -36,19 +36,22 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.VertexSource;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.PolygonMesh;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools.Operations
{
public class CombinePathObject3D : OperationSourceContainerObject3D, IPathObject, IEditorDraw, IObject3DControlsProvider
public class MergePathObject3D : OperationSourceContainerObject3D, IPathObject, IEditorDraw, IObject3DControlsProvider
{
public CombinePathObject3D()
private bool union;
private string operationName;
public MergePathObject3D(string name, bool union)
{
Name = "Combine";
this.operationName = name;
this.union = union;
Name = name;
}
public IVertexSource VertexSource { get; set; } = new VertexStorage();
@ -70,7 +73,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
var rebuildLocks = this.RebuilLockAll();
return ApplicationController.Instance.Tasks.Execute(
"Combine".Localize(),
operationName,
null,
(reporter, cancellationToken) =>
{
@ -79,24 +82,22 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
try
{
Combine(cancellationToken, reporter);
Merge(reporter, cancellationToken);
}
catch
{
}
// set the mesh to show the path
this.Mesh = this.VertexSource.Extrude(Constants.PathPolygonsHeight);
rebuildLocks.Dispose();
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
return Task.CompletedTask;
});
}
public void Combine()
{
Combine(CancellationToken.None, null);
}
private void Combine(CancellationToken cancellationToken, IProgress<ProgressStatus> reporter)
private void Merge(IProgress<ProgressStatus> reporter, CancellationToken cancellationToken)
{
SourceContainer.Visible = true;
RemoveAllButSource();
@ -131,7 +132,14 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
var itemVertexSource = pathItem.VertexSource.Transform(item.Matrix);
resultsVertexSource = resultsVertexSource.Union(itemVertexSource);
if (union)
{
resultsVertexSource = resultsVertexSource.Union(itemVertexSource);
}
else
{
resultsVertexSource = resultsVertexSource.MergePaths(itemVertexSource, ClipperLib.ClipType.ctIntersection);
}
percentCompleted += amountPerOperation;
progressStatus.Progress0To1 = percentCompleted;
@ -140,8 +148,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
this.VertexSource = resultsVertexSource;
// set the mesh to show the path
this.Mesh = resultsVertexSource.Extrude(.1);
SourceContainer.Visible = false;
}
}

2
MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs
View file

@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
InsetPath();
// set the mesh to show the path
this.Mesh = VertexSource.Extrude(.1);
this.Mesh = this.VertexSource.Extrude(Constants.PathPolygonsHeight);
}
if (valuesChanged)

3
MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs
View file

@ -94,6 +94,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
DoSmoothing((long)(SmoothDistance * 1000), Iterations);
// set the mesh to show the path
this.Mesh = this.VertexSource.Extrude(Constants.PathPolygonsHeight);
rebuildLock.Dispose();
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Path));
return Task.CompletedTask;