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

Remove redundant event, use SettingChanged

Browse source
This commit is contained in:
jlewin 2019-03-06 07:24:26 -08:00
parent 41801cd07b
commit 2bb8f23611
2 changed files with 10 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

37
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -64,13 +64,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public event EventHandler<StringEventArgs> SettingChanged;
public event EventHandler MaterialPresetChanged;
public void OnMaterialPresetChanged()
{
MaterialPresetChanged?.Invoke(null, null);
}
public void OnSettingChanged(string slicerConfigName)
{
SettingChanged?.Invoke(this, new StringEventArgs(slicerConfigName));
@ -398,41 +391,27 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
set
{
SetValue(SettingsKey.active_quality_key, value);
QualityLayer = GetQualityLayer(value);
this.OnSettingChanged(SettingsKey.active_quality_key);
if (this.ActiveQualityKey != value)
{
SetValue(SettingsKey.active_quality_key, value);
QualityLayer = GetQualityLayer(value);
}
}
}
public string ActiveMaterialKey
{
get
{
if (MaterialSettingsKeys.Count > 0)
{
return MaterialSettingsKeys[0];
}
return null;
}
get => GetValue(SettingsKey.active_material_key);
set
{
if (MaterialSettingsKeys.Count == 0 || value != MaterialSettingsKeys[0])
if (this.ActiveMaterialKey != value)
{
MaterialSettingsKeys.Clear();
MaterialSettingsKeys.Add(value);
SetValue(SettingsKey.active_material_key, value);
MaterialLayer = GetMaterialLayer(value);
this.OnMaterialPresetChanged();
this.OnSettingChanged(SettingsKey.active_material_key);
}
}
}
public List<string> MaterialSettingsKeys { get; set; } = new List<string>();
[JsonIgnore]
public bool AutoSave { get; set; } = true;