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

Able to correctly parse simplify 3d gcode layer string

Browse source 
issue: MatterHackers/MCCentral#4292
S3D vs MC gcode
This commit is contained in:
Lars Brubaker 2018-10-16 10:25:57 -07:00
parent 9d86956af2
commit 1ad11ad07c
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.Printing/GCode/GCodeFile.cs
View file

@ -106,8 +106,9 @@ namespace MatterControl.Printing
public static bool IsLayerChange(string lineString)
{
return lineString.StartsWith("; LAYER:")
|| lineString.StartsWith(";LAYER:");
return lineString.StartsWith("; LAYER:", StringComparison.InvariantCultureIgnoreCase)
|| lineString.StartsWith(";LAYER:", StringComparison.InvariantCultureIgnoreCase)
|| lineString.StartsWith("; LAYER ", StringComparison.InvariantCultureIgnoreCase);
}
public static bool FileTooBigToLoad(string fileName)

3
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -232,7 +232,8 @@ namespace MatterControl.Printing
PrinterMachineInstruction machineInstructionForLine = new PrinterMachineInstruction("None");
bool gcodeHasExplicitLayerChangeInfo = false;
if (gCodeString.Contains("LAYER:"))
if (gCodeString.Contains("LAYER:")
|| gCodeString.Contains("; layer"))
{
gcodeHasExplicitLayerChangeInfo = true;
}