pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix. don't send move commands while printing state

Browse source
This commit is contained in:
Teja 2015-01-29 18:06:26 +01:00
parent 73da6e57de
commit 3746ecd17b
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -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})
});
}
};

4
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -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>