diff --git a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs index 7bf9a8279..391937d29 100644 --- a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs @@ -47,7 +47,7 @@ using Newtonsoft.Json; namespace MatterHackers.MatterControl.DesignTools.Operations { - public class LinearExtrudeObject3D : Object3D, IObject3DControlsProvider + public class LinearExtrudeObject3D : Object3D #if DEBUG , IPropertyGridModifier #endif @@ -86,24 +86,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } } - public void AddObject3DControls(Object3DControlsLayer object3DControlsLayer) - { - double getHeight() => Height.Value(this); - void setHeight(double height) => Height = height; - object3DControlsLayer.Object3DControls.Add(new ScaleHeightControl(object3DControlsLayer, - null, - null, - null, - null, - getHeight, - setHeight, - null, - null)); - object3DControlsLayer.AddControls(ControlTypes.ScaleMatrixXY); - object3DControlsLayer.AddControls(ControlTypes.MoveInZ); - object3DControlsLayer.AddControls(ControlTypes.RotateXYZ); - } - public override void Flatten(UndoBuffer undoBuffer) { if (Mesh == null) diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index 0cdbb81d1..9fed494e0 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -371,12 +371,16 @@ namespace MatterHackers.MatterControl.DesignTools } var changeDueToSlider = false; + var changeDueToField = false; var initialSliderValue = true; slider.ValueChanged += (s, e) => { - changeDueToSlider = true; - setFieldValue(GetFieldFromSlider0To1()); - changeDueToSlider = false; + if (!changeDueToField) + { + changeDueToSlider = true; + setFieldValue(GetFieldFromSlider0To1()); + changeDueToSlider = false; + } }; double sliderDownValue = 0; @@ -429,7 +433,9 @@ namespace MatterHackers.MatterControl.DesignTools { if (!changeDueToSlider) { + changeDueToField = true; slider.Value = GetSlider0To1FromField(); + changeDueToField = false; } }; @@ -458,7 +464,9 @@ namespace MatterHackers.MatterControl.DesignTools { if (!changeDueToSlider) { + changeDueToField = true; slider.Value = GetSlider0To1FromField(); + changeDueToField = false; } }; diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs index bd0daab49..80cb8bb79 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs @@ -174,7 +174,9 @@ namespace MatterHackers.MatterControl.DesignTools var name = agg_basics.GetNonCollidingName(editSelectedName.Text, existingNames); editSelectedName.Text = name; sheetData[selectedCell.x, selectedCell.y].Name = name; + sheetData.Recalculate(); } + private void SelectCell(int x, int y) { if (selectedCell.x != -1)