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

Third handle created, resize now split from rotate

Browse source
This commit is contained in:
clemniem 2016-06-08 11:49:14 +02:00
parent 6ffcaabbeb
commit 7dd03d08e5
2 changed files with 79 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/svgtogcode/__init__.py
View file

@ -357,6 +357,8 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
converter_path = '/home/teja/workspace/mrbeam-inkscape-ext'
elif("denkbrett" in hostname):
converter_path = '/home/flo/mrbeam/git/mrbeam-inkscape-ext'
elif ("clems-Air" in hostname):
converter_path = '/Users/clem/Dropbox/mrBeam/mrbeam-inkscape-ext'
import sys
sys.path.append(converter_path)

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

@ -76,7 +76,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
Snap.plugin( function( Snap, Element, Paper, global ) {
var ftOption = {
handleFill: "red",
handleFill: "blue",
handleStrokeDashPreset: [5,5],
handleStrokeWidth: 2,
handleLength: 18,
@ -100,14 +100,15 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var rotateDragger = this.paper.select('#userContent').circle(bb.cx + bb.width/2 + ftOption.handleLength * ftOption.unscale, bb.cy, ftOption.handleRadius * ftOption.unscale ).attr({ fill: ftOption.handleFill });
var translateDragger = this.paper.select('#userContent').circle(bb.cx, bb.cy, ftOption.handleRadius * ftOption.unscale).attr({ fill: ftOption.handleFill });
var resizeDragger = this.paper.select('#userContent').circle(bb.cx + bb.width/2, bb.cy - bb.height/2, ftOption.handleRadius * ftOption.unscale).attr({ fill: ftOption.handleFill});
var joinLine = freetransEl.ftDrawJoinLine( rotateDragger, ftOption.handleStrokeWidth * ftOption.unscale);
var handlesGroup = this.paper.select('#userContent').g( joinLine, rotateDragger, translateDragger );
var handlesGroup = this.paper.select('#userContent').g( joinLine, rotateDragger, translateDragger, resizeDragger );
freetransEl.data( "handlesGroup", handlesGroup );
freetransEl.data( "joinLine", joinLine);
freetransEl.data( "scaleFactor", calcDistance( bb.cx, bb.cy, rotateDragger.attr('cx'), rotateDragger.attr('cy') ) );
freetransEl.data( "scaleFactor", calcDistance( bb.cx, bb.cy, resizeDragger.attr('cx'), resizeDragger.attr('cy') ) );
translateDragger.drag(
elementDragMove.bind( translateDragger, freetransEl ),
@ -118,6 +119,13 @@ Snap.plugin(function (Snap, Element, Paper, global) {
freetransEl.unclick();
freetransEl.data("click", freetransEl.click( function() { this.ftRemoveHandles() } ) );
resizeDragger.drag(
dragHandleResizeMove.bind(resizeDragger,freetransEl),
dragHandleResizeStart.bind(resizeDragger, freetransEl),
dragHandleResizeEnd.bind(resizeDragger, freetransEl)
);
rotateDragger.drag(
dragHandleRotateMove.bind( rotateDragger, freetransEl ),
dragHandleRotateStart.bind( rotateDragger, freetransEl ),
@ -281,6 +289,34 @@ Snap.plugin(function (Snap, Element, Paper, global) {
function elementDragEnd( mainEl, dx, dy, x, y ) {
};
function dragHandleResizeStart( mainElement ) {
this.ftStoreStartCenter();
};
function dragHandleResizeEnd( mainElement ) {
};
function dragHandleResizeMove( mainEl, dx, dy, x, y, event){
var handle = this;
var mainBB = mainEl.getBBox();
var unscale = mainEl.data('unscale');
//todo was ist ocx
handle.attr({ cx:+handle.data('ocx') + dx*unscale, cy: +handle.data('ocy')+dy*unscale});
var distance = calcDistance(mainBB.cx,mainBB.cy,handle.attr('cx'),handle.attr('cy'));
var scale = distance / mainEl.data("scaleFactor");
if(event.shiftKey){
scale = Math.round(scale*4) / 4;
}
mainEl.data("scale", scale );
mainEl.ftUpdateTransform();
};
function dragHandleRotateStart( mainElement ) {
this.ftStoreStartCenter();
};
@ -297,19 +333,12 @@ Snap.plugin(function (Snap, Element, Paper, global) {
if(!mainEl.data('block_rotation')){
var angle = Snap.angle( mainBB.cx, mainBB.cy, handle.attr('cx'), handle.attr('cy') ) - 180;
if(event.shiftKey){
if(event.shiftKey){ //enable block rotation
angle = Math.round(angle/30) * 30;
}
mainEl.data("angle", angle );
}
var distance = calcDistance( mainBB.cx, mainBB.cy, handle.attr('cx'), handle.attr('cy') );
var scale = distance / mainEl.data("scaleFactor");
if(event.shiftKey){
scale = Math.round(scale*4) / 4;
}
mainEl.data("scale", scale );
mainEl.ftUpdateTransform();
mainEl.ftDrawJoinLine( handle );
};