2 files changed, 89 insertions, 17 deletions

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/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..d18f371a 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -273,14 +273,36 @@ exports.PenTool = Montage.create(ShapeTool, {
                 var swMousePos = hitRec.calculateStageWorldPoint();
                 swMousePos[0]+= snapManager.getStageWidth()*0.5; swMousePos[1]+= snapManager.getStageHeight()*0.5;
 
-                this._selectedSubpath.addAnchor(new AnchorPoint());
-                var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
-                newAnchor.setPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                newAnchor.setPrevPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                newAnchor.setNextPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                //set the mode so that dragging will update the next and previous locations
-                this._editMode = this.EDIT_PREV_NEXT;
-            }
+                //check if the mouse click location is close to the existing anchor
+                var indexAndCode = this._selectedSubpath.pickAnchor(swMousePos[0], swMousePos[1], swMousePos[2], this._PICK_POINT_RADIUS);
+                if (indexAndCode[0]>=0){
+                    //the anchor point was hit, so we do not add another anchor
+                    switch(indexAndCode[1]){
+                        case this._selectedSubpath.SEL_ANCHOR:
+                            this._editMode = this.EDIT_ANCHOR;
+                            break;
+                        case this._selectedSubpath.SEL_PREV:
+                            this._editMode = this.EDIT_PREV;
+                            break;
+                        case this._selectedSubpath.SEL_NEXT:
+                            this._editMode = this.EDIT_NEXT;
+                            break;
+                        default:
+                            this._editMode = this.EDIT_ANCHOR;
+                            console.log("WARNING picked anchor point with incorrect mode");
+                            break;
+                    }
+                    
+                } else {
+                    this._selectedSubpath.addAnchor(new AnchorPoint());
+                    var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                    newAnchor.setPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    newAnchor.setPrevPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    newAnchor.setNextPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    //set the mode so that dragging will update the next and previous locations
+                    this._editMode = this.EDIT_PREV_NEXT;
+                }
+            } //if we have not yet created a canvas for this path
 
             //the selected subpath has a canvas, so test within that canvas' space
             else
@@ -715,14 +737,24 @@ exports.PenTool = Montage.create(ShapeTool, {
             this._isDrawing = false;
             this._editMode = this.EDIT_NONE;
 
+            //if we're not in edit_path mode and we closed the selected subpath, then we are going to start a new subpath, so we nullify the selected subpath
+            if (this._selectedSubpath.getIsClosed() && this._entryEditMode !== this.ENTRY_SELECT_PATH){
+                this._selectedSubpath = null;
+            }
+            
             if (this._selectedSubpath){
                 this.DrawSubpathAnchors(this._selectedSubpath);//render the subpath anchors on canvas
+            }else{
+                //clear the canvas
+                this.application.ninja.stage.clearDrawingCanvas();
             }
 
             if (!this._trackMouseMoveWhenUp){
                 NJevent("disableStageMove");
             }
             this._hoveredAnchorIndex = -1;
+
+
         }
     },
 
@@ -1256,10 +1288,45 @@ exports.PenTool = Montage.create(ShapeTool, {
         } //value: function() {
     }, //DrawSubpathAnchors {
 
+    deselectPenTool:{
+        value: function() {
+            this._selectedSubpath = null;
+            this._selectedSubpathCanvas = null;
+            this._selectedSubpathPlaneMat = null;
+            this._snapTargetIndex = -1;
+        }
+    },
+    //if the document is opened with the pen tool being active, we do the same thing as when configure(false) is called
+    handleOpenDocument: {
+        value: function() {
+            this.deselectPenTool();
+            //clear the canvas
+            this.application.ninja.stage.clearDrawingCanvas();
+        }
+    },
+    //if the document is switched with the pen tool being active, we do the same thing as when configure(false) is called
+    handleSwitchDocument: {
+        value: function() {
+            this.deselectPenTool();
+            //clear the canvas
+            this.application.ninja.stage.clearDrawingCanvas();
+        }
+    },
+    //if the document is closed with the pen tool being active, we do the same thing as when configure(false) is called
+    handleCloseDocument: {
+        value: function() {
+            this.deselectPenTool();
+            //clear the canvas
+            this.application.ninja.stage.clearDrawingCanvas();
+        }
+    },
 
     Configure: {
         value: function (wasSelected) {
             if (wasSelected) {
+                //first nullify any set values
+                this.deselectPenTool();
+
                 defaultEventManager.addEventListener("resetPenTool", this, false);
                 this.application.ninja.elementMediator.deleteDelegate = this;
                 this.application.ninja.stage.drawingCanvas.style.cursor = //"auto";
@@ -1313,17 +1380,21 @@ exports.PenTool = Montage.create(ShapeTool, {
                 if (this._trackMouseMoveWhenUp){
                     NJevent("enableStageMove");
                 }
+                this.eventManager.addEventListener("openDocument", this, false);
+                this.eventManager.addEventListener("switchDocument", this, false);
+                this.eventManager.addEventListener("closeDocument", this, false);
             } //if the pen tool was selected
             else {
                 if (this._trackMouseMoveWhenUp){
                     NJevent("disableStageMove");
                 }
-                this._selectedSubpath = null;
-                this._selectedSubpathCanvas = null;
-                this._selectedSubpathPlaneMat = null;
-                this._snapTargetIndex = -1;
+                this.deselectPenTool();
                 defaultEventManager.removeEventListener("resetPenTool", this, false);
                 this.application.ninja.elementMediator.deleteDelegate = null;
+                
+                this.eventManager.removeEventListener("openDocument", this, false);
+                this.eventManager.removeEventListener("switchDocument", this, false);
+                this.eventManager.removeEventListener("closeDocument", this, false);
             } //if the pen tool was de-selected
         }
     },