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

Remove ForceTestEnvironment features

Browse source
This commit is contained in:
John Lewin 2016-09-23 16:34:52 -07:00
parent 5ee97a124c
commit b5e38d136c
4 changed files with 14 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MatterControlApplication.cs
View file

@ -27,9 +27,19 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Gaming.Game;
using MatterHackers.Agg;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.GuiAutomation;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PluginSystem;
@ -41,26 +51,10 @@ using MatterHackers.PolygonMesh.Processors;
using MatterHackers.RenderOpenGl.OpenGl;
using MatterHackers.VectorMath;
using Mindscape.Raygun4Net;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.GCodeVisualizer;
using Gaming.Game;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.PrinterControls.PrinterConnections;
using MatterHackers.MatterControl.CustomWidgets;
using Newtonsoft.Json;
using System.Net;
namespace MatterHackers.MatterControl
{
public class MatterControlApplication : SystemWindow
public class MatterControlApplication : SystemWindow
{
#if DEBUG
//public static string MCWSBaseUri { get; } = "http://192.168.2.129:9206";
@ -124,11 +118,6 @@ public static bool CameraPreviewActive = false;
{
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData();
}
if (OemSettings.Instance.ForceTestEnvironment)
{
MCWSBaseUri = "https://mattercontrol-test.appspot.com";
}
}
private MatterControlApplication(double width, double height)

5
SettingsManagement/ApplicationSettings.cs
View file

@ -65,11 +65,6 @@ namespace MatterHackers.MatterControl
string keyName = "ClientToken";
#if DEBUG
keyName += "_Test";
#else
if(OemSettings.Instance.ForceTestEnvironment)
{
keyName += "_Test";
}
#endif
if(ApplicationController.ApplicationInstanceCount > 1)
{

15
SettingsManagement/OemSettings.cs
View file

@ -27,25 +27,18 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.MatterControl.VersionManagement;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Net;
using System.Runtime.Serialization;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.MatterControl.SlicerConfiguration;
using Newtonsoft.Json;
namespace MatterHackers.MatterControl.SettingsManagement
{
using Agg.UI;
public class OemSettings
{
private static OemSettings instance = null;
@ -64,8 +57,6 @@ namespace MatterHackers.MatterControl.SettingsManagement
}
}
public bool ForceTestEnvironment = false;
public bool UseSimpleModeByDefault = false;
public string ThemeColor = "";

1
StaticData/OEMSettings/Settings.json
View file

@ -5,5 +5,4 @@
"MatterControl - Stand.stl",
"Calibration - Box.stl"
],
"ForceTestEnvironment": true
}