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

3 files changed, 11 insertions, 20 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a793b643..bef1e435 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1206,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;
@@ -1217,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]);
@@ -1279,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 e3756f32..a8b6e739 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -481,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;
@@ -541,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 snapRec.init( elt );
                                                 this._elementCache.push( snapRec );
 
-                                                if (!elt.elementModel)
-                                                {
-                            NJUtils.makeModelFromElement(elt);
-                                                }
                                                 elt.elementModel.isIn2DSnapCache = true;
                                         }
                                         else if (elt.elementModel)
@@ -613,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         snapRec.init( elt );
                                         this._elementCache.push( snapRec );
 
-                                        if (!elt.elementModel)
-                                        {
-                                                NJUtils.makeModelFromElement(elt);
-                                        }
                                         elt.elementModel.isIn2DSnapCache = true;
                                 }
                                 else if (elt.elementModel)