From a5518f7877fec650b733ea9a844db992dd1fc42e Mon Sep 17 00:00:00 2001 From: Alex Ustyantsev Date: Sat, 2 Feb 2013 19:33:58 +0300 Subject: [PATCH] Bug: octoprint deleted all commented lines, now gcodevisualizer deletes them too so the line numbers match --- octoprint/static/gcodeviewer/js/gCodeReader.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/octoprint/static/gcodeviewer/js/gCodeReader.js b/octoprint/static/gcodeviewer/js/gCodeReader.js index 9863671..a5e8c02 100644 --- a/octoprint/static/gcodeviewer/js/gCodeReader.js +++ b/octoprint/static/gcodeviewer/js/gCodeReader.js @@ -28,9 +28,13 @@ GCODE.gCodeReader = (function(){ var prepareGCode = function(){ if(!lines)return; gcode = []; - var i; + var i, tmp; for(i=0;i 1 || tmp === -1) { + gcode.push(lines[i]); + } } lines = []; // console.log("GCode prepared"); @@ -104,12 +108,12 @@ GCODE.gCodeReader = (function(){ lines = reader.target.result.split(/\n/); reader.target.result = null; -// prepareGCode(); - + prepareGCode(); + worker.postMessage({ "cmd":"parseGCode", "msg":{ - gcode: lines, + gcode: gcode, options: { firstReport: 5 } @@ -117,9 +121,7 @@ GCODE.gCodeReader = (function(){ } ); delete lines; - - - + delete gcode; }, setOption: function(options){ for(var opt in options){