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

Convert static SettingChanged event to instance based

Browse source 
issue: MatterHackers/MCCentral#4551
This commit is contained in:
Lars Brubaker 2018-11-12 17:20:59 -08:00
parent b38abfaad4
commit 6405dad7ac
23 changed files with 111 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static int LatestVersion { get; } = 201606271;
// TODO: Change to instance based, revise listeners and register to expect specific printer settings
public static RootedObjectEventHandler SettingChanged = new RootedObjectEventHandler();
public EventHandler SettingChanged;
public event EventHandler MaterialPresetChanged;
@ -70,9 +70,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
MaterialPresetChanged?.Invoke(null, null);
}
public static void OnSettingChanged(PrinterSettings settings, string slicerConfigName)
public void OnSettingChanged(string slicerConfigName)
{
SettingChanged.CallEvents(settings, new StringEventArgs(slicerConfigName));
SettingChanged?.Invoke(this, new StringEventArgs(slicerConfigName));
}
public event EventHandler PrintLevelingEnabledChanged;
@ -1423,7 +1423,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
persistenceLayer[settingsKey] = settingsValue;
Save();
PrinterSettings.OnSettingChanged(this, settingsKey);
this.OnSettingChanged(settingsKey);
}
public string ToJson()
@ -1466,7 +1466,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Save();
PrinterSettings.OnSettingChanged(this, settingsKey);
this.OnSettingChanged(settingsKey);
}
}
}