From 08113c85759e87695e700aab767e8f94bc757e82 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 29 Jul 2016 15:10:13 -0700 Subject: [PATCH] Set the expected nozzle size when constructing the gcode viewer --- PartPreviewWindow/ViewGcodeWidget.cs | 9 +++++++++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/PartPreviewWindow/ViewGcodeWidget.cs b/PartPreviewWindow/ViewGcodeWidget.cs index c900759c0..76ad9e788 100644 --- a/PartPreviewWindow/ViewGcodeWidget.cs +++ b/PartPreviewWindow/ViewGcodeWidget.cs @@ -285,6 +285,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow gCodeRenderer = new GCodeRenderer(LoadedGCode); + if (ActiveSliceSettings.Instance.PrinterSelected) + { + GCodeRenderer.ExtruderWidth = ActiveSliceSettings.Instance.GetValue(SettingsKey.nozzle_diameter); + } + else + { + GCodeRenderer.ExtruderWidth = .4; + } + await Task.Run(() => DoPostLoadInitialization()); postLoadInitialization_RunWorkerCompleted(); diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index a0585d5f2..0b4f2cd53 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit a0585d5f2e2fb80b17ad24e4c241ffae0553b718 +Subproject commit 0b4f2cd533b66b436fda27cb64b96588d17dd3e2 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 557e3c5c3..462bdf5f5 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 557e3c5c3ed187795b92bc7abb5926246d7d7b29 +Subproject commit 462bdf5f510c3b63bd2f7ee85a98f0ff1dc0bf85