From 8b43df67bc8a0270d42cfcd0645b2b4342ba1d2e Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 19 May 2019 16:42:44 -0700 Subject: [PATCH] Make sure we use the right settings when exporting issue: MatterHackers/MCCentral#5550 Spiral Vase check box in Export dialog has no effect --- MatterControlLib/Library/Export/GCodeExport.cs | 10 +++++++--- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/MatterControlLib/Library/Export/GCodeExport.cs b/MatterControlLib/Library/Export/GCodeExport.cs index 20dae7e79..2aa8fb3a9 100644 --- a/MatterControlLib/Library/Export/GCodeExport.cs +++ b/MatterControlLib/Library/Export/GCodeExport.cs @@ -187,14 +187,13 @@ namespace MatterHackers.MatterControl.Library.Export // Ensure content is on disk before slicing await loadedItem.PersistAssets(null); + string gcodePath = null; + try { string sourceExtension = $".{firstItem.ContentType}"; string assetPath = await AssetObject3D.AssetManager.StoreMcx(loadedItem, false); - // TODO: Prior code bypassed GCodeOverridePath mechanisms in EditContext. Consolidating into a single pathway - string gcodePath = printer.Bed.EditContext.GCodeFilePath(printer); - var errors = new List(); if (ApplicationSettings.ValidFileExtensions.IndexOf(sourceExtension, StringComparison.OrdinalIgnoreCase) >= 0 @@ -227,6 +226,11 @@ namespace MatterHackers.MatterControl.Library.Export return errors; } + // This mush be calculated after the settings have been set (spiral vase) + // or it uses the wrong slice settings. + // TODO: Prior code bypassed GCodeOverridePath mechanisms in EditContext. Consolidating into a single pathway + gcodePath = printer.Bed.EditContext.GCodeFilePath(printer); + await ApplicationController.Instance.Tasks.Execute( "Slicing Item".Localize() + " " + loadedItem.Name, printer, diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index b3588cc49..d17c927d1 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit b3588cc49ff6af7492985a7f753eed182b6a8f5d +Subproject commit d17c927d11304a242b1389ee610f20b807984131 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c055ca264..ad8d39a9d 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c055ca2642bb93c95fb9144cb2d967254defabe0 +Subproject commit ad8d39a9d72bbf560a4b235a7979411b79327c2d