Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

5 files changed, 60 insertions, 19 deletions

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e8e88d1d..6edec811 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -66,7 +66,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var world = this.getGLWorld(canvas, this.options.use3D);
 
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
-            var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
+            var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2));
 
             var oval = new Circle(); //GLCircle();
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 0537a27b..ce7606a1 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -331,10 +331,26 @@ exports.PanTool = Montage.create(toolBase,
                                 
                                 if (!this._altKeyDown)
                                         delta[2] = 0;
-                                var transMat = Matrix.Translation( delta );
-                                this._worldPt = wPt;
+
+                                // limit the change
+                                var ucMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+                                var tooMuch = false
+                                if ((ucMat[12] >  12000) && (delta[0] > 0))  tooMuch = true;
+                                if ((ucMat[12] < -12000) && (delta[0] < 0))  tooMuch = true;
+                                if ((ucMat[13] >  12000) && (delta[1] > 0))  tooMuch = true;
+                                if ((ucMat[13] < -12000) && (delta[1] < 0))  tooMuch = true;
+                                if ((ucMat[14] >  12000) && (delta[2] > 0))  tooMuch = true;
+                                if ((ucMat[14] < -12000) && (delta[2] < 0))  tooMuch = true;
+                                if (tooMuch)
+                                {
+                                        this._isDrawing = false;
+                                        delta = [0,0,0];
+                                }
+                                else
+                                        this._worldPt = wPt;
 
                                 // update everything
+                                var transMat = Matrix.Translation( delta );
                                 this.applyDeltaMat( transMat );
                         }
                 }
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 7033ee3d..855c7b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -751,10 +751,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
-            {
+            if (viewPort && viewPort.style && viewPort.style.zoom) {
                 zoomFactor = Number(viewPort.style.zoom);
             }
+
             var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
             for (var j=0;  j<4;  j++)
             {
@@ -863,7 +863,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
+            if (viewPort && viewPort.style && viewPort.style.zoom)
             {
                 zoomFactor = Number(viewPort.style.zoom);
             }
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 21a5a025..8f45891d 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -54,9 +54,9 @@ exports.ShapeTool = Montage.create(DrawingTool, {
     },
 
         HandleLeftButtonUp:
-        {
-                value: function (event)
-                {
+    {
+        value: function (event)
+        {
             var drawData;
 
             drawData = this.getDrawingData();
@@ -69,24 +69,27 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                                                                         drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
-                    this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
+                                        this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                 } else {
                     canvas = this._targetedElement;
+                    if (!canvas.getAttribute( "data-RDGE-id" ))
+                        canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );
                     canvas.elementModel.controller = ShapesController;
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
+                                        this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
                 }
             }
 
-                        this.endDraw(event);
+            this.endDraw(event);
 
-                        this._isDrawing = false;
-                        this._hasDraw=false;
+            this._isDrawing = false;
+            this._hasDraw=false;
 
-                        this.DrawHandles();
-                }
-        },
+            this.DrawHandles();
+        }
+    },
 
     onAddElements: {
         value: function(el) {
@@ -211,7 +214,20 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         _useExistingCanvas: {
                 value: function()
                 {
-                        return (this._targetedElement && !ShapesController.isElementAShape(this._targetedElement));
+                        var target;
+                        if (this._targetedElement && (this._targetedElement.nodeName === "CANVAS") && !ShapesController.isElementAShape(this._targetedElement))
+                                target = this._targetedElement;
+                        else
+                        {
+                                var container = this.application.ninja.currentSelectedContainer;
+                                if (container && (container.nodeName === "CANVAS"))
+                                {
+                                        target = container;
+                                        this._targetedElement = target;
+                                }
+                        }
+
+                        return target;
                 }
         }
 
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 2283dfab..0b51aa28 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -41,11 +41,20 @@ exports.DrawingToolBase = Montage.create(Montage, {
 
                         // do the snap
                         var hitRec = snapManager.snap(x, y,  true);
+                        var dragPlane;
                         if (hitRec) {
                                 // set up the working plane and convert the hit record to be working plane relative
-                                var dragPlane = snapManager.setupDragPlanes( hitRec );
-                                var wpHitRec = hitRec.convertToWorkingPlane( dragPlane );
+                                if (hitRec.getElement() === snapManager.application.ninja.currentSelectedContainer)
+                                {
+                                        dragPlane = viewUtils.getUnprojectedElementPlane( hitRec.getElement() );
+                                        snapManager.setupDragPlaneFromPlane( dragPlane );
+                                }
+                                else
+                                {
+                                        dragPlane = snapManager.setupDragPlanes( hitRec );
+                                }
 
+                                var wpHitRec = hitRec.convertToWorkingPlane( dragPlane );
                                 var pt = hitRec.getScreenPoint();
 
                 return( [wpHitRec, pt[0], pt[1]] );