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

Enabled import to Material

Browse source 
Made "Done" button show
This commit is contained in:
Lars Brubaker 2016-06-20 12:56:11 -07:00
parent 836cbffc53
commit 8d487138dd
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
SetupWizard/ImportSettingsPage.cs
View file

@ -58,6 +58,9 @@ namespace MatterHackers.MatterControl
var successMessageWidget = new WrappedTextWidget(successMessage, 10, textColor: ActiveTheme.Instance.PrimaryTextColor);
container.AddChild(successMessageWidget);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
}
}
@ -82,6 +85,9 @@ namespace MatterHackers.MatterControl
var successMessageWidget = new WrappedTextWidget(successMessage, 10, textColor: ActiveTheme.Instance.PrimaryTextColor);
container.AddChild(successMessageWidget);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
}
}
@ -131,7 +137,7 @@ namespace MatterHackers.MatterControl
// add as material preset
newMaterialPresetButton = new RadioButton("Material preset".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
//container.AddChild(newMaterialPresetButton);
container.AddChild(newMaterialPresetButton);
}
else
{
@ -242,12 +248,6 @@ namespace MatterHackers.MatterControl
private void ImportToPreset(string settingsFilePath)
{
string presetType = "Quality";
if (newMaterialPresetButton.Checked)
{
presetType = "Material";
}
if (!string.IsNullOrEmpty(settingsFilePath) && File.Exists(settingsFilePath))
{
string importType = Path.GetExtension(settingsFilePath).ToLower();
@ -286,7 +286,14 @@ namespace MatterHackers.MatterControl
}
}
ActiveSliceSettings.Instance.QualityLayers.Add(newLayer);
if (newMaterialPresetButton.Checked)
{
ActiveSliceSettings.Instance.MaterialLayers.Add(newLayer);
}
else
{
ActiveSliceSettings.Instance.QualityLayers.Add(newLayer);
}
ActiveSliceSettings.Instance.SaveChanges();
}

14
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -289,17 +289,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (layerType == NamedSettingsLayers.Material)
{
settingsKey = ActiveSliceSettings.Instance.MaterialPresetKey(extruderIndex);
ActiveSliceSettings.Instance.MaterialLayers.CollectionChanged += SettingsLayers_CollectionChanged;
dropDownList.Closed += (s1, e1) =>
{
ActiveSliceSettings.Instance.MaterialLayers.CollectionChanged -= SettingsLayers_CollectionChanged;
};
}
else
{
settingsKey = ActiveSliceSettings.Instance.ActiveQualityKey;
ActiveSliceSettings.Instance.QualityLayers.CollectionChanged += QualityLayers_CollectionChanged;
ActiveSliceSettings.Instance.QualityLayers.CollectionChanged += SettingsLayers_CollectionChanged;
dropDownList.Closed += (s1, e1) =>
{
ActiveSliceSettings.Instance.QualityLayers.CollectionChanged -= QualityLayers_CollectionChanged;
ActiveSliceSettings.Instance.QualityLayers.CollectionChanged -= SettingsLayers_CollectionChanged;
};
}
@ -316,7 +320,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return dropDownList;
}
private void QualityLayers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
private void SettingsLayers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
RebuildDropDownList();
}