nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we use the right settings when exporting

Browse source 
issue: MatterHackers/MCCentral#5550
Spiral Vase check box in Export dialog has no effect
This commit is contained in:
LarsBrubaker 2019-05-19 16:42:44 -07:00
parent de0d50fd83
commit 8b43df67bc
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/Library/Export/GCodeExport.cs
View file

@ -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<ValidationError>();
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,

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit b3588cc49ff6af7492985a7f753eed182b6a8f5d
Subproject commit d17c927d11304a242b1389ee610f20b807984131

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c055ca2642bb93c95fb9144cb2d967254defabe0
Subproject commit ad8d39a9d72bbf560a4b235a7979411b79327c2d