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

Revise Settings.json changes

Browse source 
- Reuse SliceSettingsOrganizer.GetDefaultSettings
 - Remove SavePropertiesJson
This commit is contained in:
John Lewin 2016-06-13 13:40:29 -07:00
parent c6e0cca395
commit 76dcc4a072
3 changed files with 6 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -199,7 +199,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static LayeredProfile LoadEmptyProfile()
{
return new LayeredProfile(new OemProfile(), LoadMatterHackersBaseLayer());
return new LayeredProfile(new OemProfile(), SliceSettingsOrganizer.Instance.GetDefaultSettings());
}
public static ProfileData ProfileData { get; private set; }
@ -273,7 +273,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var settingsToImport = SettingsLayer.LoadFromIni(settingsFilePath);
var oemProfile = new OemProfile(settingsToImport);
SettingsLayer baseConfig = LoadMatterHackersBaseLayer();
SettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new LayeredProfile(oemProfile, baseConfig)
{
@ -301,7 +301,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string guid = Guid.NewGuid().ToString();
OemProfile printerProfile = LoadHttpOemProfile(make, model);
SettingsLayer baseConfig = LoadMatterHackersBaseLayer();
SettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new LayeredProfile(printerProfile, baseConfig)
{
@ -379,20 +379,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return new SettingsProfile(LayeredProfile.LoadFile(profilePath));
}
private static SettingsLayer LoadMatterHackersBaseLayer()
{
string baseConfigPath = Path.Combine(profilesPath, "config.json");
if(!File.Exists(baseConfigPath))
{
SettingsLayer baseLayer = SliceSettingsOrganizer.Instance.GetDefaultSettings();
File.WriteAllText(baseConfigPath, JsonConvert.SerializeObject(baseLayer));
return baseLayer;
}
return JsonConvert.DeserializeObject<SettingsLayer>(File.ReadAllText(baseConfigPath));
}
private static OemProfile LoadHttpOemProfile(string make, string model)
{
string url = string.Format(

18
SlicerConfiguration/SliceSettingsOrganizer.cs
View file

@ -282,24 +282,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
//throw new Exception("You must not have a layout for a setting that is not in the Properties.txt");
}
public void SavePropertiesJson()
{
SettingsLayer baseLayer = ActiveSliceSettings.Instance.BaseLayer;
foreach (KeyValuePair<string, string> keyValue in baseLayer)
{
foreach(OrganizerSettingsData setting in SettingsData)
{
if(setting.SlicerConfigName == keyValue.Key)
{
setting.DefaultValue = keyValue.Value;
}
}
}
string propertiesFileContents = JsonConvert.SerializeObject(SettingsData, Formatting.Indented);
File.WriteAllText("Properties.json", propertiesFileContents);
}
private void LoadAndParseSettingsFiles()
{
string propertiesFileContents = StaticData.Instance.ReadAllText(Path.Combine("SliceSettings", "Properties.json"));

3
StaticData/Translations/Master.txt
View file

@ -4996,3 +4996,6 @@ Translated:Replace current printer profile
English:Import Settings
Translated:Import Settings
English:Oops! Please select a serial port.
Translated:Oops! Please select a serial port.