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

Add LoadPrinter(profileID) overload

Browse source
This commit is contained in:
John Lewin 2018-11-07 09:08:54 -08:00
parent 7b578ac098
commit 1bf988ddb6
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -91,25 +91,30 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
await printer?.Bed?.LoadLibraryContent(libraryItem);
}
public async Task<PrinterConfig> LoadPrinter()
public Task<PrinterConfig> LoadPrinter()
{
var printer = ApplicationController.Instance.ActivePrinter;
return this.LoadPrinter(this.LastProfileID);
}
public async Task<PrinterConfig> LoadPrinter(string profileID)
{
var activePrinter = ApplicationController.Instance.ActivePrinter;
// If a 'LastProfile' exists and it is missing from ActivePrinters, load it
var lastProfile = this[this.LastProfileID];
if (lastProfile != null
&& !ApplicationController.Instance.ActivePrinters.Where(p => p.Settings.ID == lastProfile.ID).Any())
var profile = this[profileID];
if (profile != null
&& !ApplicationController.Instance.ActivePrinters.Where(p => p.Settings.ID == profile.ID).Any())
{
if (printer.Settings.ID != this.LastProfileID)
if (activePrinter.Settings.ID != this.LastProfileID)
{
var printerConfig = new PrinterConfig(await LoadProfileAsync(this.LastProfileID));
await ApplicationController.Instance.SetActivePrinter(printerConfig);
var printer = new PrinterConfig(await LoadProfileAsync(this.LastProfileID));
await ApplicationController.Instance.SetActivePrinter(printer);
printer = ApplicationController.Instance.ActivePrinter;
return ApplicationController.Instance.ActivePrinter;
}
}
return printer;
return activePrinter;
}
private static string GetProfilesDocPathForUser(string userName)