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

Migrate SettingChanged event to PrinterSettings

Browse source 
- Issue MatterHackers/MCCentral#4245
Remove ActiveSliceSettings type
This commit is contained in:
John Lewin 2018-10-05 09:55:46 -07:00
parent 98252dff50
commit 0f9042f28d
22 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs
View file

@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.AddChild(pullDownContainer);
ActiveSliceSettings.MaterialPresetChanged += ActiveSliceSettings_MaterialPresetChanged;
ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) =>
PrinterSettings.SettingChanged.RegisterEvent((s, e) =>
{
if (e is StringEventArgs stringEvent
&& (stringEvent.Data == SettingsKey.default_material_presets
@ -366,7 +366,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if (settingBeforeChange[keyName] != printer.Settings.GetValue(keyName))
{
ActiveSliceSettings.OnSettingChanged(keyName);
PrinterSettings.OnSettingChanged(keyName);
}
}
});

7
MatterControlLib/SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -37,15 +37,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static class ActiveSliceSettings
{
public static RootedObjectEventHandler SettingChanged = new RootedObjectEventHandler();
public static event EventHandler MaterialPresetChanged;
public static void OnSettingChanged(string slicerConfigName)
{
SettingChanged.CallEvents(null, new StringEventArgs(slicerConfigName));
}
internal static void OnMaterialPresetChanged()
{
MaterialPresetChanged?.Invoke(null, null);

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

@ -57,6 +57,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// Year|month|day|versionForDay (to support multiple revisions on a given day)
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 static void OnSettingChanged(string slicerConfigName)
{
SettingChanged.CallEvents(null, new StringEventArgs(slicerConfigName));
}
[JsonIgnore]
public RootedObjectEventHandler PrintLevelingEnabledChanged = new RootedObjectEventHandler();
@ -1299,7 +1307,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
persistenceLayer[settingsKey] = settingsValue;
Save();
ActiveSliceSettings.OnSettingChanged(settingsKey);
PrinterSettings.OnSettingChanged(settingsKey);
}
public string ToJson()
@ -1342,7 +1350,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Save();
ActiveSliceSettings.OnSettingChanged(settingsKey);
PrinterSettings.OnSettingChanged(settingsKey);
}
}
}

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

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
static ProfileManager()
{
ActiveSliceSettings.SettingChanged.RegisterEvent(SettingsChanged, ref unregisterEvents);
PrinterSettings.SettingChanged.RegisterEvent(SettingsChanged, ref unregisterEvents);
ReloadActiveUser();
}

2
MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -321,7 +321,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
};
ActiveSliceSettings.SettingChanged.RegisterEvent(
PrinterSettings.SettingChanged.RegisterEvent(
(s, e) =>
{
if (e is StringEventArgs stringEvent)

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

@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
EventHandler localUnregisterEvents = null;
ActiveSliceSettings.SettingChanged.RegisterEvent((sender, e) =>
PrinterSettings.SettingChanged.RegisterEvent((sender, e) =>
{
if (e is StringEventArgs stringArgs
&& stringArgs.Data == settingData.SlicerConfigName)