From da695dc581a32542785f71b9ae06f283c3f88e35 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 12 Jul 2016 17:46:48 -0700 Subject: [PATCH] Convert more string literals into SettingsKey constants --- .../CalibrationSettingsView.cs | 2 +- ConfigurationPage/PrinterConfigurationPage.cs | 2 +- .../Classic/ClassicSqlitePrinterProfiles.cs | 14 ++++---- History/PrintHistoryData.cs | 2 +- PartPreviewWindow/ViewGcodeBasic.cs | 10 +++--- PartPreviewWindow/ViewGcodeWidget.cs | 2 +- .../PrinterConnectionAndCommunication.cs | 10 +++--- .../ControlWidgets/PowerControls.cs | 2 +- PrinterControls/ManualPrinterControls.cs | 2 +- .../PrinterConnections/SetupStepBaudRate.cs | 4 +-- .../SetupStepInstallDriver.cs | 2 +- Queue/OptionsMenu/QueueOptionsMenu.cs | 2 +- Queue/QueueDataWidget.cs | 2 +- SetupWizard/EditPrinterSettingsPage.cs | 10 +++--- SetupWizard/WizardWindow.cs | 2 +- .../Settings/ActiveSliceSettings.cs | 2 +- .../Settings/ProfileManager.cs | 10 +++--- .../Settings/ProfileMigrations.cs | 22 ++++++------ .../Settings/SettingsProfile.cs | 34 +++++++++++++----- SlicerConfiguration/SliceSettingsWidget.cs | 2 +- .../SlicerMapping/EngineMapingBase.cs | 35 ++++++++++--------- .../SlicerMapping/EngineMappingCura.cs | 4 +-- .../SlicerMapping/EngineMappingMatterSlice.cs | 4 +-- .../SlicerMapping/MappingClasses.cs | 2 +- 24 files changed, 101 insertions(+), 82 deletions(-) diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index f8016b3e7..bcea93eca 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage : base("Calibration".Localize()) { printLevelingContainer = new DisableableWidget(); - if (!ActiveSliceSettings.Instance.GetValue("has_hardware_leveling")) + if (!ActiveSliceSettings.Instance.GetValue(SettingsKey.has_hardware_leveling)) { printLevelingContainer.AddChild(GetAutoLevelControl()); diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index 7de6b9d57..776718e93 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl mainLayoutContainer.VAnchor = Agg.UI.VAnchor.FitToChildren; mainLayoutContainer.Padding = new BorderDouble(top: 10); - if (!ActiveSliceSettings.Instance.GetValue("has_hardware_leveling")) + if (!ActiveSliceSettings.Instance.GetValue(SettingsKey.has_hardware_leveling)) { mainLayoutContainer.AddChild(new CalibrationSettingsWidget()); } diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs index fba57bc8e..4308a52bd 100644 --- a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs +++ b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs @@ -93,13 +93,13 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB layeredProfile.UserLayer[SettingsKey.printer_name] = printer.Name ?? ""; layeredProfile.UserLayer[SettingsKey.make] = printer.Make ?? ""; layeredProfile.UserLayer[SettingsKey.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 ?? ""; + layeredProfile.UserLayer[SettingsKey.baud_rate] = printer.BaudRate ?? ""; + layeredProfile.UserLayer[SettingsKey.com_port] = printer.ComPort ?? ""; + layeredProfile.UserLayer[SettingsKey.auto_connect] = printer.AutoConnect ? "1" : "0"; + layeredProfile.UserLayer[SettingsKey.default_material_presets] = printer.MaterialCollectionIds ?? ""; + layeredProfile.UserLayer[SettingsKey.windows_driver] = printer.DriverType ?? ""; + layeredProfile.UserLayer[SettingsKey.device_token] = printer.DeviceToken ?? ""; + layeredProfile.UserLayer[SettingsKey.device_type] = printer.DeviceType ?? ""; if (string.IsNullOrEmpty(ProfileManager.Instance.LastProfileID)) { diff --git a/History/PrintHistoryData.cs b/History/PrintHistoryData.cs index c7cef9ca8..982b366a7 100644 --- a/History/PrintHistoryData.cs +++ b/History/PrintHistoryData.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrintHistory && !string.IsNullOrEmpty(lastPrint.PrintingGCodeFileName) // PrintingGCodeFileName is set && File.Exists(lastPrint.PrintingGCodeFileName) // PrintingGCodeFileName is still on disk && lastPrint.PercentDone > 0 // we are actually part way into the print - && ActiveSliceSettings.Instance.GetValue("has_hardware_leveling") == "0") + && ActiveSliceSettings.Instance.GetValue(SettingsKey.has_hardware_leveling) == "0") { lastPrintTask = lastPrint; StyledMessageBox.ShowMessageBox(ResumeFailedPrintProcessDialogResponse, resumeFailedPrintMessage, resumeFailedPrintTitle, StyledMessageBox.MessageType.YES_NO, resumePrint, cancelResume); diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 4accde35e..84719f327 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -474,7 +474,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // show the filament used modelInfoContainer.AddChild(new TextWidget(filamentLengthLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9)); { - double filamentUsed = gcodeViewWidget.LoadedGCode.GetFilamentUsedMm(ActiveSliceSettings.Instance.GetValue("filament_diameter")); + double filamentUsed = gcodeViewWidget.LoadedGCode.GetFilamentUsedMm(ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter)); GuiWidget estimatedPrintTime = new TextWidget(string.Format("{0:0.0} mm", filamentUsed), pointSize: 14, textColor: ActiveTheme.Instance.PrimaryTextColor); //estimatedPrintTime.HAnchor = Agg.UI.HAnchor.ParentLeft; @@ -486,7 +486,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow string filamentVolumeLabelFull = string.Format("{0}:", filamentVolumeLabel); modelInfoContainer.AddChild(new TextWidget(filamentVolumeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9)); { - double filamentMm3 = gcodeViewWidget.LoadedGCode.GetFilamentCubicMm(ActiveSliceSettings.Instance.GetValue("filament_diameter")); + double filamentMm3 = gcodeViewWidget.LoadedGCode.GetFilamentCubicMm(ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter)); GuiWidget estimatedPrintTime = new TextWidget(string.Format("{0:0.00} cm3", filamentMm3 / 1000), pointSize: 14, textColor: ActiveTheme.Instance.PrimaryTextColor); //estimatedPrintTime.HAnchor = Agg.UI.HAnchor.ParentLeft; @@ -497,9 +497,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow string massLabel = "Estimated Mass".Localize(); string massLabelFull = string.Format("{0}:", massLabel); modelInfoContainer.AddChild(new TextWidget(massLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); - double filamentDiameter = ActiveSliceSettings.Instance.GetValue("filament_diameter"); - double filamentDensity = ActiveSliceSettings.Instance.GetValue("filament_density"); - double filamentCost = ActiveSliceSettings.Instance.GetValue("filament_cost"); + double filamentDiameter = ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter); + double filamentDensity = ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_density); + double filamentCost = ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_cost); double totalMass = gcodeViewWidget.LoadedGCode.GetFilamentWeightGrams(filamentDiameter, filamentDensity); double totalCost = totalMass / 1000 * filamentCost; diff --git a/PartPreviewWindow/ViewGcodeWidget.cs b/PartPreviewWindow/ViewGcodeWidget.cs index 3a5410327..60c0f72d2 100644 --- a/PartPreviewWindow/ViewGcodeWidget.cs +++ b/PartPreviewWindow/ViewGcodeWidget.cs @@ -301,7 +301,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { try { - gCodeRenderer.GCodeFileToDraw?.GetFilamentUsedMm(ActiveSliceSettings.Instance.GetValue("filament_diameter")); + gCodeRenderer.GCodeFileToDraw?.GetFilamentUsedMm(ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter)); } catch (Exception e) { diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index 5f8330ef5..e39c7e7c2 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -397,9 +397,9 @@ namespace MatterHackers.MatterControl.PrinterCommunication { try { - if (!string.IsNullOrEmpty(ActiveSliceSettings.Instance.GetValue("baud_rate"))) + if (!string.IsNullOrEmpty(ActiveSliceSettings.Instance.GetValue(SettingsKey.baud_rate))) { - baudRate = Convert.ToInt32(ActiveSliceSettings.Instance.GetValue("baud_rate")); + baudRate = Convert.ToInt32(ActiveSliceSettings.Instance.GetValue(SettingsKey.baud_rate)); } } catch @@ -1359,7 +1359,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null) { string pathAndFile = PrinterConnectionAndCommunication.Instance.ActivePrintItem.FileLocation; - if (ActiveSliceSettings.Instance.GetValue("has_sd_card_reader") + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.has_sd_card_reader) && pathAndFile == QueueData.SdCardFileName) { PrinterConnectionAndCommunication.Instance.StartSdCardPrint(); @@ -1636,7 +1636,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication { CommunicationState = CommunicationStates.Connected; // now send any command that initialize this printer - string connectGCode = ActiveSliceSettings.Instance.GetValue("connect_gcode"); + string connectGCode = ActiveSliceSettings.Instance.GetValue(SettingsKey.connect_gcode); SendLineToPrinterNow(connectGCode); // and call back anyone who would like to know we connected @@ -2143,7 +2143,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication { // get rid of all the gcode we have left to print ClearQueuedGCode(); - string cancelGCode = ActiveSliceSettings.Instance.GetValue("cancel_gcode"); + string cancelGCode = ActiveSliceSettings.Instance.GetValue(SettingsKey.cancel_gcode); if (cancelGCode.Trim() != "") { // add any gcode we want to print while canceling diff --git a/PrinterControls/ControlWidgets/PowerControls.cs b/PrinterControls/ControlWidgets/PowerControls.cs index 08f323997..2e19d11c7 100644 --- a/PrinterControls/ControlWidgets/PowerControls.cs +++ b/PrinterControls/ControlWidgets/PowerControls.cs @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.PrinterControls private void UpdateControlVisibility(object sender, EventArgs args) { - this.Visible = ActiveSliceSettings.Instance.GetValue("has_power_control"); + this.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.has_power_control); this.SetEnableLevel(PrinterConnectionAndCommunication.Instance.PrinterIsConnected ? EnableLevel.Enabled : EnableLevel.Disabled); } diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs index 61724b70b..e0bfb0e81 100644 --- a/PrinterControls/ManualPrinterControls.cs +++ b/PrinterControls/ManualPrinterControls.cs @@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl private void AddFanControls(FlowLayoutWidget controlsTopToBottomLayout) { fanControlsContainer = new FanControls(); - if (ActiveSliceSettings.Instance.GetValue("has_fan")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.has_fan)) { controlsTopToBottomLayout.AddChild(fanControlsContainer); } diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs index f154412c6..685d5bbad 100644 --- a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs +++ b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs @@ -103,7 +103,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections BaudRateButtonsList.Add(baudOption); baudOption.Margin = baudRateMargin; baudOption.TextColor = ActiveTheme.Instance.PrimaryTextColor; - if (ActiveSliceSettings.Instance.GetValue("baud_rate") == baudRate) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.baud_rate) == baudRate) { baudOption.Checked = true; } @@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections otherBaudRateInput.Visible = false; otherBaudRateInput.HAnchor = HAnchor.ParentLeftRight; - string currentBaudRate = ActiveSliceSettings.Instance.GetValue("baud_rate"); + string currentBaudRate = ActiveSliceSettings.Instance.GetValue(SettingsKey.baud_rate); if (currentBaudRate != null) { if (!baudRates.Contains(currentBaudRate)) diff --git a/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs b/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs index eab8d8fcd..e69649947 100644 --- a/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs +++ b/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs @@ -174,7 +174,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections var drivers = new List(); //Determine what if any drivers are needed - string infFileNames = ActiveSliceSettings.Instance.GetValue("windows_driver"); + string infFileNames = ActiveSliceSettings.Instance.GetValue(SettingsKey.windows_driver); if (!string.IsNullOrEmpty(infFileNames)) { string[] fileNames = infFileNames.Split(','); diff --git a/Queue/OptionsMenu/QueueOptionsMenu.cs b/Queue/OptionsMenu/QueueOptionsMenu.cs index 2b8f07448..a1a8c5a48 100644 --- a/Queue/OptionsMenu/QueueOptionsMenu.cs +++ b/Queue/OptionsMenu/QueueOptionsMenu.cs @@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PrintQueue //menuItems.Add(new Tuple>("X3G", null)); //menuItems.Add(new Tuple>("Export to Folder".Localize(), exportX3GButton_Click)); - if (ActiveSliceSettings.Instance.GetValue("has_sd_card_reader")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.has_sd_card_reader)) { menuItems.Add(new Tuple>("SD Card", null)); menuItems.Add(new Tuple>(" Load Files".Localize(), loadFilesFromSDButton_Click)); diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index faaec00df..bb4f84624 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -211,7 +211,7 @@ namespace MatterHackers.MatterControl.PrintQueue if (ActiveSliceSettings.Instance != null) { activeFilamentDiameter = 3; - if (ActiveSliceSettings.Instance.GetValue("filament_diameter") < 2) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter) < 2) { activeFilamentDiameter = 1.75; } diff --git a/SetupWizard/EditPrinterSettingsPage.cs b/SetupWizard/EditPrinterSettingsPage.cs index 22bd12a1f..23bacedc9 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.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); + AddNameSetting(SettingsKey.printer_name, contentRow, ref tabIndex); + AddNameSetting(SettingsKey.auto_connect, contentRow, ref tabIndex); + AddNameSetting(SettingsKey.baud_rate, contentRow, ref tabIndex); + AddNameSetting(SettingsKey.com_port, contentRow, ref tabIndex); + AddNameSetting(SettingsKey.delete_printer, contentRow, ref tabIndex); footerRow.AddChild(new HorizontalSpacer()); footerRow.AddChild(cancelButton); diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index e4b0b6607..faf37da35 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("baud_rate"))) + if (string.IsNullOrEmpty(PrinterConnectionAndCommunication.Instance?.ActivePrinter?.GetValue(SettingsKey.baud_rate))) { ChangeToPage(); } diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index 4080c93a9..20911dde0 100644 --- a/SlicerConfiguration/Settings/ActiveSliceSettings.cs +++ b/SlicerConfiguration/Settings/ActiveSliceSettings.cs @@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration portExists = comportNames.Contains(startupProfile.ComPort()); Instance = startupProfile; - if (portExists && startupProfile.GetValue("auto_connect")) + if (portExists && startupProfile.GetValue(SettingsKey.auto_connect)) { UiThread.RunOnIdle(() => { diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/SlicerConfiguration/Settings/ProfileManager.cs index 34b33a9f9..404e19f61 100644 --- a/SlicerConfiguration/Settings/ProfileManager.cs +++ b/SlicerConfiguration/Settings/ProfileManager.cs @@ -119,8 +119,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration Instance.ActiveProfile.Name = ActiveSliceSettings.Instance.GetValue(SettingsKey.printer_name); Instance.Save(); break; - - case "com_port": + + case SettingsKey.com_port: Instance.ActiveProfile.ComPort = ActiveSliceSettings.Instance.ComPort(); Instance.Save(); break; @@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { var empytProfile = new SettingsProfile(new PrinterSettings()); empytProfile.ID = "EmptyProfile"; - empytProfile.UserLayer["printer_name"] = "Printers...".Localize(); + empytProfile.UserLayer[SettingsKey.printer_name] = "Printers...".Localize(); return empytProfile; } @@ -241,7 +241,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration case ".printer": var profile = ProfileManager.LoadProfileFromDisk(settingsFilePath); profile.ID = printerInfo.ID; - profile.ClearValue("device_token"); + profile.ClearValue(SettingsKey.device_token); printerInfo.DeviceToken = ""; // TODO: Resolve name conflicts @@ -264,7 +264,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration // TODO: Resolve name conflicts layeredProfile.UserLayer[SettingsKey.printer_name.ToString()] = printerInfo.Name; - layeredProfile.ClearValue("device_token"); + layeredProfile.ClearValue(SettingsKey.device_token); printerInfo.DeviceToken = ""; Instance.Profiles.Add(printerInfo); diff --git a/SlicerConfiguration/Settings/ProfileMigrations.cs b/SlicerConfiguration/Settings/ProfileMigrations.cs index ae9d8e492..3c280c979 100644 --- a/SlicerConfiguration/Settings/ProfileMigrations.cs +++ b/SlicerConfiguration/Settings/ProfileMigrations.cs @@ -141,39 +141,39 @@ namespace MatterHackers.MatterControl.SlicerConfiguration switch (item.Key) { case "MatterControl.PrinterName": - layer.Add("printer_name", item.Value); + layer.Add(SettingsKey.printer_name, item.Value); break; case "MatterControl.BaudRate": - layer.Add("baud_rate", item.Value); + layer.Add(SettingsKey.baud_rate, item.Value); break; case "MatterControl.Make": - layer.Add("make", item.Value); + layer.Add(SettingsKey.make, item.Value); break; case "MatterControl.Model": - layer.Add("model", item.Value); + layer.Add(SettingsKey.model, item.Value); break; case "MatterControl.ComPort": - layer.Add("com_port", item.Value); + layer.Add(SettingsKey.com_port, item.Value); break; case "MatterControl.AutoConnect": - layer.Add("auto_connect", item.Value); + layer.Add(SettingsKey.auto_connect, item.Value); break; case "MatterControl.DefaultMaterialPresets": - layer.Add("default_material_presets", item.Value); + layer.Add(SettingsKey.default_material_presets, item.Value); break; case "MatterControl.WindowsDriver": - layer.Add("windows_driver", item.Value); + layer.Add(SettingsKey.windows_driver, item.Value); break; case "MatterControl.DeviceToken": - layer.Add("device_token", item.Value); + layer.Add(SettingsKey.device_token, item.Value); break; case "MatterControl.DriverType": @@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration break; case "MatterControl.DeviceType": - layer.Add("device_type", item.Value); + layer.Add(SettingsKey.device_type, item.Value); break; case "MatterControl.ActiveThemeIndex": @@ -201,7 +201,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration break; case "MatterControl.DeletePrinter": - layer.Add("delete_printer", item.Value); + layer.Add(SettingsKey.delete_printer, item.Value); break; case "MatterControl.ManualMovementSpeeds": diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs index 1368eb21c..f84a51bb4 100644 --- a/SlicerConfiguration/Settings/SettingsProfile.cs +++ b/SlicerConfiguration/Settings/SettingsProfile.cs @@ -71,8 +71,25 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string publish_bed_image = nameof(publish_bed_image); 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 device_token = nameof(device_token); + public const string baud_rate = nameof(baud_rate); + public const string com_port = nameof(com_port); + public const string auto_connect = nameof(auto_connect); + public const string default_material_presets = nameof(default_material_presets); + public const string windows_driver = nameof(windows_driver); + public const string device_type = nameof(device_type); + public const string cancel_gcode = nameof(cancel_gcode); + public const string connect_gcode = nameof(connect_gcode); + public const string has_fan = nameof(has_fan); + public const string has_hardware_leveling = nameof(has_hardware_leveling); + public const string has_power_control = nameof(has_power_control); + public const string has_sd_card_reader = nameof(has_sd_card_reader); + public const string delete_printer = nameof(delete_printer); + public const string created_date = nameof(created_date); + public const string filament_cost = nameof(filament_cost); + public const string filament_density = nameof(filament_density); + public const string filament_diameter = nameof(filament_diameter); }; - public class SettingsProfile { private static string configFileExtension = "slice"; @@ -224,8 +241,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { switch (item.SlicerConfigName) { - case "baud_rate": - case "auto_connect": + case SettingsKey.baud_rate: + case SettingsKey.auto_connect: // These items are marked as not being overrides but should be cleared on 'reset to defaults' break; default: @@ -803,7 +820,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetAutoConnect(bool autoConnectPrinter) { - layeredProfile.SetValue("auto_connect", autoConnectPrinter ? "1" : "0"); + layeredProfile.SetValue(SettingsKey.auto_connect, autoConnectPrinter ? "1" : "0"); } public void SetMarkedForDelete(bool markedForDelete) @@ -823,7 +840,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetBaudRate(string baudRate) { - layeredProfile.SetValue("baud_rate", baudRate); + layeredProfile.SetValue(SettingsKey.baud_rate, baudRate); } public string ComPort() @@ -853,9 +870,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void SetDeviceToken(string token) { - if (layeredProfile.GetValue("device_token") != token) + if (layeredProfile.GetValue(SettingsKey.device_token) != token) { - layeredProfile.SetValue("device_token", token); + layeredProfile.SetValue(SettingsKey.device_token, token); } } @@ -887,7 +904,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { layeredProfile.SetValue("manual_movement_speeds", speed); } - } public class PrinterInfo @@ -912,7 +928,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var profile = ProfileManager.LoadProfile(newID); profile.ID = newID; - profile.SetActiveValue("device_token", newID); + profile.SetActiveValue(SettingsKey.device_token, newID); ProfileManager.Instance.Save(); } diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index e09e9ef8c..62211da01 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -1207,7 +1207,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration case SliceSettingData.DataEditTypes.OEM_LAYER_DATE: { - dataArea.AddChild(new TextWidget(ActiveSliceSettings.Instance.OemLayer.ValueOrDefault("created_date"), textColor: ActiveTheme.Instance.PrimaryTextColor)); + dataArea.AddChild(new TextWidget(ActiveSliceSettings.Instance.OemLayer.ValueOrDefault(SettingsKey.created_date), textColor: ActiveTheme.Instance.PrimaryTextColor)); } break; diff --git a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs index 69fd03cfb..f94a0af1d 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs @@ -46,21 +46,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SettingsKey.bed_size, SettingsKey.bed_temperature, SettingsKey.build_height, - "cancel_gcode", - "connect_gcode", - "has_fan", - "has_hardware_leveling", - "has_heated_bed", - "has_power_control", - "has_sd_card_reader", - "printer_name", - "auto_connect", - "baud_rate", - "com_port", - "created_date", - "delete_printer", - "filament_cost", - "filament_density", + SettingsKey.cancel_gcode, + SettingsKey.connect_gcode, + SettingsKey.has_fan, + SettingsKey.has_hardware_leveling, + SettingsKey.has_heated_bed, + SettingsKey.has_power_control, + SettingsKey.has_sd_card_reader, + SettingsKey.printer_name, + SettingsKey.auto_connect, + SettingsKey.baud_rate, + SettingsKey.com_port, + SettingsKey.created_date, + SettingsKey.delete_printer, + SettingsKey.filament_cost, + SettingsKey.filament_density, "manual_probe_paper_width", "pause_gcode", "print_leveling_method", @@ -79,7 +79,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration "heat_extruder_before_homing", "include_firmware_updater", "layer_to_pause", - "show_reset_connection" + "show_reset_connection", + SettingsKey.make, + SettingsKey.model, + }; public SliceEngineMapping(string engineName) diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs index a049c2b9a..318fe629f 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs @@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { new ScaledSingleNumber(SettingsKey.layer_height, "layerThickness", 1000), new AsPercentOfReferenceOrDirect(SettingsKey.first_layer_height, "initialLayerThickness", SettingsKey.layer_height, 1000), - new ScaledSingleNumber("filament_diameter", "filamentDiameter", 1000), + new ScaledSingleNumber(SettingsKey.filament_diameter, "filamentDiameter", 1000), //filamentFlow //layer0extrusionWidth new ScaledSingleNumber(SettingsKey.nozzle_diameter, "extrusionWidth", 1000), @@ -289,7 +289,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { double lengthToExtrudeMm = ParseDouble(base.Value); // we need to convert mm of filament to mm of extrusion path - double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue("filament_diameter") * MathHelper.Tau * lengthToExtrudeMm; + double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter) * MathHelper.Tau * lengthToExtrudeMm; double extrusionSquareSize = ActiveSliceSettings.Instance.GetValue(SettingsKey.first_layer_height) * ActiveSliceSettings.Instance.GetValue(SettingsKey.nozzle_diameter); double lineLength = amountOfFilamentCubicMms / extrusionSquareSize; diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index cd2091aef..029401e91 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedSetting(SettingsKey.nozzle_diameter, "extrusionWidth"), new MappedSetting("max_fan_speed", "fanSpeedMaxPercent"), new MappedSetting("min_fan_speed", "fanSpeedMinPercent"), - new MappedSetting("filament_diameter", "filamentDiameter"), + new MappedSetting(SettingsKey.filament_diameter, "filamentDiameter"), new MappedSetting("extrusion_multiplier", "extrusionMultiplier"), new AsPercentOfReferenceOrDirect("first_layer_extrusion_width", "firstLayerExtrusionWidth", SettingsKey.nozzle_diameter), new AsPercentOfReferenceOrDirect("first_layer_speed", "firstLayerSpeed", "infill_speed"), @@ -330,7 +330,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { double lengthToExtrudeMm = ParseDouble(base.Value); // we need to convert mm of filament to mm of extrusion path - double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue("filament_diameter") * MathHelper.Tau * lengthToExtrudeMm; + double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue(SettingsKey.filament_diameter) * MathHelper.Tau * lengthToExtrudeMm; double extrusionSquareSize = ActiveSliceSettings.Instance.GetValue(SettingsKey.first_layer_height) * ActiveSliceSettings.Instance.GetValue(SettingsKey.nozzle_diameter); double lineLength = amountOfFilamentCubicMms / extrusionSquareSize; diff --git a/SlicerConfiguration/SlicerMapping/MappingClasses.cs b/SlicerConfiguration/SlicerMapping/MappingClasses.cs index 457799447..f303a6052 100644 --- a/SlicerConfiguration/SlicerMapping/MappingClasses.cs +++ b/SlicerConfiguration/SlicerMapping/MappingClasses.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedSetting("bridge_fan_speed","bridge_fan_speed"), new MappedSetting("bridge_speed","bridge_speed"), new MappedSetting("extruder_wipe_temperature","extruder_wipe_temperature"), - new MappedSetting("filament_diameter","filament_diameter"), + new MappedSetting(SettingsKey.filament_diameter,SettingsKey.filament_diameter), new MappedSetting("first_layer_bed_temperature", SettingsKey.bed_temperature), new MappedSetting("first_layer_temperature", "temperature"), new MappedSetting("max_fan_speed","max_fan_speed"),