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

Scale height control can scale proportional

Browse source
This commit is contained in:
LarsBrubaker 2021-05-01 09:20:15 -07:00
parent ee65c180c2
commit 100ddf2bfa
4 changed files with 65 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

45
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleHeightControl.cs
View file

@ -58,14 +58,14 @@ namespace MatterHackers.Plugins.EditorTools
private bool hadClickOnControl;
private double heightOnMouseDown = 0;
private PlaneShape hitPlane;
private Vector3 initialHitPosition;
private Vector3 originalPointToMove;
private ScaleController scaleController = new ScaleController();
public ScaleHeightControl(IObject3DControlContext context)
: base(context)
{
@ -118,7 +118,7 @@ namespace MatterHackers.Plugins.EditorTools
Invalidate();
SetHeightUndo(heightValueDisplayInfo.Value, heightObject.Height);
scaleController.EditComplete();
}
};
@ -143,10 +143,7 @@ namespace MatterHackers.Plugins.EditorTools
if (selectedItem != null
&& MouseDownOnControl)
{
if (activeSelectedItem is IObjectWithHeight heightObject)
{
heightObject.Height = heightOnMouseDown;
}
scaleController.Cancel();
MouseDownOnControl = false;
MouseIsOver = false;
@ -262,10 +259,7 @@ namespace MatterHackers.Plugins.EditorTools
hitPlane = new PlaneShape(new Plane(planeNormal, mouseEvent3D.info.HitPosition), null);
initialHitPosition = mouseEvent3D.info.HitPosition;
if (selectedItem is IObjectWithHeight heightObject)
{
heightOnMouseDown = heightObject.Height;
}
scaleController.SetInitialState(Object3DControlContext);
Object3DControlContext.Scene.ShowSelectionShadow = false;
}
@ -318,12 +312,7 @@ namespace MatterHackers.Plugins.EditorTools
newSize = ((int)((newSize / snapGridDistance) + .5)) * snapGridDistance;
}
if (selectedItem is IObjectWithHeight heightObject)
{
heightObject.Height = newSize;
selectedItem.Invalidate(new InvalidateArgs(selectedItem, InvalidateType.DisplayValues));
}
scaleController.ScaleHeight(newSize);
await selectedItem.Rebuild();
@ -343,9 +332,9 @@ namespace MatterHackers.Plugins.EditorTools
if (MouseDownOnControl)
{
if (activeSelectedItem is IObjectWithHeight heightObject
&& heightObject.Height != heightOnMouseDown)
&& heightObject.Height != scaleController.InitialState.Height)
{
SetHeightUndo(heightObject.Height, heightOnMouseDown);
scaleController.EditComplete();
}
Object3DControlContext.Scene.ShowSelectionShadow = true;
@ -421,23 +410,5 @@ namespace MatterHackers.Plugins.EditorTools
}
}
}
private void SetHeightUndo(double doHeight, double undoHeight)
{
if (activeSelectedItem is IObjectWithHeight heightObject)
{
var undoBuffer = Object3DControlContext.Scene.UndoBuffer;
undoBuffer.AddAndDo(new UndoRedoActions(() =>
{
heightObject.Height = undoHeight;
activeSelectedItem?.Invalidate(new InvalidateArgs(activeSelectedItem, InvalidateType.Properties));
},
() =>
{
heightObject.Height = doHeight;
activeSelectedItem?.Invalidate(new InvalidateArgs(activeSelectedItem, InvalidateType.Properties));
}));
}
}
}
}