From 16b721ede3cb933ac43c31c89189fd04458afc97 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Fri, 30 Jan 2015 23:16:39 +0100
Subject: [PATCH] fixed some matrix mess in the gcode preview

---
 src/octoprint/plugins/svgtogcode/static/js/convert.js     | 1 -
 .../plugins/svgtogcode/static/js/working_area.js          | 5 ++---
 src/octoprint/static/gcodeviewer/js/renderer.js           | 8 ++++----
 src/octoprint/static/js/app/viewmodels/files.js           | 1 -
 src/octoprint/static/js/app/viewmodels/settings.js        | 1 -
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index 7a60fcc6..e8d12dc4 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -274,7 +274,6 @@ $(function(){
 		};
 
 		self._calcRealSpeed = function(sliderVal){
-			console.log();
 			return self.minSpeed() + sliderVal/100 * (self.maxSpeed() - self.minSpeed());
 		};
 
diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
index e33759f5..e51faa38 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@@ -85,7 +85,7 @@ $(function(){
 			var factor = self.svgDPI()/25.4; // scale mm to 90dpi pixels 
 			var yShift = self.workingAreaHeightMM(); // 0,0 origin of the gcode is bottom left. (top left in the svg)
 			if(!isNaN(factor)){
-				m.scale(factor).translate(0,yShift);
+				m.scale(factor, -factor).translate(0,-yShift);
 				return m;
 			}
 			return m;
@@ -245,7 +245,6 @@ $(function(){
 		};
 		
 		self.draw_gcode = function(points, intensity){
-			console.log("draw_gcode", points);
 			var stroke_color = intensity === 0 ? '#BBBBBB' : '#FF0000';
 			var d = 'M'+points.join(' ');
 			var p = snap.path(d).attr({
@@ -256,7 +255,7 @@ $(function(){
 			snap.select('#gCodePreview').append(p);
 		};
 		self.clear_gcode = function(){
-			snap.select('#gCodePreview>*').remove();
+			snap.select('#gCodePreview').clear();
 		};
 
 		self.onStartup = function(){
diff --git a/src/octoprint/static/gcodeviewer/js/renderer.js b/src/octoprint/static/gcodeviewer/js/renderer.js
index 4d28c4dc..76893809 100644
--- a/src/octoprint/static/gcodeviewer/js/renderer.js
+++ b/src/octoprint/static/gcodeviewer/js/renderer.js
@@ -354,11 +354,11 @@ var drawLayer = function(layerNum, fromProgress, toProgress, isNotCurrentLayer){
         if (typeof(cmds[0].prevX) !== 'undefined' && typeof(cmds[0].prevY) !== 'undefined') {
             // command contains prevX/prevY values, use those
             prevX = cmds[0].prevX; // * zoomFactor;
-            prevY = -1 * cmds[0].prevY; // * zoomFactor;
+            prevY = 1 * cmds[0].prevY; // * zoomFactor;
         } else if (fromProgress > 0) {
             // previous command in same layer exists, use x/y as prevX/prevY
             prevX = cmds[fromProgress - 1].x; // * zoomFactor;
-            prevY = -cmds[fromProgress - 1].y; // * zoomFactor;
+            prevY = cmds[fromProgress - 1].y; // * zoomFactor;
         } else if (model[layerNum - 1]) {
             // previous layer exists, use last x/y as prevX/prevY
             prevX = undefined;
@@ -386,7 +386,7 @@ var drawLayer = function(layerNum, fromProgress, toProgress, isNotCurrentLayer){
             if (typeof(cmds[i].prevX) !== 'undefined' && typeof(cmds[i].prevY) !== 'undefined') {
                 // override new (prevX, prevY)
                 prevX = cmds[i].prevX; // * zoomFactor;
-                prevY = -1 * cmds[i].prevY; // * zoomFactor;
+                prevY = 1 * cmds[i].prevY; // * zoomFactor;
             }
 
             // new x
@@ -400,7 +400,7 @@ var drawLayer = function(layerNum, fromProgress, toProgress, isNotCurrentLayer){
             if (typeof(cmds[i].y) === 'undefined' || isNaN(cmds[i].y)) {
                 y = prevY;// / zoomFactor;
             } else {
-                y = -cmds[i].y;
+                y = cmds[i].y;
             }
 			
 			if(lastLaser !== cmds[i].laser){
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 2a83d576..be7a3d15 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -352,7 +352,6 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing
     };
 
     self.onSlicingDone = function(payload) {
-		console.log("files.js onSlicingDone", payload);
 		var url = API_BASEURL + "files/" + payload.gcode_location + "/" + payload.gcode;
 		var data = {refs: {resource: url}};
 		self.loadFile(data, false); // loads gcode into gcode viewer
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index 24122c5b..32cab568 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -268,7 +268,6 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
             "terminalFilters": self.terminalFilters()
         });
 		
-		console.log("data", data.terminalFilters);
 		return data;
 	};