From c35fdde3046ebb8b45b762d381956abcbbf3064b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 1 Oct 2021 12:28:06 -0700 Subject: [PATCH] updating value updating --- .../DesignTools/Obsolete/CurveObject3D.cs | 5 +---- .../OpenSCAD/OpenScadScriptObject3D.cs | 5 +---- .../DesignTools/Operations/CurveObject3D_2.cs | 5 +---- .../Operations/DecimateObject3D.cs | 5 +---- .../Operations/FindSliceObject3D.cs | 5 +---- .../Operations/HollowOutObject3D.cs | 5 +---- .../Operations/Path/LinearExtrudeObject3D.cs | 5 +---- .../Operations/Path/OutlinePathObject3D.cs | 5 +---- .../Operations/Path/RevolveObject3D.cs | 5 +---- .../Operations/PlaneCutObject3D.cs | 20 ++++++++++--------- .../DesignTools/Operations/RepairObject3D.cs | 5 +---- .../DesignTools/Primitives/CubeObject3D.cs | 5 +---- .../Primitives/HalfCylinderObject3D.cs | 5 +---- .../Primitives/HalfSphereObject3D.cs | 5 +---- .../DesignTools/Primitives/RingObject3D.cs | 5 +---- .../Primitives/SetTemperatureObject3D.cs | 5 +---- .../DesignTools/Primitives/SphereObject3D.cs | 5 +---- .../Primitives/TemperatureTowerObject3D.cs | 5 +---- .../DesignTools/Primitives/TorusObject3D.cs | 5 +---- .../DesignTools/Primitives/WedgeObject3D.cs | 5 +---- .../DesignTools/Primitives/WedgeObject3D_2.cs | 5 +---- 21 files changed, 31 insertions(+), 89 deletions(-) diff --git a/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs b/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs index 649fdb564..c27e9d102 100644 --- a/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs +++ b/MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs @@ -195,10 +195,7 @@ namespace MatterHackers.MatterControl.DesignTools } Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); return Task.CompletedTask; } diff --git a/MatterControlLib/DesignTools/OpenSCAD/OpenScadScriptObject3D.cs b/MatterControlLib/DesignTools/OpenSCAD/OpenScadScriptObject3D.cs index cc0e4e54b..0d500fb36 100644 --- a/MatterControlLib/DesignTools/OpenSCAD/OpenScadScriptObject3D.cs +++ b/MatterControlLib/DesignTools/OpenSCAD/OpenScadScriptObject3D.cs @@ -89,10 +89,7 @@ namespace MatterHackers.MatterControl.Library } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs b/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs index cfe504612..fe74ae557 100644 --- a/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs +++ b/MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs @@ -226,10 +226,7 @@ namespace MatterHackers.MatterControl.DesignTools UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Operations/DecimateObject3D.cs b/MatterControlLib/DesignTools/Operations/DecimateObject3D.cs index 34f2e56f9..f3b618e1f 100644 --- a/MatterControlLib/DesignTools/Operations/DecimateObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/DecimateObject3D.cs @@ -170,10 +170,7 @@ namespace MatterHackers.MatterControl.DesignTools UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs b/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs index eb70b6f51..5cb0fae41 100644 --- a/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs @@ -180,10 +180,7 @@ namespace MatterHackers.MatterControl.DesignTools UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Operations/HollowOutObject3D.cs b/MatterControlLib/DesignTools/Operations/HollowOutObject3D.cs index 9ab3e1919..991f609a8 100644 --- a/MatterControlLib/DesignTools/Operations/HollowOutObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/HollowOutObject3D.cs @@ -142,10 +142,7 @@ namespace MatterHackers.MatterControl.DesignTools UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs index 48902d543..e6fc9d3c3 100644 --- a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs @@ -185,10 +185,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations UiThread.RunOnIdle(() => { rebuildLock.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); }); diff --git a/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs index c92a04954..91814764e 100644 --- a/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/OutlinePathObject3D.cs @@ -111,10 +111,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations this.Mesh = this.VertexSource.Extrude(Constants.PathPolygonsHeight); } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Path)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs index 115aad09b..869b0f0b0 100644 --- a/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs @@ -168,10 +168,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations Sides = agg_basics.Clamp(sides, 3, 360, ref valuesChanged); } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); var rebuildLock = RebuildLock(); // now create a long running task to process the image diff --git a/MatterControlLib/DesignTools/Operations/PlaneCutObject3D.cs b/MatterControlLib/DesignTools/Operations/PlaneCutObject3D.cs index dff4623e4..d4653c72b 100644 --- a/MatterControlLib/DesignTools/Operations/PlaneCutObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/PlaneCutObject3D.cs @@ -155,20 +155,22 @@ namespace MatterHackers.MatterControl.DesignTools newChildren.Add(newMesh); } - RemoveAllButSource(); - SourceContainer.Visible = false; - foreach (var child in newChildren) + var sourceContainer = SourceContainer; + this.Children.Modify(list => { - this.Children.Add(child); - } + list.Clear(); + list.Add(sourceContainer); + foreach (var child in newChildren) + { + list.Add(child); + } + sourceContainer.Visible = false; + }); UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Operations/RepairObject3D.cs b/MatterControlLib/DesignTools/Operations/RepairObject3D.cs index 178ce0c14..93f363b80 100644 --- a/MatterControlLib/DesignTools/Operations/RepairObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/RepairObject3D.cs @@ -105,10 +105,7 @@ namespace MatterHackers.MatterControl.DesignTools UiThread.RunOnIdle(() => { rebuildLocks.Dispose(); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children)); }); diff --git a/MatterControlLib/DesignTools/Primitives/CubeObject3D.cs b/MatterControlLib/DesignTools/Primitives/CubeObject3D.cs index 2b0a5946f..e7ba0ce1f 100644 --- a/MatterControlLib/DesignTools/Primitives/CubeObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/CubeObject3D.cs @@ -129,10 +129,7 @@ namespace MatterHackers.MatterControl.DesignTools var roundSegments = RoundSegments.ClampIfNotCalculated(this, 1, 90, ref valuesChanged); var roundRadius = Radius.ClampIfNotCalculated(this, 0, Math.Min(width, Math.Min(depth, height)) / 2, ref valuesChanged); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); using (RebuildLock()) { diff --git a/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs index b3103f427..010ad0714 100644 --- a/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs @@ -109,10 +109,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs index 47789aaa8..cba804430 100644 --- a/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs @@ -132,10 +132,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/RingObject3D.cs b/MatterControlLib/DesignTools/Primitives/RingObject3D.cs index 670df2631..f27c2c082 100644 --- a/MatterControlLib/DesignTools/Primitives/RingObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/RingObject3D.cs @@ -229,10 +229,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/SetTemperatureObject3D.cs b/MatterControlLib/DesignTools/Primitives/SetTemperatureObject3D.cs index b99590852..d6448ced1 100644 --- a/MatterControlLib/DesignTools/Primitives/SetTemperatureObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/SetTemperatureObject3D.cs @@ -100,10 +100,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); UpdateTexture(); diff --git a/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs b/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs index 70e34e1c9..d52e01ae4 100644 --- a/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/SphereObject3D.cs @@ -153,10 +153,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs b/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs index 7e0a4413d..f9d3fa70e 100644 --- a/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs @@ -183,10 +183,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs b/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs index 2c4c6ac51..a65d50d5f 100644 --- a/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/TorusObject3D.cs @@ -155,10 +155,7 @@ namespace MatterHackers.MatterControl.DesignTools } } - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh)); return Task.CompletedTask; diff --git a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs index 9889da906..3eefef860 100644 --- a/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs @@ -101,10 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools var roundSegments = RoundSegments.ClampIfNotCalculated(this, 2, 90, ref valuesChanged); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); using (RebuildLock()) { diff --git a/MatterControlLib/DesignTools/Primitives/WedgeObject3D_2.cs b/MatterControlLib/DesignTools/Primitives/WedgeObject3D_2.cs index a7bacc2dc..138f0774b 100644 --- a/MatterControlLib/DesignTools/Primitives/WedgeObject3D_2.cs +++ b/MatterControlLib/DesignTools/Primitives/WedgeObject3D_2.cs @@ -104,10 +104,7 @@ namespace MatterHackers.MatterControl.DesignTools var roundSegments = RoundSegments.ClampIfNotCalculated(this, 2, 90, ref valuesChanged); - if (valuesChanged) - { - Invalidate(InvalidateType.DisplayValues); - } + Invalidate(InvalidateType.DisplayValues); using (RebuildLock()) {