diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index b29036b2c..37abf5d84 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -252,16 +252,16 @@ namespace MatterHackers.MatterControl.ActionBar autoLevelButton.Margin = new Agg.BorderDouble(top: 3); autoLevelButton.ToolTipText = "Print leveling is enabled.".Localize(); autoLevelButton.Cursor = Cursors.Hand; - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); }, ref unregisterEvents); ActiveSliceSettings.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); }, ref unregisterEvents); return autoLevelButton; @@ -698,16 +698,16 @@ namespace MatterHackers.MatterControl.ActionBar autoLevelButton.Cursor = Cursors.Hand; autoLevelButton.Margin = new Agg.BorderDouble(top: 3); autoLevelButton.ToolTipText = "Print leveling is enabled.".Localize(); - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); }, ref unregisterEvents); ActiveSliceSettings.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); }, ref unregisterEvents); return autoLevelButton; diff --git a/ActionBar/PrinterSelector.cs b/ActionBar/PrinterSelector.cs index ceb108f44..dc69279ac 100644 --- a/ActionBar/PrinterSelector.cs +++ b/ActionBar/PrinterSelector.cs @@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl if (ActiveSliceSettings.Instance != null) { this.SelectedValue = ActiveSliceSettings.Instance.ID; - this.mainControlText.Text = ActiveSliceSettings.Instance.GetValue(SettingsKey.MatterControl_PrinterName); + this.mainControlText.Text = ActiveSliceSettings.Instance.GetValue(SettingsKey.printer_name); } this.AddItem( @@ -96,11 +96,11 @@ namespace MatterHackers.MatterControl private void SettingChanged(object sender, EventArgs e) { string settingsName = (e as StringEventArgs)?.Data; - if (settingsName != null && settingsName == SettingsKey.MatterControl_PrinterName.ToString()) + if (settingsName != null && settingsName == SettingsKey.printer_name.ToString()) { if (ProfileManager.Instance.ActiveProfile != null) { - ProfileManager.Instance.ActiveProfile.Name = ActiveSliceSettings.Instance.GetValue(SettingsKey.MatterControl_PrinterName); + ProfileManager.Instance.ActiveProfile.Name = ActiveSliceSettings.Instance.GetValue(SettingsKey.printer_name); } } diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index b1363cc1d..f8016b3e7 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage ImageWidget levelingIcon = new ImageWidget(levelingImage); levelingIcon.Margin = new BorderDouble(right: 6); - CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")); + CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")); printLevelingSwitch.VAnchor = VAnchor.ParentCenter; printLevelingSwitch.Margin = new BorderDouble(left: 16); printLevelingSwitch.CheckedStateChanged += (sender, e) => @@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage ActiveSliceSettings.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) => { - printLevelingSwitch.Checked = ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled"); + printLevelingSwitch.Checked = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); }, ref unregisterEvents); buttonRow.AddChild(levelingIcon); diff --git a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs index 45e43abfa..d80710e1d 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("MatterControl.PrintLevelingEnabled") == true + if (settings?.GetValue("print_leveling_enabled") == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 ")) && lineBeingSent.Length > 2 && lineBeingSent[2] == ' ') diff --git a/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs index 030eb5ecf..e141678b1 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs @@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("MatterControl.PrintLevelingEnabled") == true + if (settings?.GetValue("print_leveling_enabled") == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) { lineBeingSent = PrintLevelingPlane.Instance.ApplyLeveling(currentDestination, movementMode, lineBeingSent); diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs index e20f40f7c..d822a2055 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("MatterControl.PrintLevelingEnabled") == true + if (settings?.GetValue("print_leveling_enabled") == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) { lineBeingSent = PrintLevelingPlane.Instance.ApplyLeveling(currentDestination, movementMode, lineBeingSent); diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index 30add4d48..1cffea9d7 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -261,7 +261,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("MatterControl.PrintLevelingEnabled") == true + if (settings?.GetValue("print_leveling_enabled") == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 ")) && lineBeingSent.Length > 2 && lineBeingSent[2] == ' ') diff --git a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs index df09827d7..82c00c4db 100644 --- a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs +++ b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage publishImageSwitchContainer.VAnchor = VAnchor.ParentCenter; publishImageSwitchContainer.Margin = new BorderDouble(left: 16); - CheckBox toggleSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue("MatterControl.PublishBedImage")); + CheckBox toggleSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue("publish_bed_image")); toggleSwitch.CheckedStateChanged += (sender, e) => { CheckBox thisControl = sender as CheckBox; @@ -255,7 +255,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage private void SetPrintLevelButtonVisiblity() { - if (ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + if (ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { printLevelingStatusLabel.Text = "Software Print Leveling (enabled)".Localize(); } diff --git a/ControlElements/AttentionGetter.cs b/ControlElements/AttentionGetter.cs index 00c4e2e62..6aafe6d2d 100644 --- a/ControlElements/AttentionGetter.cs +++ b/ControlElements/AttentionGetter.cs @@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl editButton.Click -= GoToEditPrinter_Click; }; - UiNavigation.GoToPrinterSettings("MatterControl.BaudRate Edit Field,MatterControl.AutoConnect Edit Field,MatterControl.ComPort Edit Field"); + UiNavigation.GoToPrinterSettings("baud_rate Edit Field,auto_connect Edit Field,com_port Edit Field"); } } diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index 0acc7dac7..91ede39df 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl middleRowContainer.AddChild(new VerticalSpacer()); // If print leveling is enabled then add in a check box 'Apply Leveling During Export' and default checked. - if (showExportGCodeButton && ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + if (showExportGCodeButton && ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { applyLeveling = new CheckBox(LocalizedString.Get(applyLevelingDuringExportString), ActiveTheme.Instance.PrimaryTextColor, 10); applyLeveling.Checked = true; @@ -308,7 +308,7 @@ namespace MatterHackers.MatterControl { try { - if (ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + if (ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { GCodeFileLoaded unleveledGCode = new GCodeFileLoaded(source); if (applyLeveling.Checked) diff --git a/CustomWidgets/ThemeColorSelectorWidget.cs b/CustomWidgets/ThemeColorSelectorWidget.cs index 6d7734593..64d1eeb26 100644 --- a/CustomWidgets/ThemeColorSelectorWidget.cs +++ b/CustomWidgets/ThemeColorSelectorWidget.cs @@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl if (int.TryParse(themeIndexText, out themeIndex) && themeIndex < ActiveTheme.AvailableThemes.Count) { - ActiveSliceSettings.Instance.SetActiveValue("MatterControl.ActiveThemeIndex", themeIndex.ToString()); + ActiveSliceSettings.Instance.SetActiveValue("active_theme_index", themeIndex.ToString()); ActiveTheme.Instance = ActiveTheme.AvailableThemes[themeIndex]; } }; diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs index de73e26af..3d158e0a9 100644 --- a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs +++ b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs @@ -89,23 +89,23 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB layeredProfile.ID = printer.Id.ToString(); - layeredProfile.UserLayer[SettingsKey.MatterControl_PrinterName.ToString()] = printer.Name ?? ""; - layeredProfile.UserLayer["MatterControl.Make"] = printer.Make ?? ""; - layeredProfile.UserLayer["MatterControl.Model"] = printer.Model ?? ""; - layeredProfile.UserLayer["MatterControl.BaudRate"] = printer.BaudRate ?? ""; - layeredProfile.UserLayer["MatterControl.ComPort"] = printer.ComPort ?? ""; - layeredProfile.UserLayer["MatterControl.AutoConnect"] = printer.AutoConnect ? "1" : "0"; - layeredProfile.UserLayer["MatterControl.DefaultMaterialPresets"] = printer.MaterialCollectionIds ?? ""; - layeredProfile.UserLayer["MatterControl.WindowsDriver"] = printer.DriverType ?? ""; - layeredProfile.UserLayer["MatterControl.DeviceToken"] = printer.DeviceToken ?? ""; - layeredProfile.UserLayer["MatterControl.DeviceType"] = printer.DeviceType ?? ""; + layeredProfile.UserLayer[SettingsKey.printer_name] = printer.Name ?? ""; + layeredProfile.UserLayer["MatterControl_Make"] = printer.Make ?? ""; + layeredProfile.UserLayer["model"] = printer.Model ?? ""; + layeredProfile.UserLayer["baud_rate"] = printer.BaudRate ?? ""; + layeredProfile.UserLayer["com_port"] = printer.ComPort ?? ""; + layeredProfile.UserLayer["auto_connect"] = printer.AutoConnect ? "1" : "0"; + layeredProfile.UserLayer["default_material_presets"] = printer.MaterialCollectionIds ?? ""; + layeredProfile.UserLayer["windows_driver"] = printer.DriverType ?? ""; + layeredProfile.UserLayer["device_token"] = printer.DeviceToken ?? ""; + layeredProfile.UserLayer["device_type"] = printer.DeviceType ?? ""; if (string.IsNullOrEmpty(UserSettings.Instance.get("ActiveProfileID"))) { UserSettings.Instance.set("ActiveProfileID", printer.Id.ToString()); } - layeredProfile.UserLayer["MatterControl.ActiveThemeIndex"] = UserSettings.Instance.get("ActiveThemeIndex"); + layeredProfile.UserLayer["active_theme_index"] = UserSettings.Instance.get("ActiveThemeIndex"); // Import macros from the database var allMacros = Datastore.Instance.dbSQLite.Query("SELECT * FROM CustomCommands WHERE PrinterId = " + printer.Id); @@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB string query = string.Format("SELECT * FROM PrinterSetting WHERE Name = 'PublishBedImage' and PrinterId = {0};", printer.Id); var publishBedImage = Datastore.Instance.dbSQLite.Query(query).FirstOrDefault(); - layeredProfile.UserLayer["MatterControl.PublishBedImage"] = publishBedImage?.Value == "true" ? "1" : "0"; + layeredProfile.UserLayer["publish_bed_image"] = publishBedImage?.Value == "true" ? "1" : "0"; // Print leveling var printLevelingData = PrintLevelingData.Create( @@ -127,10 +127,10 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB printer.PrintLevelingJsonData, printer.PrintLevelingProbePositions); - layeredProfile.UserLayer["MatterControl.PrintLevelingData"] = JsonConvert.SerializeObject(printLevelingData); - layeredProfile.UserLayer["MatterControl.PrintLevelingEnabled"] = printer.DoPrintLeveling ? "true" : "false"; + layeredProfile.UserLayer["print_leveling_data"] = JsonConvert.SerializeObject(printLevelingData); + layeredProfile.UserLayer["print_leveling_enabled"] = printer.DoPrintLeveling ? "true" : "false"; - layeredProfile.UserLayer["MatterControl.ManualMovementSpeeds"] = printer.ManualMovementSpeeds; + layeredProfile.UserLayer["manual_movement_speeds"] = printer.ManualMovementSpeeds; // TODO: Where can we find CalibrationFiiles in the current model? //layeredProfile.SetActiveValue("MatterControl.CalibrationFiles", printer.Make); diff --git a/PrinterCommunication/Io/PrintLevelingStream.cs b/PrinterCommunication/Io/PrintLevelingStream.cs index 6b086f689..016a747f5 100644 --- a/PrinterCommunication/Io/PrintLevelingStream.cs +++ b/PrinterCommunication/Io/PrintLevelingStream.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io string lineFromChild = base.ReadLine(); if (lineFromChild != null - && PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue("MatterControl.PrintLevelingEnabled")) + && PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue("print_leveling_enabled")) { if (LineIsMovement(lineFromChild)) { diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index b95965472..0cd4a8b56 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -397,9 +397,9 @@ namespace MatterHackers.MatterControl.PrinterCommunication { try { - if (ActiveSliceSettings.Instance.GetValue("MatterControl.BaudRate") != null) + if (ActiveSliceSettings.Instance.GetValue("baud_rate") != null) { - baudRate = Convert.ToInt32(ActiveSliceSettings.Instance.GetValue("MatterControl.BaudRate")); + baudRate = Convert.ToInt32(ActiveSliceSettings.Instance.GetValue("baud_rate")); } } catch @@ -1346,7 +1346,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication { // If leveling is required or is currently on if (ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print") - || ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + || ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { PrintLevelingData levelingData = ActiveSliceSettings.Instance.GetPrintLevelingData(); if(levelingData?.HasBeenRun() != true) @@ -1644,7 +1644,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication // run the print leveling wizard if we need to for this printer if (ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print") - || ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + || ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { PrintLevelingData levelingData = ActiveSliceSettings.Instance.GetPrintLevelingData(); if (levelingData?.HasBeenRun() != true) @@ -2327,7 +2327,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication OnConnectionFailed(null); - UiNavigation.GoToPrinterSettings("MatterControl.ComPort Edit Field"); + UiNavigation.GoToPrinterSettings("com_port Edit Field"); } } diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs index 34cc0804b..98acd3ea4 100644 --- a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs +++ b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections BaudRateButtonsList.Add(baudOption); baudOption.Margin = baudRateMargin; baudOption.TextColor = ActiveTheme.Instance.PrimaryTextColor; - if (ActiveSliceSettings.Instance.GetValue("MatterControl.BaudRate") == baudRate) + if (ActiveSliceSettings.Instance.GetValue("baud_rate") == baudRate) { baudOption.Checked = true; } @@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections otherBaudRateInput.Visible = false; otherBaudRateInput.HAnchor = HAnchor.ParentLeftRight; - string currentBaudRate = ActiveSliceSettings.Instance.GetValue("MatterControl.BaudRate"); + string currentBaudRate = ActiveSliceSettings.Instance.GetValue("baud_rate"); if (currentBaudRate != null) { if (!baudRates.Contains(currentBaudRate)) diff --git a/Queue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs index 89a1aa091..9416c37e1 100644 --- a/Queue/OptionsMenu/ExportToFolderProcess.cs +++ b/Queue/OptionsMenu/ExportToFolderProcess.cs @@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl.PrintQueue string outputFileName = Path.ChangeExtension(originalFileName, ".gcode"); string outputPathAndName = Path.Combine(exportPath, outputFileName); - if (ActiveSliceSettings.Instance.GetValue("MatterControl.PrintLevelingEnabled")) + if (ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) { GCodeFileLoaded unleveledGCode = new GCodeFileLoaded(savedGcodeFileName); diff --git a/SetupWizard/EditPrinterSettingsPage.cs b/SetupWizard/EditPrinterSettingsPage.cs index 1a3d3742e..22bd12a1f 100644 --- a/SetupWizard/EditPrinterSettingsPage.cs +++ b/SetupWizard/EditPrinterSettingsPage.cs @@ -49,11 +49,11 @@ namespace MatterHackers.MatterControl textImageButtonFactory.normalBorderColor = RGBA_Bytes.White; int tabIndex = 0; - AddNameSetting(SettingsKey.MatterControl_PrinterName.ToString(), contentRow, ref tabIndex); - AddNameSetting("MatterControl.AutoConnect", contentRow, ref tabIndex); - AddNameSetting("MatterControl.BaudRate", contentRow, ref tabIndex); - AddNameSetting("MatterControl.ComPort", contentRow, ref tabIndex); - AddNameSetting("MatterControl.DeletePrinter", contentRow, ref tabIndex); + AddNameSetting(SettingsKey.printer_name.ToString(), contentRow, ref tabIndex); + AddNameSetting("auto_connect", contentRow, ref tabIndex); + AddNameSetting("baud_rate", contentRow, ref tabIndex); + AddNameSetting("com_port", contentRow, ref tabIndex); + AddNameSetting("delete_printer", contentRow, ref tabIndex); footerRow.AddChild(new HorizontalSpacer()); footerRow.AddChild(cancelButton); diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index ad6942ae5..e4b0b6607 100644 --- a/SetupWizard/WizardWindow.cs +++ b/SetupWizard/WizardWindow.cs @@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl internal void ChangeToSetupBaudOrComPortOne() { - if (string.IsNullOrEmpty(PrinterConnectionAndCommunication.Instance?.ActivePrinter?.GetValue("MatterControl.BaudRate"))) + if (string.IsNullOrEmpty(PrinterConnectionAndCommunication.Instance?.ActivePrinter?.GetValue("baud_rate"))) { ChangeToPage(); } diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index c867907f3..9d35539ef 100644 --- a/SlicerConfiguration/Settings/ActiveSliceSettings.cs +++ b/SlicerConfiguration/Settings/ActiveSliceSettings.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration activeInstance = value; if (activeInstance != null) { - BedSettings.SetMakeAndModel(activeInstance.GetValue("MatterControl.Make"), activeInstance.GetValue("MatterControl.Model")); + BedSettings.SetMakeAndModel(activeInstance.GetValue("MatterControl_Make"), activeInstance.GetValue("model")); } SwitchToPrinterTheme(MatterControlApplication.IsLoading); @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration int themeIndex; if (ActiveSliceSettings.Instance != null) { - string activeThemeIndex = ActiveSliceSettings.Instance.GetValue("MatterControl.ActiveThemeIndex"); + string activeThemeIndex = ActiveSliceSettings.Instance.GetValue("active_theme_index"); if (string.IsNullOrEmpty(activeThemeIndex) || !int.TryParse(activeThemeIndex, out themeIndex)) { themeIndex = defaultThemeIndex; @@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration portExists = comportNames.Contains(startupProfile.ComPort()); Instance = startupProfile; - if (portExists && startupProfile.GetValue("MatterControl.AutoConnect")) + if (portExists && startupProfile.GetValue("auto_connect")) { UiThread.RunOnIdle(() => { diff --git a/SlicerConfiguration/Settings/LayeredProfile.cs b/SlicerConfiguration/Settings/LayeredProfile.cs index c7c0abcc3..f00cf2166 100644 --- a/SlicerConfiguration/Settings/LayeredProfile.cs +++ b/SlicerConfiguration/Settings/LayeredProfile.cs @@ -51,25 +51,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { var jObject = JObject.Parse(File.ReadAllText(filePath)); - if (fromVersion < 201606081) - { - JObject materialLayers, qualityLayers; - - materialLayers = jObject["MaterialLayers"] as JObject; - if (materialLayers != null) - { - jObject["MaterialLayers"] = new JArray(materialLayers.Properties().ToList().Select(layer => layer.Value).ToArray()); - qualityLayers = jObject["QualityLayers"] as JObject; - jObject["QualityLayers"] = new JArray(qualityLayers.Properties().ToList().Select(layer => layer.Value).ToArray()); - - var oemProfile = jObject["OemProfile"] as JObject; - oemProfile.Property("MaterialLayers").Remove(); - oemProfile.Property("QualityLayers").Remove(); - } - jObject["DocumentVersion"] = 201606081; - fromVersion = 201606081; - } - if (fromVersion < 201605131) { var materialLayers = jObject["MaterialLayers"] as JObject; @@ -115,6 +96,144 @@ namespace MatterHackers.MatterControl.SlicerConfiguration filePath = Path.Combine(Path.GetDirectoryName(filePath), printerID + ".json"); } + if (fromVersion < 201606081) + { + JObject materialLayers, qualityLayers; + + materialLayers = jObject["MaterialLayers"] as JObject; + if (materialLayers != null) + { + jObject["MaterialLayers"] = new JArray(materialLayers.Properties().ToList().Select(layer => layer.Value).ToArray()); + qualityLayers = jObject["QualityLayers"] as JObject; + jObject["QualityLayers"] = new JArray(qualityLayers.Properties().ToList().Select(layer => layer.Value).ToArray()); + + var oemProfile = jObject["OemProfile"] as JObject; + oemProfile.Property("MaterialLayers").Remove(); + oemProfile.Property("QualityLayers").Remove(); + } + jObject["DocumentVersion"] = 201606081; + } + + if (fromVersion < 201606161) + { + var layersToModify = new List(); + + layersToModify.Add(jObject["UserLayer"] as JObject); + layersToModify.Add(jObject["OemProfile"]["OemLayer"] as JObject); + layersToModify.AddRange(jObject["MaterialLayers"].Cast()); + layersToModify.AddRange(jObject["QualityLayers"].Cast()); + + foreach (var layer in layersToModify) + { + var itemsToAdd = new List>(); + + foreach (var token in layer) + { + if (token.Key.StartsWith("MatterControl.")) + { + itemsToAdd.Add(token); + } + } + + foreach (var item in itemsToAdd) + { + layer.Remove(item.Key); + + switch (item.Key) + { + case "MatterControl.PrinterName": + layer.Add("printer_name", item.Value); + break; + + case "MatterControl.BaudRate": + layer.Add("baud_rate", item.Value); + break; + + case "MatterControl.Make": + layer.Add("make", item.Value); + break; + + case "MatterControl.Model": + layer.Add("model", item.Value); + break; + + case "MatterControl.ComPort": + layer.Add("com_port", item.Value); + break; + + case "MatterControl.AutoConnect": + layer.Add("auto_connect", item.Value); + break; + + case "MatterControl.DefaultMaterialPresets": + layer.Add("default_material_presets", item.Value); + break; + + case "MatterControl.WindowsDriver": + layer.Add("windows_driver", item.Value); + break; + + case "MatterControl.DeviceToken": + layer.Add("device_token", item.Value); + break; + + case "MatterControl.DeviceType": + layer.Add("device_type", item.Value); + break; + + case "MatterControl.ActiveThemeIndex": + layer.Add("active_theme_index", item.Value); + break; + + case "MatterControl.PublishBedImage": + layer.Add("publish_bed_image", item.Value); + break; + + case "MatterControl.PrintLevelingData": + layer.Add("print_leveling_data", item.Value); + break; + + case "MatterControl.PrintLevelingEnabled": + layer.Add("print_leveling_enabled", item.Value); + break; + + case "MatterControl.DeletePrinter": + layer.Add("delete_printer", item.Value); + break; + + case "MatterControl.ManualMovementSpeeds": + layer.Add("manual_movement_speeds", item.Value); + break; + + case "MatterControl.SHA1": + layer.Add("profile_sha1", item.Value); + break; + + default: + + if (item.Key.Contains("ComPort")) + { + var segments = item.Key.Split('.'); + + if (segments.Length != 3) + { + throw new Exception("Why didn't we know how to add this."); + } + layer.Add(segments[1] + "_com_port", item.Value); + break; + } + else + { + throw new Exception("Why didn't we know how to add this."); + } + + } + } + } + + jObject["DocumentVersion"] = 201606161; + } + File.WriteAllText( filePath, JsonConvert.SerializeObject(jObject, Formatting.Indented)); @@ -131,7 +250,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration // Latest version should be 2016|06|08|1 // Year|month|day|versionForDay (to support multiple revisions on a given day) - public static int LatestVersion { get; } = 201606081; + public static int LatestVersion { get; } = 201606161; [JsonIgnore] internal PrinterSettingsLayer QualityLayer { get; private set; } @@ -256,7 +375,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(json))) { string sha1 = GenerateSha1(memoryStream); - this.UserLayer["MatterControl.SHA1"] = sha1; + this.UserLayer["profile_sha1"] = sha1; var printerInfo = ProfileManager.Instance[this.ID]; if (printerInfo != null) @@ -276,7 +395,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration internal static PrinterSettings LoadFile(string printerProfilePath) { var jObject = JObject.Parse(File.ReadAllText(printerProfilePath)); - int documentVersion = (int) jObject?.GetValue("DocumentVersion")?.Value(); + + int documentVersion = jObject?.GetValue("DocumentVersion")?.Value() ?? 0; if (documentVersion < PrinterSettings.LatestVersion) { diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/SlicerConfiguration/Settings/ProfileManager.cs index 523bcac7a..f64abe361 100644 --- a/SlicerConfiguration/Settings/ProfileManager.cs +++ b/SlicerConfiguration/Settings/ProfileManager.cs @@ -86,12 +86,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration string settingsKey = ((StringEventArgs)e).Data; switch (settingsKey) { - case SettingsKey.MatterControl_PrinterName: - Instance.ActiveProfile.Name = ActiveSliceSettings.Instance.GetValue(SettingsKey.MatterControl_PrinterName); + case SettingsKey.printer_name: + Instance.ActiveProfile.Name = ActiveSliceSettings.Instance.GetValue(SettingsKey.printer_name); Instance.Save(); break; - case "MatterControl.ComPort": + case "com_port": Instance.ActiveProfile.ComPort = ActiveSliceSettings.Instance.ComPort(); Instance.Save(); break; @@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new OemProfile(), SliceSettingsOrganizer.Instance.GetDefaultSettings())); - empytProfile.SetActiveValue(SettingsKey.MatterControl_PrinterName.ToString(), "Printers...".Localize()); + empytProfile.SetActiveValue(SettingsKey.printer_name.ToString(), "Printers...".Localize()); return empytProfile; } @@ -193,7 +193,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration }; // TODO: Resolve name conflicts - layeredProfile.UserLayer[SettingsKey.MatterControl_PrinterName.ToString()] = printerInfo.Name; + layeredProfile.UserLayer[SettingsKey.printer_name.ToString()] = printerInfo.Name; Instance.Profiles.Add(printerInfo); @@ -216,7 +216,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { ID = guid }; - layeredProfile.UserLayer[SettingsKey.MatterControl_PrinterName.ToString()] = printerName; + layeredProfile.UserLayer[SettingsKey.printer_name.ToString()] = printerName; // Import named macros as defined in the following printers: (Airwolf Axiom, HD, HD-R, HD2x, HDL, HDx, Me3D Me2, Robo R1[+]) var classicDefaultMacros = layeredProfile.GetValue("default_macros"); @@ -316,7 +316,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { ComPort = profile.ComPort(), ID = profile.ID, - Name = profile.GetValue(SettingsKey.MatterControl_PrinterName), + Name = profile.GetValue(SettingsKey.printer_name), }); } catch (Exception ex) diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs index 9e3fbe206..cb2c65817 100644 --- a/SlicerConfiguration/Settings/SettingsProfile.cs +++ b/SlicerConfiguration/Settings/SettingsProfile.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string resume_position_before_z_home = nameof(resume_position_before_z_home); public const string z_homes_to_max = nameof(z_homes_to_max); public const string nozzle_diameter = nameof(nozzle_diameter); - public const string MatterControl_PrinterName = nameof(MatterControl_PrinterName); + public const string printer_name = nameof(printer_name); public const string min_fan_speed = nameof(min_fan_speed); public const string extruder_count = nameof(extruder_count); public const string extruders_share_temperature = nameof(extruders_share_temperature); @@ -236,8 +236,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { switch (item.SlicerConfigName) { - case "MatterControl.BaudRate": - case "MatterControl.AutoConnect": + case "baud_rate": + case "auto_connect": // These items are marked as not being overrides but should be cleared on 'reset to defaults' break; default: @@ -334,7 +334,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { printLevelingData = PrintLevelingData.Create( ActiveSliceSettings.Instance, - layeredProfile.GetValue("MatterControl.PrintLevelingData"), + layeredProfile.GetValue("print_leveling_data"), layeredProfile.GetValue("MatterControl.PrintLevelingProbePositions")); PrintLevelingPlane.Instance.SetPrintLevelingEquation( @@ -350,19 +350,19 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetPrintLevelingData(PrintLevelingData data) { printLevelingData = data; - layeredProfile.SetValue("MatterControl.PrintLevelingData", JsonConvert.SerializeObject(data)); + layeredProfile.SetValue("print_leveling_data", JsonConvert.SerializeObject(data)); } public void DoPrintLeveling(bool doLeveling) { // Early exit if already set - if (doLeveling == this.GetValue("MatterControl.PrintLevelingEnabled")) + if (doLeveling == this.GetValue("print_leveling_enabled")) { return; } - layeredProfile.SetValue("MatterControl.PrintLevelingEnabled", doLeveling ? "1" : "0"); + layeredProfile.SetValue("print_leveling_enabled", doLeveling ? "1" : "0"); DoPrintLevelingChanged.CallEvents(this, null); @@ -611,7 +611,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } // If we have print leveling turned on then make sure we don't have any leveling commands in the start gcode. - if (PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue("MatterControl.PrintLevelingEnabled")) + if (PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue("print_leveling_enabled")) { string[] startGCode = GetValue("start_gcode").Replace("\\n", "\n").Split('\n'); foreach (string startGCodeLine in startGCode) @@ -765,7 +765,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetAutoConnect(bool autoConnectPrinter) { - layeredProfile.SetValue("MatterControl.AutoConnect", autoConnectPrinter ? "1" : "0"); + layeredProfile.SetValue("auto_connect", autoConnectPrinter ? "1" : "0"); } public void SetMarkedForDelete(bool markedForDelete) @@ -787,7 +787,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetBaudRate(string baudRate) { - layeredProfile.SetValue("MatterControl.BaudRate", baudRate); + layeredProfile.SetValue("baud_rate", baudRate); } public string ComPort() @@ -817,15 +817,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetDeviceToken(string token) { - if (layeredProfile.GetValue("MatterControl.DeviceToken") != token) + if (layeredProfile.GetValue("device_token") != token) { - layeredProfile.SetValue("MatterControl.DeviceToken", token); + layeredProfile.SetValue("device_token", token); } } public void SetName(string name) { - layeredProfile.SetValue(SettingsKey.MatterControl_PrinterName, name); + layeredProfile.SetValue(SettingsKey.printer_name, name); } HashSet knownSettings = null; @@ -849,12 +849,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public string ManualMovementSpeeds() { - return layeredProfile.GetValue("MatterControl.ManualMovementSpeeds"); + return layeredProfile.GetValue("manual_movement_speeds"); } public void SetManualMovementSpeeds(string speed) { - layeredProfile.SetValue("MatterControl.ManualMovementSpeeds", speed); + layeredProfile.SetValue("manual_movement_speeds", speed); } } diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index ae130e3e6..6606a4177 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -1164,7 +1164,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration #if __ANDROID__ addControl = false; #endif - // The COM_PORT control is unique in its approach to the SlicerConfigName. It uses "MatterControl.ComPort" settings name to + // The COM_PORT control is unique in its approach to the SlicerConfigName. It uses "com_port" settings name to // bind to a context that will place it in the SliceSetting view but it binds its values to a machine // specific dictionary key that is not exposed in the UI. At runtime we lookup and store to "MatterControl..ComPort" // ensuring that a single printer can be shared across different devices and we'll select the correct ComPort in each case diff --git a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs index 6a4365de4..ed9002f38 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs @@ -53,11 +53,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration "has_heated_bed", "has_power_control", "has_sd_card_reader", - "MatterControl_PrinterName", - "MatterControl.AutoConnect", - "MatterControl.BaudRate", - "MatterControl.ComPort", - "MatterControl.DeletePrinter", + "printer_name", + "auto_connect", + "baud_rate", + "com_port", + "delete_printer", "manual_probe_paper_width", "pause_gcode", "print_leveling_method", diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 5f59e5482..47633d78b 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -10,12 +10,12 @@ Simple Printer Connection Description - MatterControl.PrinterName + printer_name Details - MatterControl.AutoConnect - MatterControl.BaudRate - MatterControl.ComPort - MatterControl.DeletePrinter + auto_connect + baud_rate + com_port + delete_printer Intermediate General Layers/Surface @@ -69,12 +69,12 @@ Intermediate Printer Connection Description - MatterControl.PrinterName + printer_name Details - MatterControl.AutoConnect - MatterControl.BaudRate - MatterControl.ComPort - MatterControl.DeletePrinter + auto_connect + baud_rate + com_port + delete_printer Advanced General Layers/Surface @@ -270,12 +270,12 @@ Advanced Printer Connection Description - MatterControl.PrinterName + printer_name Details - MatterControl.AutoConnect - MatterControl.BaudRate - MatterControl.ComPort - MatterControl.DeletePrinter + auto_connect + baud_rate + com_port + delete_printer Print Area Size and Coordinates bed_size diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 1caba4023..c487f319b 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -2303,7 +2303,7 @@ } ], "SetSettingsOnChange": [], - "SlicerConfigName": "MatterControl.BaudRate", + "SlicerConfigName": "baud_rate", "PresentationName": "Baud Rate", "HelpText": "The serial port communication speed of the printers firmware.", "DataEditType": "INT", @@ -2316,7 +2316,7 @@ { "QuickMenuSettings": [], "SetSettingsOnChange": [], - "SlicerConfigName": "MatterControl.DeletePrinter", + "SlicerConfigName": "delete_printer", "PresentationName": "", "HelpText": "Delete the currently selected printer profile.", "DataEditType": "DELETE_PRINTER", @@ -2329,7 +2329,7 @@ { "QuickMenuSettings": [], "SetSettingsOnChange": [], - "SlicerConfigName": SettingsKey.MatterControl_PrinterName, + "SlicerConfigName": "printer_name", "PresentationName": "Printer Name", "HelpText": "This is the name of your printer that will be displayed in the choose printer menu.", "DataEditType": "STRING", @@ -2342,7 +2342,7 @@ { "QuickMenuSettings": [], "SetSettingsOnChange": [], - "SlicerConfigName": "MatterControl.AutoConnect", + "SlicerConfigName": "auto_connect", "PresentationName": "Auto Connect", "HelpText": "If set, the printer will automatically attempt to connect when selected.", "DataEditType": "CHECK_BOX", @@ -2355,7 +2355,7 @@ { "QuickMenuSettings": [], "SetSettingsOnChange": [], - "SlicerConfigName": "MatterControl.ComPort", + "SlicerConfigName": "com_port", "PresentationName": "COM Port", "HelpText": "The COM port to use while connecting to this printer.", "DataEditType": "COM_PORT",