Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

4 files changed, 53 insertions, 65 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 871b832d..bef1e435 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -112,7 +112,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("elementChanging", this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
             this.eventManager.addEventListener("elementReplaced", this, false);
                 }
         },
@@ -126,7 +125,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             //initialize with current document
             this._eltArray = [];
             this._planesArray = [];
-            this.setDrawingSurfaceElement(stage.canvas);
+            this.setDrawingSurfaceElement(stage.gridCanvas);
             this.setSourceSpaceElement( this.application.ninja.currentDocument.model.documentRoot);
             this.setWorkingPlane( [0,0,1,0] );
 
@@ -164,15 +163,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument:{
-        value: function() {
-            if(this.application.ninja.documentController._documents.length === 0){
-                this._eltArray.length = 0;
-                this._planesArray.length = 0;
-            }
-        }
-    },
-
     handleElementAdded: {
         value: function(event) {
             var elements = event.detail;
@@ -276,8 +266,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     stage = this.application.ninja.stage,
                     minLeft = stage.userPaddingLeft,
                     minTop = stage.userPaddingTop,
-                    docLeft = stage.documentOffsetLeft,
-                    docTop = stage.documentOffsetTop,
+                    docLeft = stage.userContentLeft,
+                    docTop = stage.userContentTop,
                     l,
                     t,
                     plane,
@@ -307,7 +297,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 }
 
                 if(!changed) {
-                    stage.layout.draw();
                     this.drawWorkingPlane();
                     this.draw3DCompass();
                 }
@@ -628,11 +617,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         {
                 value: function ()
                 {
+            this.application.ninja.stage.clearGridCanvas();
                         if (!this.isDrawingGrid()) return;
 
                         var saveContext = this.getDrawingSurfaceElement();
-                        //this.setDrawingSurfaceElement(window.stageManager.layoutCanvas);
-                        this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas);
+                        this.setDrawingSurfaceElement(this.application.ninja.stage.gridCanvas);
 
                         // 3 coordinate axes for the plane
                         var zAxis = [this._workingPlane[0], this._workingPlane[1], this._workingPlane[2]];
@@ -1217,7 +1206,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         // set the element to be the viewport object - temporarily
                         var tmpCanvas = this.application.ninja.stage.canvas;
                         var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
-                        this.viewUtils.pushViewportObj( tmpCanvas );
+//                      this.viewUtils.pushViewportObj( tmpCanvas );
 
                         // save the source space object and set to the target object
                         var saveSource = this._sourceSpaceElt;
@@ -1228,7 +1217,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         var saveLineWidth = this._lineWidth;
 
                         var origLeft = 60;
-                        var origTop = this.snapManager.getStageHeight() - 60;
+                        var origTop = tmpCanvas.height - 60;
 
                         var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
                         var tMat = Matrix.Translation([origLeft,origTop,0]);
@@ -1290,7 +1279,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this.drawArrowHead(rO, zO);
 
                         // restore the state
-                        this.viewUtils.popViewportObj();
+//                      this.viewUtils.popViewportObj();
                         this._drawingContext.restore();
                         this.setDrawingSurfaceElement(saveContext);
                         this._lineColor = saveColor;
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 2f0283a9..35ee8112 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -928,17 +928,18 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
                 return 0;
             }
             //TODO testing...remove this block
-            console.log("getAxisAngleBetween3DVectors Angle: "+angle);
             if (isNaN(angle)){
-                console.log("getAxisAngleBetween3DVectors Angle is NaN");
+                console.log("Warning! getAxisAngleBetween3DVectors Angle is NaN");
             }
             //TODO end testing block
             //optionally, if axis is provided, create the axis of rotation as well
             var rotAxis = VecUtils.vecCross(3, v1n, v2n);
             rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
-            axis[0] = rotAxis[0];
-            axis[1] = rotAxis[1];
-            axis[2] = rotAxis[2];
+            if (axis){
+                axis[0] = rotAxis[0];
+                axis[1] = rotAxis[1];
+                axis[2] = rotAxis[2];
+            }
             return angle;
         }
     },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 069c6022..a8b6e739 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,8 +21,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    drawingCanvas: { value: null, writable: true},
-    
+
+    currentStage: { value: null },
+
         // we keep a stack of working planes to facilitate working on other planes temporarily
         _workingPlaneStack : { value: [], writable: true },
 
@@ -83,14 +84,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetWidth);
+                return parseInt(this.currentStage.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetHeight);
+                return parseInt(this.currentStage.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.application.ninja.currentDocument.model.documentRoot;    }},
+    getStage : { value: function()              {        return this.currentStage;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -480,10 +481,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 {
                                         var snapRec = this._elementCache[i];
                                         var elt = snapRec.getElement();
-                                        if (elt.elementModel)
-                        elt.elementModel.isIn2DSnapCache = false;
-                                        else
-                                                console.log( "element in the 2D cache does not have an elementModel" );
+                    elt.elementModel.isIn2DSnapCache = false;
+
                                 }
 
                                 this._elementCache = null;
@@ -540,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 snapRec.init( elt );
                                                 this._elementCache.push( snapRec );