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

zwischen commit

Browse source
This commit is contained in:
make-ing 2016-02-16 12:49:44 +01:00
parent 753cb7845d
commit fdbbf71cc7
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/plugins/svgtogcode/static/js/drag_scale_rotate.js
View file

@ -79,7 +79,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
handleFill: "red", handleFill: "red",
handleStrokeDashPreset: [5,5], handleStrokeDashPreset: [5,5],
handleStrokeWidth: 2, handleStrokeWidth: 2,
handleLength: 18, handleLength: 10,
handleRadius: 16, handleRadius: 16,
unscale: 1, unscale: 1,
handleStrokeDash: "5,5", handleStrokeDash: "5,5",
@ -135,7 +135,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
this.data("ty", 0); this.data("ty", 0);
this.attr({class:'_freeTransformInProgress'}); this.attr({class:'_freeTransformInProgress'});
ftOption.unscale = 1 / this.paper.select('#scaleGroup').transform().localMatrix.a; ftOption.unscale = 1 / this.paper.select('#scaleGroup').transform().globalMatrix.a;
this.data('unscale', ftOption.unscale); this.data('unscale', ftOption.unscale);
ftOption.handleStrokeDash = ftOption.handleStrokeDashPreset.map(function(v){ return v*ftOption.unscale; }).join(','); ftOption.handleStrokeDash = ftOption.handleStrokeDashPreset.map(function(v){ return v*ftOption.unscale; }).join(',');
return this; return this;
@ -298,7 +298,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
if(!mainEl.data('block_rotation')){ if(!mainEl.data('block_rotation')){
var angle = Snap.angle( mainBB.cx, mainBB.cy, handle.attr('cx'), handle.attr('cy') ) - 180; var angle = Snap.angle( mainBB.cx, mainBB.cy, handle.attr('cx'), handle.attr('cy') ) - 180;
if(event.shiftKey){ if(event.shiftKey){
angle = Math.round(angle/30) * 30; angle = Math.round(angle/15) * 15;
} }
mainEl.data("angle", angle ); mainEl.data("angle", angle );
} }

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

@ -65,7 +65,7 @@ $(function(){
self.scaleMatrix = ko.computed(function(){ self.scaleMatrix = ko.computed(function(){
var m = new Snap.Matrix(); var m = new Snap.Matrix();
//var factor = 25.4/self.svgDPI() * 1/self.px2mm_factor(); //var factor = 25.4/self.svgDPI() * 1/self.px2mm_factor();
var factor = 1 var factor = 1;
if(!isNaN(factor)){ if(!isNaN(factor)){
m.scale(factor); m.scale(factor);
return m; return m;
@ -239,8 +239,9 @@ $(function(){
} }
// scale matrix // scale matrix
var scale = self.svgDPI()/25.4;
var mat = self.getDocumentViewBoxMatrix(doc_width, doc_height, doc_viewbox); var mat = self.getDocumentViewBoxMatrix(doc_width, doc_height, doc_viewbox);
var scaleMatrixStr = new Snap.Matrix(mat[0][0],mat[0][1],mat[1][0],mat[1][1],mat[0][2],mat[1][2]).toTransformString(); var scaleMatrixStr = new Snap.Matrix(mat[0][0]/scale,mat[0][1],mat[1][0],mat[1][1]/scale,mat[0][2],mat[1][2]).toTransformString();
newSvgAttrs['transform'] = scaleMatrixStr; newSvgAttrs['transform'] = scaleMatrixStr;
var newSvg = snap.group(f.selectAll("svg>*")); var newSvg = snap.group(f.selectAll("svg>*"));
@ -582,10 +583,10 @@ $(function(){
var yPatternOffset = self.workingAreaHeightMM() % linedistMM; var yPatternOffset = self.workingAreaHeightMM() % linedistMM;
var linedist = linedistMM; var linedist = linedistMM;
var marker = snap.circle(linedist/2, linedist/2, self.px2mm(1)).attr({ var marker = snap.circle(linedist/2, linedist/2, 1).attr({
fill: "#000000", fill: "#000000",
stroke: "none", stroke: "none",
strokeWidth: self.px2mm(1) strokeWidth: 1
}); });
// dot pattern // dot pattern

7
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -287,6 +287,9 @@
backgroundPosition: crosshairX()+'px'+' '+crosshairY()+'px', backgroundPosition: crosshairX()+'px'+' '+crosshairY()+'px',
width: workingAreaWidthPx()+'px', width: workingAreaWidthPx()+'px',
height: workingAreaHeightPx()+'px' height: workingAreaHeightPx()+'px'
},
attr: {
viewBox: '0 0 '+workingAreaWidthMM()+' '+workingAreaHeightMM()
} }
"> ">
<filter id="grayscale_filter"> <filter id="grayscale_filter">
@ -321,8 +324,8 @@
<tspan <tspan
x="368.571426" y="712.36218" id="tspan2991" x="368.571426" y="712.36218" id="tspan2991"
style="text-anchor:middle;text-align:center" /></text> style="text-anchor:middle;text-align:center" /></text>
<g id="placedGcodes" data-bind="visible: !state.isPrinting() && !state.isPaused(), attr: { transform: scaleMatrixMMtoDisplay() }"></g> <g id="placedGcodes" data-bind="visible: !state.isPrinting() && !state.isPaused()"></g>
<g id="gCodePreview" data-bind="visible: state.isPrinting() || state.isPaused(), attr: { transform: scaleMatrixMMtoDisplay() }"></g> <g id="gCodePreview" data-bind="visible: state.isPrinting() || state.isPaused()"></g>
<rect data-bind="click: move_laser" <rect data-bind="click: move_laser"
id="coordGrid" x="0" y="0" width="0" height="0" id="coordGrid" x="0" y="0" width="0" height="0"
stroke="none" fill="none"></rect> stroke="none" fill="none"></rect>