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

Per printer instance rather than static ApplicationController.Printer

Browse source
This commit is contained in:
John Lewin 2017-09-17 14:23:28 -07:00
parent ed66d862a4
commit 928fed9efe
5 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// If we have an active printer, run Disable
if (activeInstance != PrinterSettings.Empty)
{
activeInstance.printer.Connection.Disable();
activeInstance?.printer.Connection.Disable();
}
activeInstance = value;

14
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -56,24 +56,26 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
activeInstance = value;
// If the loaded slice settings do not match the last active settings for this profile, change to the last active
if (ActiveSliceSettings.Instance?.ID != activeInstance.LastProfileID)
// If profile is not loaded, load itthe loaded slice settings do not match the last active settings for this profile, change to the last active
if (!ApplicationController.Instance.ActivePrinters.Where(p => p.Settings.ID == activeInstance.LastProfileID).Any())
{
// Load or download on a background thread
var lastProfile = LoadProfileAsync(activeInstance.LastProfileID).Result;
// Load or download on a background thread the last loaded settings
var printerSettings = LoadProfileAsync(activeInstance.LastProfileID).Result;
if (MatterControlApplication.IsLoading)
{
ActiveSliceSettings.Instance = lastProfile ?? PrinterSettings.Empty;
ActiveSliceSettings.Instance = printerSettings ?? PrinterSettings.Empty;
}
else
{
UiThread.RunOnIdle(() =>
{
// Assign on the UI thread
ActiveSliceSettings.Instance = lastProfile ?? PrinterSettings.Empty;
ActiveSliceSettings.Instance = printerSettings ?? PrinterSettings.Empty;
});
}
ApplicationController.Instance.ActivePrinters.Add(new PrinterConfig(true, printerSettings));
}
}
}