aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-01 13:21:11 -0800
committerPushkar Joshi2012-02-01 13:21:11 -0800
commit62d38a080b2918a0284c854e9bf882bfeeea1e0b (patch)
tree9d9b112796e200415fbfb28f4ef9557b7d67c81f
parentada488781ff815a827e7f5903f2c55773e3be0f3 (diff)
downloadninja-62d38a080b2918a0284c854e9bf882bfeeea1e0b.tar.gz
avoid overriding GlGeomObj translate method
-rw-r--r--js/helper-classes/RDGE/GLSubpath.js2
-rw-r--r--js/tools/PenTool.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index 9b6ae917..52699f85 100644
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -578,7 +578,7 @@ GLSubpath.prototype.copyFromSubpath = function (subpath) {
578 this.setStrokeWidth(subpath.getStrokeWidth()); 578 this.setStrokeWidth(subpath.getStrokeWidth());
579} 579}
580 580
581GLSubpath.prototype.translate = function (tx, ty, tz) { 581GLSubpath.prototype.translateAnchors = function (tx, ty, tz) {
582 for (var i=0;i<this._Anchors.length;i++){ 582 for (var i=0;i<this._Anchors.length;i++){
583 this._Anchors[i].translateAll(tx,ty,tz); 583 this._Anchors[i].translateAll(tx,ty,tz);
584 } 584 }
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 6aa5f3ab..cb2ea85a 100644
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -378,7 +378,7 @@ exports.PenTool = Montage.create(ShapeTool, {
378 if (this._penCanvas!==null) { 378 if (this._penCanvas!==null) {
379 //obtain the 2D translation of the canvas due to the Selection tool...assuming this is called in Configure 379 //obtain the 2D translation of the canvas due to the Selection tool...assuming this is called in Configure
380 var penCanvasLeft = parseInt(ElementMediator.getProperty(this._penCanvas, "left"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "left")); 380 var penCanvasLeft = parseInt(ElementMediator.getProperty(this._penCanvas, "left"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "left"));
381 var penCanvasTop = parseFloat(ElementMediator.getProperty(this._penCanvas, "top"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "top")); 381 var penCanvasTop = parseInt(ElementMediator.getProperty(this._penCanvas, "top"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "top"));
382 var penCanvasWidth = parseInt(ElementMediator.getProperty(this._penCanvas, "width"));//this._penCanvas.width; 382 var penCanvasWidth = parseInt(ElementMediator.getProperty(this._penCanvas, "width"));//this._penCanvas.width;
383 var penCanvasHeight = parseInt(ElementMediator.getProperty(this._penCanvas, "height"));//this._penCanvas.height; 383 var penCanvasHeight = parseInt(ElementMediator.getProperty(this._penCanvas, "height"));//this._penCanvas.height;
384 var penCanvasOldX = penCanvasLeft + 0.5 * penCanvasWidth; 384 var penCanvasOldX = penCanvasLeft + 0.5 * penCanvasWidth;
@@ -390,7 +390,7 @@ exports.PenTool = Montage.create(ShapeTool, {
390 //update the canvasX and canvasY parameters for this subpath and also translate the subpath points (since they're stored in stage world space) 390 //update the canvasX and canvasY parameters for this subpath and also translate the subpath points (since they're stored in stage world space)
391 this._selectedSubpath.setCanvasX(translateCanvasX + this._selectedSubpath.getCanvasX()); 391 this._selectedSubpath.setCanvasX(translateCanvasX + this._selectedSubpath.getCanvasX());
392 this._selectedSubpath.setCanvasY(translateCanvasY + this._selectedSubpath.getCanvasY()); 392 this._selectedSubpath.setCanvasY(translateCanvasY + this._selectedSubpath.getCanvasY());
393 this._selectedSubpath.translate(translateCanvasX, translateCanvasY, 0); 393 this._selectedSubpath.translateAnchors(translateCanvasX, translateCanvasY, 0);
394 this._selectedSubpath.createSamples(); //updates the bounding box 394 this._selectedSubpath.createSamples(); //updates the bounding box
395 } 395 }
396 } 396 }