From 1ceaa2d31a2e6d1afae112464ea7cd42e5990943 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sat, 27 Oct 2018 15:27:01 -0700 Subject: [PATCH] Simplify naming --- .../ConfigurationPage/PrintLeveling/LevelingFunctions.cs | 2 +- .../PrinterCommunication/Io/PrintLevelingStream.cs | 5 +++-- Tests/MatterControl.Tests/MatterControl/LevelingTests.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs index 0af694e65..4af8997ea 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs @@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling private List Regions { get; set; } = new List(); - public string DoApplyLeveling(string lineBeingSent, Vector3 currentDestination) + public string ApplyLeveling(string lineBeingSent, Vector3 currentDestination) { double extruderDelta = 0; GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref extruderDelta); diff --git a/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs b/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs index f2707942c..76e03b0f3 100644 --- a/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs +++ b/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs @@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io gcodeAlreadyLeveled = true; } - if (lineFromChild != null + if (lineFromChild != null && LevelingActive && !gcodeAlreadyLeveled) { @@ -129,6 +129,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io private string GetLeveledPosition(string lineBeingSent, PrinterMove currentDestination) { PrintLevelingData levelingData = printerSettings.Helpers.GetPrintLevelingData(); + if (levelingData != null && printerSettings?.GetValue(SettingsKey.print_leveling_enabled) == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) @@ -141,7 +142,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io currentLevelingFunctions = new LevelingFunctions(printerSettings, levelingData); } - lineBeingSent = currentLevelingFunctions.DoApplyLeveling(lineBeingSent, currentDestination.position); + lineBeingSent = currentLevelingFunctions.ApplyLeveling(lineBeingSent, currentDestination.position); } return lineBeingSent; diff --git a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs index 8b8d96d90..e82a285ce 100644 --- a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs @@ -138,7 +138,7 @@ namespace MatterControl.Tests.MatterControl Assert.AreEqual(testLeveled.Y, testUnleveled.Y, .001, "We don't adjust the x or y on mesh leveling"); Assert.AreEqual(testLeveled.Y, controlLeveled.Y, .001, "We don't adjust the x or y on mesh leveling"); Assert.AreEqual(testLeveled.Z, controlLeveled.Z, .001); - string outPositionString = levelingFunctions.DoApplyLeveling(GetGCodeString(testUnleveled), testUnleveled); + string outPositionString = levelingFunctions.ApplyLeveling(GetGCodeString(testUnleveled), testUnleveled); Assert.AreEqual(GetGCodeString(testLeveled), outPositionString); }