diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index fb345c6b1..cdc4849d2 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -3195,7 +3195,7 @@ Support and tutorials: var view3D = systemWindow.Descendants().Where((v) => v.ActuallyVisibleOnScreen()).FirstOrDefault(); var printerTabPage = systemWindow.Descendants().Where((v) => v.ActuallyVisibleOnScreen()).FirstOrDefault(); var offsetDist = 50; - var arrowKeyOpperation = keyEvent.Shift ? TrackBallTransformType.Translation : TrackBallTransformType.Rotation; + var arrowKeyOperation = keyEvent.Shift ? TrackBallTransformType.Translation : TrackBallTransformType.Rotation; var gcode2D = systemWindow.Descendants().Where((v) => v.ActuallyVisibleOnScreen()).FirstOrDefault(); @@ -3364,7 +3364,7 @@ Support and tutorials: } foreach (var interactionVolume in view3D.InteractionLayer.InteractionVolumes) { - interactionVolume.CancelOpperation(); + interactionVolume.CancelOperation(); } break; @@ -3378,7 +3378,7 @@ Support and tutorials: else { // move or rotate view left - Offset3DView(view3D, new Vector2(-offsetDist, 0), arrowKeyOpperation); + Offset3DView(view3D, new Vector2(-offsetDist, 0), arrowKeyOperation); } keyEvent.Handled = true; @@ -3395,7 +3395,7 @@ Support and tutorials: else { // move or rotate view right - Offset3DView(view3D, new Vector2(offsetDist, 0), arrowKeyOpperation); + Offset3DView(view3D, new Vector2(offsetDist, 0), arrowKeyOperation); } keyEvent.Handled = true; @@ -3411,7 +3411,7 @@ Support and tutorials: } else { - Offset3DView(view3D, new Vector2(0, offsetDist), arrowKeyOpperation); + Offset3DView(view3D, new Vector2(0, offsetDist), arrowKeyOperation); } keyEvent.Handled = true; @@ -3427,7 +3427,7 @@ Support and tutorials: } else { - Offset3DView(view3D, new Vector2(0, -offsetDist), arrowKeyOpperation); + Offset3DView(view3D, new Vector2(0, -offsetDist), arrowKeyOperation); } keyEvent.Handled = true; @@ -3532,11 +3532,11 @@ Support and tutorials: return systemWindow; } - private static void Offset3DView(View3DWidget view3D, Vector2 offset, TrackBallTransformType opperation) + private static void Offset3DView(View3DWidget view3D, Vector2 offset, TrackBallTransformType operation) { var center = view3D.TrackballTumbleWidget.LocalBounds.Center; - view3D.TrackballTumbleWidget.TrackBallController.OnMouseDown(center, Matrix4X4.Identity, opperation); + view3D.TrackballTumbleWidget.TrackBallController.OnMouseDown(center, Matrix4X4.Identity, operation); view3D.TrackballTumbleWidget.TrackBallController.OnMouseMove(center + offset); view3D.TrackballTumbleWidget.TrackBallController.OnMouseUp(); view3D.TrackballTumbleWidget.Invalidate(); diff --git a/MatterControlLib/DesignTools/EditorTools/RotateControls/RotateCornerControl.cs b/MatterControlLib/DesignTools/EditorTools/RotateControls/RotateCornerControl.cs index 0600b6aec..1ce6aefb9 100644 --- a/MatterControlLib/DesignTools/EditorTools/RotateControls/RotateCornerControl.cs +++ b/MatterControlLib/DesignTools/EditorTools/RotateControls/RotateCornerControl.cs @@ -433,7 +433,7 @@ namespace MatterHackers.Plugins.EditorTools base.OnMouseUp(mouseEvent3D); } - public override void CancelOpperation() + public override void CancelOperation() { IObject3D selectedItem = RootSelection; if (selectedItem != null @@ -450,7 +450,7 @@ namespace MatterHackers.Plugins.EditorTools InteractionContext.Scene.ShowSelectionShadow = true; } - base.CancelOpperation(); + base.CancelOperation(); } public override void SetPosition(IObject3D selectedItem) diff --git a/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleCornerControl.cs b/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleCornerControl.cs index a268ab7d7..e0bd20a54 100644 --- a/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleCornerControl.cs +++ b/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleCornerControl.cs @@ -345,7 +345,7 @@ namespace MatterHackers.Plugins.EditorTools base.OnMouseUp(mouseEvent3D); } - public override void CancelOpperation() + public override void CancelOperation() { IObject3D selectedItem = RootSelection; if (selectedItem != null @@ -359,7 +359,7 @@ namespace MatterHackers.Plugins.EditorTools InteractionContext.Scene.ShowSelectionShadow = true; } - base.CancelOpperation(); + base.CancelOperation(); } public override void SetPosition(IObject3D selectedItem) diff --git a/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleTopControl.cs b/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleTopControl.cs index bff13c17a..0257cb3e0 100644 --- a/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleTopControl.cs +++ b/MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleTopControl.cs @@ -298,7 +298,7 @@ namespace MatterHackers.Plugins.EditorTools base.OnMouseUp(mouseEvent3D); } - public override void CancelOpperation() + public override void CancelOperation() { IObject3D selectedItem = RootSelection; if (selectedItem != null @@ -312,7 +312,7 @@ namespace MatterHackers.Plugins.EditorTools InteractionContext.Scene.ShowSelectionShadow = true; } - base.CancelOpperation(); + base.CancelOperation(); } public override void SetPosition(IObject3D selectedItem) diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/BooleanProcessing.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/BooleanProcessing.cs index ebeed6d87..f8c2702aa 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Actions/BooleanProcessing.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/BooleanProcessing.cs @@ -27,13 +27,13 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.PolygonMesh; -using MatterHackers.VectorMath; using System; using System.IO; using System.Runtime.InteropServices; using System.Threading; +using MatterHackers.Agg; +using MatterHackers.PolygonMesh; +using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PartPreviewWindow.View3D { @@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D public static Mesh Do(Mesh inMeshA, Matrix4X4 matrixA, Mesh inMeshB, Matrix4X4 matrixB, - int opperation, + int operation, IProgress reporter, double amountPerOperation, double percentCompleted, ProgressStatus progressStatus, CancellationToken cancellationToken) { var libiglExe = "libigl_boolean.exe"; @@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D int fcCount; DoBooleanOpperation(va, va.Length, fa, fa.Length, vb, vb.Length, fb, fb.Length, - opperation, + operation, out pVc, out vcCount, out pFc, out fcCount); var vcArray = new double[vcCount]; @@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D var meshB = inMeshB.Copy(CancellationToken.None); meshB.Transform(matrixB); - switch (opperation) + switch (operation) { case 0: return PolygonMesh.Csg.CsgOperations.Union(meshA, meshB, (status, progress0To1) => diff --git a/MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs b/MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs index 86edcc5e2..09402b0eb 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs @@ -261,7 +261,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow base.OnMouseUp(mouseEvent3D); } - public override void CancelOpperation() + public override void CancelOperation() { IObject3D selectedItem = RootSelection; if (selectedItem != null @@ -275,7 +275,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow InteractionContext.Scene.ShowSelectionShadow = true; } - base.CancelOpperation(); + base.CancelOperation(); } public override void SetPosition(IObject3D selectedItem) diff --git a/MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs b/MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs index 6364e09e2..52ab21765 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/InteractionVolume.cs @@ -148,7 +148,7 @@ namespace MatterHackers.MeshVisualizer InteractionContext.GuiSurface.Invalidate(); } - public virtual void CancelOpperation() + public virtual void CancelOperation() { }