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

Move user-override stashing to PrinterSettings, invoke on SetValue

Browse source 
- Issue MatterHackers/MCCentral#1053
Editing Preset does not stash changes
This commit is contained in:
John Lewin 2017-01-11 13:22:59 -08:00
parent 69c53977d3
commit 1eeaa5208d
4 changed files with 90 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -92,13 +92,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
// Shouldn't this just be called by .SetValue() rather than explicitly by all the SliceSettingsWidget controls - that way any API level call to .SetValue() inherits the same behavior
static public void OnSettingsChanged(SliceSettingData settingData)
{
SettingChanged.CallEvents(null, new StringEventArgs(settingData.SlicerConfigName));
if (settingData.ReloadUiWhenChanged)
{
UiThread.RunOnIdle(() => ApplicationController.Instance.ReloadAll());
UiThread.RunOnIdle(ApplicationController.Instance.ReloadAll);
}
}

88
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -109,6 +109,61 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
/// <summary>
/// Restore deactivated user overrides by iterating the active preset and removing/restoring matching items
/// </summary>
public void RestoreConflictingUserOverrides(PrinterSettingsLayer settingsLayer)
{
if (settingsLayer == null)
{
return;
}
foreach (var settingsKey in settingsLayer.Keys)
{
RestoreUserOverride(settingsLayer, settingsKey);
}
}
private void RestoreUserOverride(PrinterSettingsLayer settingsLayer, string settingsKey)
{
string stagedUserOverride;
if (StagedUserSettings.TryGetValue(settingsKey, out stagedUserOverride))
{
StagedUserSettings.Remove(settingsKey);
UserLayer[settingsKey] = stagedUserOverride;
}
}
/// <summary>
/// Move conflicting user overrides to the temporary staging area, allowing presets values to take effect
/// </summary>
public void DeactivateConflictingUserOverrides(PrinterSettingsLayer settingsLayer)
{
if (settingsLayer == null)
{
return;
}
foreach (var settingsKey in settingsLayer.Keys)
{
StashUserOverride(settingsLayer, settingsKey);
}
}
/// <summary>
/// Move conflicting user overrides to the temporary staging area, allowing presets values to take effect
/// </summary>
private void StashUserOverride(PrinterSettingsLayer settingsLayer, string settingsKey)
{
string userOverride;
if (this.UserLayer.TryGetValue(settingsKey, out userOverride))
{
this.UserLayer.Remove(settingsKey);
this.StagedUserSettings.Add(settingsKey, userOverride);
}
}
[OnDeserialized]
internal void OnDeserializedMethod(StreamingContext context)
{
@ -971,6 +1026,20 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public void SetValue(string settingsKey, string settingsValue, PrinterSettingsLayer layer = null)
{
// Stash user overrides if a non-user override is being set
if (layer != null && layer != UserLayer)
{
StashUserOverride(layer, settingsKey);
}
else
{
// Remove any staged/conflicting user override, making this the new and active user override
if (StagedUserSettings.ContainsKey(settingsKey))
{
StagedUserSettings.Remove(settingsKey);
}
}
var persistenceLayer = layer ?? UserLayer;
// If the setting exists and is set the requested value, exit without setting or saving
@ -980,12 +1049,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return;
}
// Remove any staged/conflicting user override, making this the new and active user override
if (StagedUserSettings.ContainsKey(settingsKey))
{
StagedUserSettings.Remove(settingsKey);
}
// Otherwise, set and save
persistenceLayer[settingsKey] = settingsValue;
Save();
@ -996,12 +1059,19 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return JsonConvert.SerializeObject(this, formatting);
}
internal void ClearValue(string sliceSetting, PrinterSettingsLayer layer = null)
internal void ClearValue(string settingsKey, PrinterSettingsLayer layer = null)
{
var persistenceLayer = layer ?? UserLayer;
if (persistenceLayer.ContainsKey(sliceSetting))
if (persistenceLayer.ContainsKey(settingsKey))
{
persistenceLayer.Remove(sliceSetting);
persistenceLayer.Remove(settingsKey);
// Restore user overrides if a non-user override is being cleared
if (layer != null && layer != UserLayer)
{
RestoreUserOverride(layer, settingsKey);
}
Save();
}
}