nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set MCWS environment based on new config options

Browse source 
- Issue MatterHackers/MCCentral#4444
Make MCWS environment at configuration based target
This commit is contained in:
John Lewin 2018-10-31 14:07:36 -07:00
parent cde6e42923
commit 889a7c2918
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
MatterControlLib/MatterControlApplication.cs
View file

@ -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

7
MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -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;