From f4b203d96ca17f3a274832092503e468654efe7a Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Wed, 15 Oct 2014 00:54:46 -0700 Subject: [PATCH] change default tool for circle --- web/app/canvas.js | 10 +++++++--- web/app/circle.js | 7 ++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/web/app/canvas.js b/web/app/canvas.js index 8f15f0a0..3c18e1db 100644 --- a/web/app/canvas.js +++ b/web/app/canvas.js @@ -292,6 +292,10 @@ TCAD.TWO.SketchObject.prototype.visit = function(onlyVisible, h) { return h(this); }; +TCAD.TWO.SketchObject.prototype.getDefaultTool = function(viewer) { + return new TCAD.TWO.DragTool(this, viewer); +}; + TCAD.TWO.SketchObject.prototype._translate = function(dx, dy, translated) { translated[this.id] = 'x'; for (var i = 0; i < this.linked.length; ++i) { @@ -526,9 +530,9 @@ TCAD.TWO.PanTool.prototype.mousedown = function(e) { } else { this.viewer.select([picked[0]], true); if (!picked[0].aux) { - var dragTool = new TCAD.TWO.DragTool(picked[0], this.viewer); - dragTool.mousedown(e); - this.viewer.toolManager.takeControl(dragTool); + var tool = picked[0].getDefaultTool(this.viewer); + tool.mousedown(e); + this.viewer.toolManager.takeControl(tool); } } this.viewer.refresh(); diff --git a/web/app/circle.js b/web/app/circle.js index dd3bb304..3a425085 100644 --- a/web/app/circle.js +++ b/web/app/circle.js @@ -30,11 +30,16 @@ TCAD.TWO.Circle.prototype.drawImpl = function(ctx, scale) { ctx.stroke(); }; - TCAD.TWO.Circle.prototype.normalDistance = function(aim) { return Math.abs(TCAD.math.distance(aim.x, aim.y, this.c.x, this.c.y) - this.r.get()); }; +TCAD.TWO.Circle.prototype.getDefaultTool = function(viewer) { + var editTool = new TCAD.TWO.EditCircleTool(viewer, null); + editTool.circle = this; + return editTool; +}; + TCAD.TWO.EditCircleTool = function(viewer, layer) { this.viewer = viewer;