From ba41f4ebee93aa29426d73fb8e6acfb2584a3be5 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 6 Jul 2016 15:05:06 -0700 Subject: [PATCH] Migrate make/model settings keys to SettingsKey, revise service urls --- DataStorage/Classic/ClassicSqlitePrinterProfiles.cs | 4 ++-- MatterControlApplication.cs | 3 ++- SlicerConfiguration/Settings/ActiveSliceSettings.cs | 2 +- SlicerConfiguration/Settings/SettingsProfile.cs | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs index 7f5377f28..89d817430 100644 --- a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs +++ b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs @@ -91,8 +91,8 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB layeredProfile.ID = printer.Id.ToString(); layeredProfile.UserLayer[SettingsKey.printer_name] = printer.Name ?? ""; - layeredProfile.UserLayer["MatterControl_Make"] = printer.Make ?? ""; - layeredProfile.UserLayer["model"] = printer.Model ?? ""; + 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"; diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 1a277d930..89a6cd3fb 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -451,7 +451,8 @@ namespace MatterHackers.MatterControl } #if DEBUG - public static string MCWSBaseUri { get; } = "http://192.168.2.129:9206"; + //public static string MCWSBaseUri { get; } = "http://192.168.2.129:9206"; + public static string MCWSBaseUri { get; } = "https://mattercontrol-test.appspot.com"; #else public static string MCWSBaseUri { get;} = "https://mattercontrol.appspot.com"; #endif diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index fd8e3e199..f6f6fc4f4 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("model")); + BedSettings.SetMakeAndModel(activeInstance.GetValue(SettingsKey.make), activeInstance.GetValue(SettingsKey.model)); } SwitchToPrinterTheme(MatterControlApplication.IsLoading); diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs index a0ca346cf..40f9c6a5a 100644 --- a/SlicerConfiguration/Settings/SettingsProfile.cs +++ b/SlicerConfiguration/Settings/SettingsProfile.cs @@ -66,6 +66,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string nozzle_diameter = nameof(nozzle_diameter); public const string print_center = nameof(print_center); public const string printer_name = nameof(printer_name); + public const string make = nameof(make); + public const string model = nameof(model); 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);