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

Fixed more bugs with refreshing (made advanced controls fast again)

Browse source
This commit is contained in:
larsbrubaker 2014-04-27 16:46:00 -07:00
parent 74cc020414
commit 9c142bdbf8
11 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SlicerConfiguration/SettingsControlBar.cs
View file

@ -238,7 +238,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
void revertbutton_Click(object sender, MouseEventArgs mouseEvent)
{
ActiveSliceSettings.Instance.LoadAllSettings();
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
void MenuDropList_SelectionChanged(object sender, EventArgs e)
@ -282,7 +282,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
bool goodLoad = ActiveSliceSettings.Instance.LoadSettingsFromIni();
if (goodLoad)
{
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
});

12
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
protected void ReloadOptions(object sender, EventArgs e)
{
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
IEnumerable<DataStorage.SliceSettingsCollection> GetCollections()
@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
UiThread.RunOnIdle((state) =>
{
ActiveSliceSettings.Instance.LoadAllSettings();
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
});
}
@ -166,7 +166,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
UiThread.RunOnIdle((state) =>
{
ActiveSliceSettings.Instance.LoadAllSettings();
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
if (ApplicationWidget.Instance.EditSlicePresetsWindow == null)
{
ApplicationWidget.Instance.EditSlicePresetsWindow = new SlicePresetsWindow(ReloadOptions, filterLabel, filterTag, false, 0);
@ -259,21 +259,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
slic3rMenuItem.Selected += (sender, e) =>
{
ActivePrinterProfile.Instance.ActiveSliceEngineType = ActivePrinterProfile.SlicingEngineTypes.Slic3r;
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
};
MenuItem curaEnginMenuItem = engineMenuDropList.AddItem(ActivePrinterProfile.SlicingEngineTypes.CuraEngine.ToString());
curaEnginMenuItem.Selected += (sender, e) =>
{
ActivePrinterProfile.Instance.ActiveSliceEngineType = ActivePrinterProfile.SlicingEngineTypes.CuraEngine;
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
};
MenuItem matterSliceMenuItem = engineMenuDropList.AddItem(ActivePrinterProfile.SlicingEngineTypes.MatterSlice.ToString());
matterSliceMenuItem.Selected += (sender, e) =>
{
ActivePrinterProfile.Instance.ActiveSliceEngineType = ActivePrinterProfile.SlicingEngineTypes.MatterSlice;
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
};
engineMenuDropList.SelectedLabel = ActivePrinterProfile.Instance.ActiveSliceEngineType.ToString();

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
View file

@ -843,7 +843,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
windowController.functionToCallOnSave(this, null);
windowController.ChangeToSlicePresetList();
ActiveSliceSettings.Instance.LoadAllSettings();
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
});
}

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs
View file

@ -220,7 +220,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
preset.Delete();
windowController.ChangeToSlicePresetList();
ActiveSliceSettings.Instance.LoadAllSettings();
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
});
};

11
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -63,8 +63,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public UiState(SliceSettingsWidget settingsToCopy)
{
settingsToCopy.CurrentlyActiveCategory(out selectedCategory.index, out selectedCategory.name);
settingsToCopy.CurrentlyActiveGroup(out selectedGroup.index, out selectedGroup.name);
if (settingsToCopy != null)
{
settingsToCopy.CurrentlyActiveCategory(out selectedCategory.index, out selectedCategory.name);
settingsToCopy.CurrentlyActiveGroup(out selectedGroup.index, out selectedGroup.name);
}
}
}
@ -256,7 +259,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
CheckBox checkBox = sender as CheckBox;
if (checkBox != null)
{
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
}
@ -833,7 +836,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
protected void ReloadOptions(object sender, EventArgs e)
{
ApplicationWidget.Instance.ReloadBackPanel();
ApplicationWidget.Instance.ReloadAdvancedControlsPanel();
}
private void SaveSetting(string slicerConfigName, string value)