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

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

@ -344,7 +344,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
if not machinecode_path:
path, _ = os.path.splitext(model_path)
machinecode_path = path + ".gco"
self._svgtogcode_logger.info("### Slicing %s to %s using profile stored at %s" % (model_path, machinecode_path, profile_path))
## direct call
@ -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)

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

@ -1,8 +1,8 @@
// Drag, Scale & Rotate - a snapsvg.io plugin to free transform objects in an svg.
// Copyright (C) 2015 Teja Philipp <osd@tejaphilipp.de>
//
//
// heavily inspired by http://svg.dabbles.info
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
@ -19,10 +19,10 @@
Snap.plugin(function (Snap, Element, Paper, global) {
/**
*
*
*
*
* @returns {undefined}
*/
Element.prototype.transformable = function () {
@ -35,13 +35,13 @@ Snap.plugin(function (Snap, Element, Paper, global) {
elem.click(function(){ elem.ftCreateHandles() });
return elem;
};
/**
* Adds transparent fill if not present.
* This is useful for dragging the element around.
*
* Adds transparent fill if not present.
* This is useful for dragging the element around.
*
* @returns {path}
*/
Element.prototype.add_fill = function(){
@ -67,7 +67,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
});
/**
* Free transform plugin heavily inspired by http://svg.dabbles.info
*/
@ -76,16 +76,16 @@ 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,
handleRadius: 16,
handleRadius: 16,
unscale: 1,
handleStrokeDash: "5,5",
};
Element.prototype.ftToggleHandles = function(){
Element.prototype.ftToggleHandles = function(){
if(this.data('handlesGroup')){
this.ftRemoveHandles();
} else {
@ -97,31 +97,39 @@ Snap.plugin(function (Snap, Element, Paper, global) {
this.ftInit();
var freetransEl = this;
var bb = freetransEl.getBBox();
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 ),
translateDragger.drag(
elementDragMove.bind( translateDragger, freetransEl ),
elementDragStart.bind( translateDragger, freetransEl ),
elementDragEnd.bind( translateDragger, freetransEl )
elementDragEnd.bind( translateDragger, freetransEl )
);
freetransEl.unclick();
freetransEl.data("click", freetransEl.click( function() { this.ftRemoveHandles() } ) );
rotateDragger.drag(
dragHandleRotateMove.bind( rotateDragger, freetransEl ),
resizeDragger.drag(
dragHandleResizeMove.bind(resizeDragger,freetransEl),
dragHandleResizeStart.bind(resizeDragger, freetransEl),
dragHandleResizeEnd.bind(resizeDragger, freetransEl)
);
rotateDragger.drag(
dragHandleRotateMove.bind( rotateDragger, freetransEl ),
dragHandleRotateStart.bind( rotateDragger, freetransEl ),
dragHandleRotateEnd.bind( rotateDragger, freetransEl )
dragHandleRotateEnd.bind( rotateDragger, freetransEl )
);
freetransEl.ftStoreInitialTransformMatrix();
freetransEl.ftHighlightBB();
@ -134,7 +142,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
this.data("tx", 0);
this.data("ty", 0);
this.attr({class:'_freeTransformInProgress'});
ftOption.unscale = 1 / this.paper.select('#scaleGroup').transform().localMatrix.a;
this.data('unscale', ftOption.unscale);
ftOption.handleStrokeDash = ftOption.handleStrokeDashPreset.map(function(v){ return v*ftOption.unscale; }).join(',');
@ -153,11 +161,11 @@ Snap.plugin(function (Snap, Element, Paper, global) {
this.data('ocy', this.attr('cy') );
return this;
}
Element.prototype.ftStoreInitialTransformMatrix = function() {
this.data('initialTransformMatrix', this.transform().localMatrix );
return this;
};
};
Element.prototype.ftGetInitialTransformMatrix = function() {
return this.data('initialTransformMatrix');
@ -191,10 +199,10 @@ Snap.plugin(function (Snap, Element, Paper, global) {
return this;
};
Element.prototype.ftUpdateTransform = function() {
//console.log("translate: ", this.data('tx'), this.data('ty'), 'rotate: ', this.data('angle'), 'scale: ', this.data('scale'));
var tstring = "t" + this.data("tx") + "," + this.data("ty") + this.ftGetInitialTransformMatrix().toTransformString() + "r" + this.data("angle") + 'S' + this.data("scale" );
var tstring = "t" + this.data("tx") + "," + this.data("ty") + this.ftGetInitialTransformMatrix().toTransformString() + "r" + this.data("angle") + 'S' + this.data("scale" );
this.attr({ transform: tstring });
this.data("bbT") && this.ftHighlightBB(this.paper.select('#userContent'));
this.ftReportTransformation();
@ -204,7 +212,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
Element.prototype.ftHighlightBB = function() {
this.data("bbT") && this.data("bbT").remove();
this.data("bb") && this.data("bb").remove();
// transformed bbox
this.data("bbT", this.paper.rect( rectObjFromBB( this.getBBox(1) ) )
.attr({ fill: "none", stroke: ftOption.handleFill, strokeWidth: ftOption.handleStrokeWidth, strokeDasharray: ftOption.handleStrokeDashPreset.join(',') })
@ -214,7 +222,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
.attr({ fill: "none", stroke: 'gray', strokeWidth: ftOption.handleStrokeWidth, strokeDasharray: ftOption.handleStrokeDash }) );
return this;
};
Element.prototype.ftReportTransformation = function(){
if(this.data('ftCallbacks') && this.data('ftCallbacks').length > 0){
for (var idx = 0; idx < this.data('ftCallbacks').length; idx++) {
@ -230,9 +238,9 @@ Snap.plugin(function (Snap, Element, Paper, global) {
this.data('ftCallbacks').push(callback);
}
};
Element.prototype.ftDisableRotate = function(){
this.data('block_rotation', true);
this.data('block_rotation', true);
};
});
@ -254,7 +262,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var dragHandle = this;
var unscale = mainEl.data('unscale');
var bb = mainEl.data('obb');
var udx = dx*unscale;
var udy = dy*unscale;
@ -281,37 +289,58 @@ 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();
};
function dragHandleRotateEnd( mainElement ) {
};
function dragHandleRotateMove( mainEl, dx, dy, x, y, event ) {
var handle = this;
var mainBB = mainEl.getBBox();
var unscale = mainEl.data('unscale');
handle.attr({ cx: +handle.data('ocx') + dx*unscale, cy: +handle.data('ocy') + dy*unscale });
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 );
mainEl.ftDrawJoinLine( handle );
};
function calcDistance(x1,y1,x2,y2) {