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

fixing warning - thinking about SCAD

Browse source
This commit is contained in:
Lars Brubaker 2020-08-25 18:18:11 -07:00 • committed by LarsBrubaker
parent 842e9efb80
commit 6a5c4756cc
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/DesignTools/OpenSCAD/OpenSCADBuilder.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.Library
public string Name => "Builder";
private string compilerPath = UserSettings.Instance.get(UserSettingsKey.OpenScadPath) ?? "/usr/bin/openscad";
private string compilerPath = UserSettings.Instance.get(UserSettingsKey.OpenScadPath) ?? "C:\\Program Files\\OpenSCAD\\openscad.exe";
public IEnumerable<Type> SupportedTypes() => new Type[]
{
@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.Library
Width = 225
};
FlowLayoutWidget actionButtons = new FlowLayoutWidget();
var actionButtons = new FlowLayoutWidget();
mainContainer.AddChild(actionButtons);
// TODO: This should use the same renaming and asset system as stl/amf assets
@ -128,6 +128,7 @@ namespace MatterHackers.MatterControl.Library
updateButton.Enabled = false;
updateButton.ToolTipText = "OpenSCAD not installed".Localize();
}
updateButton.Click += async (s, e) =>
{
using (var meshStream = AggContext.StaticData.OpenStream(Path.Combine("Stls", "openscad_logo.stl")))
@ -136,7 +137,8 @@ namespace MatterHackers.MatterControl.Library
}
// TODO: Use assets system
string outputPath = Path.ChangeExtension(item.ScriptPath, ".stl");
string folderToSaveStlsTo = Path.Combine(ApplicationDataStorage.Instance.ApplicationTempDataPath, "amf_to_stl");
string outputPath = Path.Combine(folderToSaveStlsTo, Path.ChangeExtension(Path.GetFileName(item.ScriptPath), ".stl"));
int err = await Task.Run(() => ExecuteScript(item.ScriptPath, outputPath));
if (err == 0)