fixed error applying heightmap

martin2250 · Mar 21, 2017 · c30b85f · c30b85f
1 parent d12b60f
commit c30b85f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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<string> 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
@@ -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")]