From 3746ecd17b889ae7cf805bb04c557c731fe55229 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Thu, 29 Jan 2015 18:06:26 +0100
Subject: [PATCH] bugfix. don't send move commands while printing state

---
 .../svgtogcode/static/js/working_area.js      | 23 +++++++++++--------
 .../templates/override_index.jinja2           |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
index 3dd95d8a..71a204e6 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@@ -89,16 +89,19 @@ $(function(){
 		};
 
 		self.move_laser = function(el){
-			var x = self.px2mm(event.offsetX);
-	//		var y = self.px2mm(event.toElement.offsetHeight - event.offsetY); // toElement.offsetHeight is always 0 on svg>* elements ???
-			var y = self.px2mm(event.toElement.ownerSVGElement.offsetHeight - event.offsetY); // hopefully this works across browsers
-			$.ajax({
-				url: API_BASEURL + "printer/printhead",
-				type: "POST",
-				dataType: "json",
-				contentType: "application/json; charset=UTF-8",
-				data: JSON.stringify({"command": "position", x:x, y:y})
-			});
+			console.log(self.state.isOperational(), self.state.isPrinting() , "OP");
+			if(self.state.isOperational() && !self.state.isPrinting()){
+				var x = self.px2mm(event.offsetX);
+		//		var y = self.px2mm(event.toElement.offsetHeight - event.offsetY); // toElement.offsetHeight is always 0 on svg>* elements ???
+				var y = self.px2mm(event.toElement.ownerSVGElement.offsetHeight - event.offsetY); // hopefully this works across browsers
+				$.ajax({
+					url: API_BASEURL + "printer/printhead",
+					type: "POST",
+					dataType: "json",
+					contentType: "application/json; charset=UTF-8",
+					data: JSON.stringify({"command": "position", x:x, y:y})
+				});
+			}
 		};
 
 
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 7853fc80..421038c7 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -288,8 +288,7 @@
 
 							<div class="span8">
 								<svg id="area_preview" class="workingarea" 
-									 data-bind="xclick: move_laser, 
-										style: {
+									 data-bind="style: {
 											backgroundPosition: crosshairX()+'px'+' '+crosshairY()+'px',
 											width: workingAreaWidthPx()+'px',
 											height: workingAreaHeightPx()+'px'
@@ -300,6 +299,7 @@
 											  id="coordGrid" x="0" y="0" width="0" height="0" 
 											  stroke="none" fill="none"></rect>
 										<g id="userContent"></g>
+										<g id="gCodePreview"></g>
 									</g>
 								</svg>