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

Fix stl export, remove saveParams dependency in SaveStl

Browse source
This commit is contained in:
John Lewin 2017-08-08 21:14:44 -07:00
parent fb568a074a
commit c78e8e3a6f
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
CustomWidgets/ExportPrintItemPage.cs
View file

@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl
},
(saveParams) =>
{
Task.Run(() => SaveStl(saveParams));
Task.Run(() => SaveStl(saveParams.FileName));
});
});
};
@ -387,38 +387,38 @@ namespace MatterHackers.MatterControl
}
}
private void SaveStl(SaveFileDialogParams saveParams)
private void SaveStl(string filePathToSave)
{
try
{
if (!string.IsNullOrEmpty(saveParams.FileName))
if (!string.IsNullOrEmpty(filePathToSave))
{
string filePathToSave = saveParams.FileName;
if (filePathToSave != null && filePathToSave != "")
string extension = Path.GetExtension(filePathToSave);
if (extension == "")
{
string extension = Path.GetExtension(filePathToSave);
if (extension == "")
{
File.Delete(filePathToSave);
filePathToSave += ".stl";
}
if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == Path.GetExtension(filePathToSave).ToUpper())
{
File.Copy(printItemWrapper.FileLocation, filePathToSave, true);
}
else
{
IObject3D loadedItem = Object3D.Load(printItemWrapper.FileLocation, CancellationToken.None);
if (!MeshFileIo.Save(new List<MeshGroup> { loadedItem.Flatten() }, filePathToSave))
{
UiThread.RunOnIdle (() => {
StyledMessageBox.ShowMessageBox(null, "AMF to STL conversion failed", "Couldn't save file".Localize());
});
}
}
ShowFileIfRequested(filePathToSave);
File.Delete(filePathToSave);
filePathToSave += ".stl";
}
if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == Path.GetExtension(filePathToSave).ToUpper())
{
File.Copy(printItemWrapper.FileLocation, filePathToSave, true);
}
else
{
IObject3D loadedItem = Object3D.Load(printItemWrapper.FileLocation, CancellationToken.None);
if (!MeshFileIo.Save(new List<MeshGroup> { loadedItem.Flatten() }, filePathToSave))
{
UiThread.RunOnIdle(() =>
{
StyledMessageBox.ShowMessageBox(null, "AMF to STL conversion failed", "Couldn't save file".Localize());
});
}
}
ShowFileIfRequested(filePathToSave);
}
}
catch (Exception e)