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

Simplify naming

Browse source
This commit is contained in:
John Lewin 2018-10-27 15:27:01 -07:00
parent 39e78f7348
commit 1ceaa2d31a
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/ConfigurationPage/PrintLeveling/LevelingFunctions.cs
View file

@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private List<LevelingTriangle> Regions { get; set; } = new List<LevelingTriangle>(); private List<LevelingTriangle> Regions { get; set; } = new List<LevelingTriangle>();
public string DoApplyLeveling(string lineBeingSent, Vector3 currentDestination) public string ApplyLeveling(string lineBeingSent, Vector3 currentDestination)
{ {
double extruderDelta = 0; double extruderDelta = 0;
GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref extruderDelta); GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref extruderDelta);

5
MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs
View file

@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
gcodeAlreadyLeveled = true; gcodeAlreadyLeveled = true;
} }
if (lineFromChild != null if (lineFromChild != null
&& LevelingActive && LevelingActive
&& !gcodeAlreadyLeveled) && !gcodeAlreadyLeveled)
{ {
@ -129,6 +129,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
private string GetLeveledPosition(string lineBeingSent, PrinterMove currentDestination) private string GetLeveledPosition(string lineBeingSent, PrinterMove currentDestination)
{ {
PrintLevelingData levelingData = printerSettings.Helpers.GetPrintLevelingData(); PrintLevelingData levelingData = printerSettings.Helpers.GetPrintLevelingData();
if (levelingData != null if (levelingData != null
&& printerSettings?.GetValue<bool>(SettingsKey.print_leveling_enabled) == true && printerSettings?.GetValue<bool>(SettingsKey.print_leveling_enabled) == true
&& (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 ")))
@ -141,7 +142,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
currentLevelingFunctions = new LevelingFunctions(printerSettings, levelingData); currentLevelingFunctions = new LevelingFunctions(printerSettings, levelingData);
} }
lineBeingSent = currentLevelingFunctions.DoApplyLeveling(lineBeingSent, currentDestination.position); lineBeingSent = currentLevelingFunctions.ApplyLeveling(lineBeingSent, currentDestination.position);
} }
return lineBeingSent; return lineBeingSent;

2
Tests/MatterControl.Tests/MatterControl/LevelingTests.cs
View file

@ -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, 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.Y, controlLeveled.Y, .001, "We don't adjust the x or y on mesh leveling");
Assert.AreEqual(testLeveled.Z, controlLeveled.Z, .001); 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); Assert.AreEqual(GetGCodeString(testLeveled), outPositionString);
} }