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

Require and use printer reference rather than static ActivePrinter

Browse source
This commit is contained in:
John Lewin 2018-11-11 13:22:32 -08:00
parent c5cd0b2ebc
commit e2a6c761a4
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/SlicerConfiguration/UIFields/DropMenuWrappedField.cs
View file

@ -38,10 +38,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private UIField uiField;
private Color textColor;
private ThemeConfig theme;
private PrinterConfig printer;
private SliceSettingData settingData;
public DropMenuWrappedField(UIField uiField, SliceSettingData settingData, Color textColor, ThemeConfig theme)
public DropMenuWrappedField(UIField uiField, SliceSettingData settingData, Color textColor, ThemeConfig theme, PrinterConfig printer)
{
this.printer = printer;
this.settingData = settingData;
this.uiField = uiField;
this.textColor = textColor;
@ -98,8 +100,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (e is StringEventArgs stringArgs
&& stringArgs.Data == settingData.SlicerConfigName)
{
var activePrinter = ApplicationController.Instance.ActivePrinter;
string newSliceSettingValue = activePrinter.Settings.GetValue(settingData.SlicerConfigName);
string newSliceSettingValue = printer.Settings.GetValue(settingData.SlicerConfigName);
bool foundSetting = false;
foreach (QuickMenuNameValue nameValue in settingData.QuickMenuSettings)