diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index 8dee24ce5..409a47ad1 100644 --- a/SlicerConfiguration/Settings/ActiveSliceSettings.cs +++ b/SlicerConfiguration/Settings/ActiveSliceSettings.cs @@ -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(File.ReadAllText(baseConfigPath)); - } - private static OemProfile LoadHttpOemProfile(string make, string model) { string url = string.Format( diff --git a/SlicerConfiguration/SliceSettingsOrganizer.cs b/SlicerConfiguration/SliceSettingsOrganizer.cs index d639ae9e6..63860644c 100644 --- a/SlicerConfiguration/SliceSettingsOrganizer.cs +++ b/SlicerConfiguration/SliceSettingsOrganizer.cs @@ -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 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")); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 28495bd12..cb4fd7165 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -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. +