From c30b85f13eb6457d07c28f1ae15d73a0b6aef4c7 Mon Sep 17 00:00:00 2001 From: martin2250 Date: Tue, 21 Mar 2017 20:20:31 +0100 Subject: [PATCH] fixed error applying heightmap --- OpenCNCPilot/GCode/GCodeFile.cs | 14 +++++++------- OpenCNCPilot/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenCNCPilot/GCode/GCodeFile.cs b/OpenCNCPilot/GCode/GCodeFile.cs index edc4fae..51a0103 100644 --- a/OpenCNCPilot/GCode/GCodeFile.cs +++ b/OpenCNCPilot/GCode/GCodeFile.cs @@ -130,7 +130,7 @@ public void GetModel(LinesVisual3D line, LinesVisual3D rapid, LinesVisual3D arc) arc.Points = arcPoints; sw.Stop(); - System.Console.WriteLine("Generating the Toolpath Model took {0} ms", sw.ElapsedMilliseconds); + Console.WriteLine("Generating the Toolpath Model took {0} ms", sw.ElapsedMilliseconds); } public List GetGCode() @@ -312,12 +312,7 @@ public GCodeFile ApplyHeightMap(HeightMap map) foreach (Command command in Toolpath) { - if (command is MCode) - { - newToolPath.Add(command); - continue; - } - else + if (command is Motion) { Motion m = (Motion)command; @@ -329,6 +324,11 @@ public GCodeFile ApplyHeightMap(HeightMap map) newToolPath.Add(subMotion); } } + else + { + newToolPath.Add(command); + continue; + } } return new GCodeFile(newToolPath); diff --git a/OpenCNCPilot/Properties/AssemblyInfo.cs b/OpenCNCPilot/Properties/AssemblyInfo.cs index e40ea89..73b82f1 100644 --- a/OpenCNCPilot/Properties/AssemblyInfo.cs +++ b/OpenCNCPilot/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: AssemblyVersion("1.3.1.0")] +[assembly: AssemblyFileVersion("1.3.1.0")]