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

Fix exception during load, initialize Printer after setting AssetsPath

Browse source
This commit is contained in:
John Lewin 2017-09-15 23:13:23 -07:00
parent 0855e6c044
commit a14ffaca86
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ApplicationView/ApplicationController.cs
View file

@ -98,6 +98,8 @@ namespace MatterHackers.MatterControl
{ {
this.printItem = loadedItem; this.printItem = loadedItem;
} }
this.Scene.Load(firstFile.FullName);
} }
catch { } catch { }
} }
@ -125,7 +127,6 @@ namespace MatterHackers.MatterControl
ApplicationController.Instance.ActiveView3DWidget?.PartHasBeenChanged(); ApplicationController.Instance.ActiveView3DWidget?.PartHasBeenChanged();
} }
private GCodeFile loadedGCode; private GCodeFile loadedGCode;
public GCodeFile LoadedGCode public GCodeFile LoadedGCode
{ {
@ -520,7 +521,7 @@ namespace MatterHackers.MatterControl
{ {
public ThemeConfig Theme { get; set; } = new ThemeConfig(); public ThemeConfig Theme { get; set; } = new ThemeConfig();
public PrinterConfig Printer { get; } = new PrinterConfig(loadLastBedplate: true); public PrinterConfig Printer { get; }
public Action RedeemDesignCode; public Action RedeemDesignCode;
public Action EnterShareCode; public Action EnterShareCode;
@ -533,7 +534,7 @@ namespace MatterHackers.MatterControl
public static Action SignInAction; public static Action SignInAction;
public static Action SignOutAction; public static Action SignOutAction;
public static Action WebRequestFailed; public static Action WebRequestFailed;
public static Action WebRequestSucceeded; public static Action WebRequestSucceeded;
@ -757,6 +758,8 @@ namespace MatterHackers.MatterControl
Object3D.AssetsPath = ApplicationDataStorage.Instance.LibraryAssetsPath; Object3D.AssetsPath = ApplicationDataStorage.Instance.LibraryAssetsPath;
this.Printer = new PrinterConfig(loadLastBedplate: true);
this.Library = new LibraryConfig(); this.Library = new LibraryConfig();
this.Library.ContentProviders.Add(new[] { "stl", "amf", "mcx" }, new MeshContentProvider()); this.Library.ContentProviders.Add(new[] { "stl", "amf", "mcx" }, new MeshContentProvider());