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

Code maid.

Browse source
This commit is contained in:
Lars Brubaker 2015-12-23 13:15:51 -08:00
parent 09990ec033
commit 19b7cb01cf
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ConfigurationPage/PrintLeveling/PrintLevelingData.cs
View file

@ -9,6 +9,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class PrintLevelingData
{
public List<Vector3> SampledPositions = new List<Vector3>();
private static bool activelyLoading = false;
private static Printer activePrinter = null;
@ -28,11 +29,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
[JsonConverter(typeof(StringEnumConverter))]
public enum LevelingSystem { Probe3Points, Probe2Points, Probe7PointRadial, Probe13PointRadial }
public List<Vector3> SampledPositions = new List<Vector3>();
public LevelingSystem CurrentPrinterLevelingSystem
{
get
get
{
switch (ActiveSliceSettings.Instance.GetActiveValue("print_leveling_solution"))
{
@ -135,6 +134,20 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
return instance;
}
public void Commit()
{
if (!activelyLoading)
{
string newLevelingInfo = Newtonsoft.Json.JsonConvert.SerializeObject(this);
// clear the legacy value
activePrinter.PrintLevelingProbePositions = "";
// set the new value
activePrinter.PrintLevelingJsonData = newLevelingInfo;
activePrinter.Commit();
}
}
private static void CreateFromJsonOrLegacy(string jsonData, string depricatedPositionsCsv3ByXYZ)
{
if (jsonData != null)
@ -154,20 +167,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
}
public void Commit()
{
if (!activelyLoading)
{
string newLevelingInfo = Newtonsoft.Json.JsonConvert.SerializeObject(this);
// clear the legacy value
activePrinter.PrintLevelingProbePositions = "";
// set the new value
activePrinter.PrintLevelingJsonData = newLevelingInfo;
activePrinter.Commit();
}
}
/// <summary>
/// Gets the 9 {3 * (x, y, z)} positions that were probed during the print leveling setup.
/// </summary>