Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

10 files changed, 111 insertions, 104 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 78d1e7e6..620376ab 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -305,7 +305,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 if (!canvas) {
                     var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas);
-                    ElementMediator.addElement(newCanvas, elementModel.data, true);
+                    ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                     // create all the GL stuff
                     var world = this.getGLWorld(newCanvas, this._useWebGL);
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index a61f8f79..455f519e 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -7,7 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
     DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
-    ElementMediator = require("js/mediators/element-mediator").ElementMediator,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     TagTool = require("js/tools/TagTool").TagTool,
     ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
@@ -53,59 +52,43 @@ exports.LineTool = Montage.create(ShapeTool, {
         }
     },
 
-    HandleLeftButtonUp:
-    {
-        value: function (event)
-        {
-            var slope = this._getSlope(),
-                drawData = this.getDrawingData();
+    HandleLeftButtonUp: {
+        value: function (event) {
+            var slope = this._getSlope(), drawData = this.getDrawingData();
 
             if(drawData) {
-                var canvas,
-                    xAdj = 0,
-                    yAdj = 0,
-                    w = ~~drawData.width,
-                    h = ~~drawData.height;
-                if(!this._useExistingCanvas())
-                {
-                    // set the dimensions
-                    if(slope === "horizontal")
-                    {
-                        h = Math.max(this._strokeSize, 1);
-                    }
-                    else if(slope === "vertical")
-                    {
-                        w = Math.max(this._strokeSize, 1);
-                    }
-                    else
-                    {
-                        // else make the line's stroke fit inside the canvas by growing the canvas
-                        var theta = Math.atan(slope);
-                        xAdj = Math.abs((this._strokeSize/2)*Math.sin(theta));
-                        yAdj = Math.abs((this._strokeSize/2)*Math.cos(theta));
-
-                        w += ~~(xAdj*2);
-                        h += ~~(yAdj*2);
-                    }
-
-                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                    var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas);
-
-                    ElementMediator.addElement(canvas, elementModel.data, true);
-                    canvas.elementModel.isShape = true;
-                }
-                else
-                {
-                    canvas = this._targetedElement;
-                    canvas.elementModel.controller = ShapesController;
-                    if(!canvas.elementModel.shapeModel)
-                    {
-                        canvas.elementModel.shapeModel = Montage.create(ShapeModel);
+                var canvas, xAdj = 0, yAdj = 0, w, h;
+                if(!this._useExistingCanvas()) {
+                    if(drawData = this.getDrawingData()) {
+                        // set the dimensions
+                        w = ~~drawData.width;
+                        h = ~~drawData.height;
+                        if(slope === "horizontal") {
+                            h = Math.max(this._strokeSize, 1);
+                        } else if(slope === "vertical") {
+                            w = Math.max(this._strokeSize, 1);
+                        } else {
+                            // else make the line's stroke fit inside the canvas by growing the canvas
+                            var theta = Math.atan(slope);
+                            xAdj = Math.abs((this._strokeSize/2)*Math.sin(theta));
+                            yAdj = Math.abs((this._strokeSize/2)*Math.cos(theta));
+
+                            w += ~~(xAdj*2);
+                            h += ~~(yAdj*2);
+                        }
+
+                        canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
+                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas);
+                        canvas.elementModel.isShape = true;
+                        this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
+                    } else {
+                        canvas = this._targetedElement;
+                        canvas.elementModel.controller = ShapesController;
+                        if(!canvas.elementModel.shapeModel) {
+                            canvas.elementModel.shapeModel = Montage.create(ShapeModel);
+                        }
                     }
                 }
-                this.RenderShape(w, h, drawData.planeMat, drawData.midPt,
-                                    canvas, slope, xAdj, yAdj);
-                NJevent("elementAdded", canvas);
             }
 
             this.endDraw(event);
@@ -113,11 +96,37 @@ exports.LineTool = Montage.create(ShapeTool, {
             this._isDrawing = false;
             this._hasDraw=false;
 
-
             this.DrawHandles();
         }
     },
 
+    onAddElements: {
+        value: function(el) {
+            var drawData, xAdj = 0, yAdj = 0, w, h, slope = this._getSlope();
+
+            if(drawData = this.getDrawingData()) {
+                // set the dimensions
+                w = ~~drawData.width;
+                h = ~~drawData.height;
+                if(slope === "horizontal") {
+                    h = Math.max(this._strokeSize, 1);
+                } else if(slope === "vertical") {
+                    w = Math.max(this._strokeSize, 1);
+                } else {
+                    // else make the line's stroke fit inside the canvas by growing the canvas
+                    var theta = Math.atan(slope);
+                    xAdj = Math.abs((this._strokeSize/2)*Math.sin(theta));
+                    yAdj = Math.abs((this._strokeSize/2)*Math.cos(theta));
+
+                    w += ~~(xAdj*2);
+                    h += ~~(yAdj*2);
+                }
+
+                this.RenderShape(w, h, drawData.planeMat, drawData.midPt, el, slope, xAdj, yAdj);
+            }
+        }
+    },
+
     _getSlope: {
         value: function() {
             var hitRec0 = this._mouseDownHitRec,
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index f1c79153..962f178d 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -447,7 +447,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                 var newCanvas = null;
                 newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                 var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas);
-                ElementMediator.addElement(newCanvas, elementModel.data, true);
+                ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                 // create all the GL stuff
                 var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial);
@@ -700,6 +700,7 @@ exports.PenTool = Montage.create(ShapeTool, {
         }
     },
 
+               
     BuildSecondCtrlPoint:{
         value: function(p0, p2, p3) {
             var baselineOrig = VecUtils.vecSubtract(3, p3, p0);
@@ -1051,11 +1052,11 @@ exports.PenTool = Montage.create(ShapeTool, {
                 }
                 else{
                     for (var i=0;i<this.application.ninja.selectedElements.length;i++){
-                        var element = this.application.ninja.selectedElements[i]._element;
+                        var element = this.application.ninja.selectedElements[i]
                         console.log("Entered pen tool, had selected: " + element.elementModel.selection);
                         if (element.elementModel.selection === 'Subpath'){ //TODO what to do if the canvas is drawn by tag tool?
                             //set the pen canvas to be the selected canvas
-                            this._penCanvas = this.application.ninja.selectedElements[i]._element;
+                            this._penCanvas = this.application.ninja.selectedElements[i];
 
                             // get the subpath for this world
                             this._selectedSubpath = null;
@@ -1128,7 +1129,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     var els = [];
                     ElementController.removeElement(this._penCanvas);
                     els.push(this._penCanvas);
-                    NJevent( "deleteSelection", els );
+                    NJevent( "elementsRemoved", els );
                     this._penCanvas = null;
                }
              }
@@ -1141,9 +1142,9 @@ exports.PenTool = Montage.create(ShapeTool, {
                     els.push(this.application.ninja.selectedElements[i]);
                 }
                 for(i=0; i<len; i++) {
-                    ElementController.removeElement(els[i]._element);
+                    ElementController.removeElement(els[i]);
                 }
-                NJevent( "deleteSelection", els );
+                NJevent( "ele