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

fixed some matrix mess in the gcode preview

Browse source
This commit is contained in:
Teja 2015-01-30 23:16:39 +01:00
parent 369a59e24a
commit 16b721ede3
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -274,7 +274,6 @@ $(function(){
};
self._calcRealSpeed = function(sliderVal){
console.log();
return self.minSpeed() + sliderVal/100 * (self.maxSpeed() - self.minSpeed());
};

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

@ -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(){

8
src/octoprint/static/gcodeviewer/js/renderer.js
View file

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

1
src/octoprint/static/js/app/viewmodels/files.js
View file

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

1
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -268,7 +268,6 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
"terminalFilters": self.terminalFilters()
});
console.log("data", data.terminalFilters);
return data;
};