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

Consolidate SettingsProfile and PrinterSettings types

Browse source
This commit is contained in:
John Lewin 2016-07-18 15:20:19 -07:00
parent f304e9f3d6
commit 42f133aa70
14 changed files with 837 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if (ApplicationController.Instance.EditMaterialPresetsWindow == null)
{
string presetsID = ActiveSliceSettings.Instance.MaterialPresetKey(extruderIndex);
string presetsID = ActiveSliceSettings.Instance.GetMaterialPresetKey(extruderIndex);
if (string.IsNullOrEmpty(presetsID))
{
return;
@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
},
DeleteLayer = () =>
{
var materialKeys = ActiveSliceSettings.Instance.MaterialSettingsKeys();
var materialKeys = ActiveSliceSettings.Instance.MaterialSettingsKeys;
for (var i = 0; i < materialKeys.Count; i++)
{
if (materialKeys[i] == presetsID)
@ -220,7 +220,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (layerType == NamedSettingsLayers.Material)
{
if (activeSettings.MaterialPresetKey(extruderIndex) != item.Value)
if (activeSettings.GetMaterialPresetKey(extruderIndex) != item.Value)
{
activeSettings.SetMaterialPreset(extruderIndex, item.Value);
}
@ -288,7 +288,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (layerType == NamedSettingsLayers.Material)
{
settingsKey = ActiveSliceSettings.Instance.MaterialPresetKey(extruderIndex);
settingsKey = ActiveSliceSettings.Instance.GetMaterialPresetKey(extruderIndex);
ActiveSliceSettings.Instance.MaterialLayers.CollectionChanged += SettingsLayers_CollectionChanged;
dropDownList.Closed += (s1, e1) =>