diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs index 2883cdc16..55685d7d0 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -59,19 +59,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public int EditButtonHeight { get; set; } = 44; - private Color[] selectionColors = new Color[] { new Color(131, 4, 66), new Color(227, 31, 61), new Color(255, 148, 1), new Color(247, 224, 23), new Color(143, 212, 1) }; - private Stopwatch timeSinceLastSpin = new Stopwatch(); - private Stopwatch timeSinceReported = new Stopwatch(); - public Matrix4X4 TransformOnMouseDown { get; private set; } = Matrix4X4.Identity; - private TreeView treeView; + private readonly TreeView treeView; - private ViewStyleButton modelViewStyleButton; + private readonly ViewStyleButton modelViewStyleButton; - private PrinterConfig printer; + private readonly PrinterConfig printer; - private ThemeConfig theme; + private readonly ThemeConfig theme; public Vector3 BedCenter { @@ -89,7 +85,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public PrinterConfig Printer { get; private set; } - private PrinterTabPage printerTabPage; + private readonly PrinterTabPage printerTabPage; public View3DWidget(PrinterConfig printer, ISceneContext sceneContext, ViewControls3D viewControls3D, ThemeConfig theme, PartTabPage printerTabBase, Object3DControlsLayer.EditorType editorType = Object3DControlsLayer.EditorType.Part) { @@ -402,7 +398,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - private Dictionary treeNodesByObject = new Dictionary(); + private readonly Dictionary treeNodesByObject = new Dictionary(); private bool watingToScroll = false; @@ -687,7 +683,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private GuiWidget topMostParent; - private PlaneShape bedPlane = new PlaneShape(Vector3.UnitZ, 0, null); + private readonly PlaneShape bedPlane = new PlaneShape(Vector3.UnitZ, 0, null); public bool DragOperationActive { get; private set; } @@ -1278,7 +1274,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { if (!PositionWithinLocalBounds(localMousePosition.X, localMousePosition.Y)) { - Matrix4X4 totalTransform = Matrix4X4.CreateTranslation(new Vector3(-CurrentSelectInfo.LastMoveDelta)); + var totalTransform = Matrix4X4.CreateTranslation(new Vector3(-CurrentSelectInfo.LastMoveDelta)); selectedItem.Matrix *= totalTransform; CurrentSelectInfo.LastMoveDelta = Vector3.Zero; Invalidate(); @@ -1298,7 +1294,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // move the mesh back to the start position { - Matrix4X4 totalTransform = Matrix4X4.CreateTranslation(new Vector3(-CurrentSelectInfo.LastMoveDelta)); + var totalTransform = Matrix4X4.CreateTranslation(new Vector3(-CurrentSelectInfo.LastMoveDelta)); selectedItem.Matrix *= totalTransform; } @@ -1352,7 +1348,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // move the mesh back to the new position { - Matrix4X4 totalTransform = Matrix4X4.CreateTranslation(new Vector3(delta)); + var totalTransform = Matrix4X4.CreateTranslation(new Vector3(delta)); selectedItem.Matrix *= totalTransform; @@ -1365,14 +1361,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Vector2 OffsetToMeshViewerWidget() { - List parents = new List(); + var parents = new List(); GuiWidget parent = this.Object3DControlLayer.Parent; while (parent != this) { parents.Add(parent); parent = parent.Parent; } - Vector2 offset = default(Vector2); + var offset = default(Vector2); for (int i = parents.Count - 1; i >= 0; i--) { offset += parents[i].OriginRelativeParent; @@ -1438,8 +1434,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow if (ModifierKeys == Keys.Control) { // find the think we clicked on - var info = new IntersectInfo(); - var hitObject = FindHitObject3D(mouseEvent.Position, out info); + var hitObject = FindHitObject3D(mouseEvent.Position, out IntersectInfo info); if (hitObject != null) { if (selectedItem == hitObject @@ -1491,9 +1486,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow && mouseDownPositon == mouseEvent.Position && this.TrackballTumbleWidget.FirstWidgetUnderMouse) { - var info = new IntersectInfo(); - - if (FindHitObject3D(mouseEvent.Position, out info) is IObject3D hitObject + if (FindHitObject3D(mouseEvent.Position, out _) is IObject3D hitObject && (this.Printer == null // Allow Model -> Right Click in Part view || this.Printer?.ViewState.ViewMode == PartViewMode.Model)) // Disallow Model -> Right Click in GCode views { @@ -1654,7 +1647,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public static Regex fileNameNumberMatch = new Regex("\\(\\d+\\)", RegexOptions.Compiled); - private SelectedObjectPanel selectedObjectPanel; + private readonly SelectedObjectPanel selectedObjectPanel; internal VerticalResizeContainer modelViewSidePanel; @@ -1677,10 +1670,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // popupMenu.CreateHorizontalLine(); } - private bool assigningTreeNode; - private FlowLayoutWidget treeNodeContainer; + private readonly bool assigningTreeNode; + private readonly FlowLayoutWidget treeNodeContainer; - private InlineStringEdit workspaceName; + private readonly InlineStringEdit workspaceName; private int lastSceneDescendantsCount; private Vector2 beforeReubildScrollPosition; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 14d35172a..726d9baf0 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 14d35172aa4d77b4123fea482621dab21cb7495a +Subproject commit 726d9baf03896b908782332225a996cdbdef6908