From 999bad8230c9ba65f71eca069314ca931128f77a Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 11 Apr 2023 17:36:14 -0700 Subject: [PATCH] improving outline path --- .../DesignTools/Operations/Path/OutlinePathObject3D.cs | 4 ++-- .../Providers/MatterControl/DesignAppsCollectionContainer.cs | 2 -- .../Library/Providers/MatterControl/Primitives2DContainer.cs | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs index cfcb3bf04..6ed7a0c81 100644 --- a/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs @@ -96,13 +96,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public override Task Rebuild() { this.DebugDepth("Rebuild"); - bool valuesChanged = false; var outlineWidth = OutlineWidth.Value(this); if (outlineWidth < .01 || outlineWidth > 1000) { OutlineWidth = Math.Min(1000, Math.Max(.01, outlineWidth)); - valuesChanged = true; } using (RebuildLock()) @@ -131,6 +129,8 @@ namespace MatterHackers.MatterControl.DesignTools.Operations var aPolys = path.CreatePolygons(); + aPolys = aPolys.GetCorrectedWinding(); + var offseter = new ClipperOffset(); var outlineWidth = OutlineWidth.Value(this); diff --git a/MatterControlLib/Library/Providers/MatterControl/DesignAppsCollectionContainer.cs b/MatterControlLib/Library/Providers/MatterControl/DesignAppsCollectionContainer.cs index 1c7cb5d46..068b55581 100644 --- a/MatterControlLib/Library/Providers/MatterControl/DesignAppsCollectionContainer.cs +++ b/MatterControlLib/Library/Providers/MatterControl/DesignAppsCollectionContainer.cs @@ -76,7 +76,6 @@ namespace MatterHackers.MatterControl.Library IsReadOnly = true }); -#if DEBUG this.ChildContainers.Add( new DynamicContainerLink( "Primitives 2D".Localize(), @@ -86,7 +85,6 @@ namespace MatterHackers.MatterControl.Library { IsReadOnly = true }); -#endif #if DEBUG int index = 0; diff --git a/MatterControlLib/Library/Providers/MatterControl/Primitives2DContainer.cs b/MatterControlLib/Library/Providers/MatterControl/Primitives2DContainer.cs index 103b5a489..26a7fa53b 100644 --- a/MatterControlLib/Library/Providers/MatterControl/Primitives2DContainer.cs +++ b/MatterControlLib/Library/Providers/MatterControl/Primitives2DContainer.cs @@ -58,6 +58,7 @@ namespace MatterHackers.MatterControl.Library "Box".Localize(), async () => await BoxPathObject3D.Create()) { DateCreated = new DateTime(index++) }, +#if DEBUG new GeneratorItem( "Triangle".Localize(), async () => await PyramidObject3D.Create()) @@ -86,6 +87,7 @@ namespace MatterHackers.MatterControl.Library "Circle".Localize(), async () => await SphereObject3D.Create()) { DateCreated = new DateTime(index++) }, +#endif }; string title = "2D Shapes".Localize();