From 889a7c29188e6e9f0f90401b0e5ec842e670d429 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 31 Oct 2018 14:07:36 -0700 Subject: [PATCH] Set MCWS environment based on new config options - Issue MatterHackers/MCCentral#4444 Make MCWS environment at configuration based target --- MatterControlLib/MatterControlApplication.cs | 20 +++++++++++-------- .../SliceSettingsWidget.cs | 7 +------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/MatterControlLib/MatterControlApplication.cs b/MatterControlLib/MatterControlApplication.cs index 233f7c3ad..6fa0b525f 100644 --- a/MatterControlLib/MatterControlApplication.cs +++ b/MatterControlLib/MatterControlApplication.cs @@ -34,16 +34,20 @@ namespace MatterHackers.MatterControl { public static class MatterControlApplication { + public static string MCWSBaseUri { get; } -#if DEBUG + static MatterControlApplication() + { + if (MatterHackers.MatterControl.AppContext.Options.McwsTestEnvironment) + { + MCWSBaseUri = "https://mattercontrol-test.appspot.com"; // http://192.168.2.129:9206 + } + else + { + MCWSBaseUri = "https://mattercontrol.appspot.com"; + } + } - //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 - - private static void AssertDebugNotDefined() { #if DEBUG diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 41ac45f53..06bedfc8f 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -883,12 +883,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { foreach (var item in this.settingsRows) { - var settingData = item.settingData; - - // var layerValues = printer.Settings.GetLayerValues(settingData.SlicerConfigName); - // var (currentValue, layerName) = printer.Settings.GetValueAndLayerName(settingData.SlicerConfigName, printer.Settings.defaultLayerCascade); - - item.widget.Visible = printer.Settings.IsOverride(settingData.SlicerConfigName); + item.widget.Visible = printer.Settings.IsOverride(item.settingData.SlicerConfigName); } filteredItemsHeading.Visible = true;