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

Improving name changes in sheet editor

Browse source
This commit is contained in:
Lars Brubaker 2021-09-02 17:12:32 -07:00
parent b46d9ea061
commit 0b3778adc7
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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)

14
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -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;
}
};

2
MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs
View file

@ -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)