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

Use specific printer instance rather than global static

Browse source
This commit is contained in:
John Lewin 2018-06-05 14:37:53 -07:00
parent 5544e61f7b
commit 00ca673794
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SetupWizard/ImportSettingsPage.cs
View file

@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl
private int selectedMaterial = -1;
private int selectedQuality = -1;
public SelectPartsOfPrinterToImport(string settingsFilePath)
public SelectPartsOfPrinterToImport(string settingsFilePath, PrinterConfig printer)
{
this.WindowTitle = "Import Wizard";
this.HeaderText = "Select What to Import".Localize();
@ -202,18 +202,17 @@ namespace MatterHackers.MatterControl
case ProfileManager.ProfileExtension:
var printerSettingsLayer = new PrinterSettingsLayer();
printer.Settings.Merge(printerSettingsLayer, settingsToImport, sourceFilter, copyName);
ActiveSliceSettings.Instance.Merge(printerSettingsLayer, settingsToImport, sourceFilter, copyName);
var layerName = (printerSettingsLayer.ContainsKey(SettingsKey.layer_name)) ? printerSettingsLayer[SettingsKey.layer_name] : "none";
Success(settingsFilePath, layerName, destIsMaterial ? "Material".Localize() : "Quality".Localize());
if (destIsMaterial)
{
ActiveSliceSettings.Instance.MaterialLayers.Add(printerSettingsLayer);
printer.Settings.MaterialLayers.Add(printerSettingsLayer);
}
else
{
ActiveSliceSettings.Instance.QualityLayers.Add(printerSettingsLayer);
printer.Settings.QualityLayers.Add(printerSettingsLayer);
}
break;