From d7010c8c566c83a363bf43117bb39dad7498efb4 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 16 Aug 2017 07:04:35 -0700 Subject: [PATCH] Remove unused ViewGCodeBasic parameters, reduce static refs --- PartPreviewWindow/View3D/View3DWidget.cs | 10 +++------- PartPreviewWindow/ViewGcodeBasic.cs | 14 +++----------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 888085410..9e711cc2a 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -153,6 +153,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.theme = theme; this.openMode = openMode; allowAutoRotate = (autoRotate == AutoRotate.Enabled); + meshViewerWidget = new MeshViewerWidget(printer, this.TrackballTumbleWidget, this.InteractionLayer); this.printItemWrapper = printItemWrapper; @@ -182,13 +183,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.InteractionLayer.AddChild(meshViewerWidget); // The slice layers view - gcodeViewer = new ViewGcodeBasic( - printer.Bed.ViewerVolume, - printer.Bed.BedCenter, - printer.Bed.BedShape, - viewControls3D); + gcodeViewer = new ViewGcodeBasic(printer, viewControls3D); gcodeViewer.AnchorAll(); - this.gcodeViewer.Visible = false; + gcodeViewer.Visible = false; this.InteractionLayer.AddChild(gcodeViewer); this.InteractionLayer.AddChild(this.TrackballTumbleWidget); @@ -2457,7 +2454,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public MeshViewerWidget meshViewerWidget; - // Proxy to MeshViewerWidget public InteractiveScene Scene { get; } protected ViewControls3D viewControls3D { get; } diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 0866dba59..905d208f1 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -35,7 +35,6 @@ using MatterHackers.GCodeVisualizer; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrintQueue; using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PartPreviewWindow @@ -58,21 +57,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private string fileNotFoundMessage = "File not found on disk.".Localize(); private string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize(); - private Vector2 bedCenter; - private Vector3 viewerVolume; - - private PartViewMode activeViewMode = PartViewMode.Layers3D; - private PrinterConfig printer; + private ViewControls3D viewControls3D; - public ViewGcodeBasic(Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape, ViewControls3D viewControls3D) + public ViewGcodeBasic(PrinterConfig printer, ViewControls3D viewControls3D) { - printer = ApplicationController.Instance.Printer; - + this.printer = printer; this.viewControls3D = viewControls3D; - this.viewerVolume = viewerVolume; - this.bedCenter = bedCenter; RenderOpenGl.GLHelper.WireframeColor = ActiveTheme.Instance.PrimaryAccentColor;