From 48b7a85de6f973eac8e3447635b91a0980a92576 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 19 Apr 2018 13:26:19 -0700 Subject: [PATCH] Invoke Click rather than changing Checked to ensure event fires - Issue MatterHackers/MCCentral#3171 Something got messed up with baby stepping on this print --- ApplicationView/PrinterModels.cs | 10 ++-------- PartPreviewWindow/View3D/MeshViewerWidget.cs | 2 ++ PrinterControls/JogControls.cs | 4 ++-- Submodules/agg-sharp | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs index 280dffd3c..125d0eec0 100644 --- a/ApplicationView/PrinterModels.cs +++ b/ApplicationView/PrinterModels.cs @@ -311,7 +311,7 @@ namespace MatterHackers.MatterControl BspNode bspTree = null; - // if there is a chached bsp tree load it + // if there is a cached bsp tree load it var meshHashCode = mesh.GetLongHashCode(); string cachePath = ApplicationController.CacheablePath("MeshBspData", $"{meshHashCode}.bsp"); if (File.Exists(cachePath)) @@ -346,13 +346,7 @@ namespace MatterHackers.MatterControl private Mesh _buildVolumeMesh; - public Mesh BuildVolumeMesh - { - get - { - return _buildVolumeMesh; - } - } + public Mesh BuildVolumeMesh => _buildVolumeMesh; public bool EditableScene { get; private set; } diff --git a/PartPreviewWindow/View3D/MeshViewerWidget.cs b/PartPreviewWindow/View3D/MeshViewerWidget.cs index 028f6b8af..8c0e8fbec 100644 --- a/PartPreviewWindow/View3D/MeshViewerWidget.cs +++ b/PartPreviewWindow/View3D/MeshViewerWidget.cs @@ -804,7 +804,9 @@ namespace MatterHackers.MeshVisualizer { bedColor = new Color(this.BedColor, this.BedColor.alpha / 4); } + GLHelper.Render(sceneContext.Mesh, bedColor, RenderTypes.Shaded, World.ModelviewMatrix); + if (sceneContext.PrinterShape != null) { GLHelper.Render(sceneContext.PrinterShape, bedColor, RenderTypes.Shaded, World.ModelviewMatrix); diff --git a/PrinterControls/JogControls.cs b/PrinterControls/JogControls.cs index 57b85c22b..de28e4bc6 100644 --- a/PrinterControls/JogControls.cs +++ b/PrinterControls/JogControls.cs @@ -210,14 +210,14 @@ namespace MatterHackers.MatterControl { if (zPlusControl.MoveAmount >= 1) { - movePointZeroTwoMmButton.Checked = true; + movePointZeroTwoMmButton.InvokeClick(); } } else { if (zPlusControl.MoveAmount < 1) { - moveOneMmButton.Checked = true; + moveOneMmButton.InvokeClick(); } } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index d59ffab5d..32c80a675 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit d59ffab5d93309ab3fcdb2681cd14c4c5cf90568 +Subproject commit 32c80a6750a68e961c8b8c53f4d7af83a9746144