2 files changed, 133 insertions, 40 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 5c334b92..5d4e8288 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -225,9 +225,11 @@ exports.BrushTool = Montage.create(ShapeTool, {
             this._hasDraw = false;
 
             //finish giving enough info. to the brush stroke
-            this._selectedBrushStroke.setPlaneMatrix(this._brushStrokePlaneMat);
-            this._selectedBrushStroke.setPlaneMatrixInverse(glmat4.inverse(this._brushStrokePlaneMat,[]));
-            this._selectedBrushStroke.setDragPlane(this._draggingPlane);
+            if (this._selectedBrushStroke){
+                this._selectedBrushStroke.setPlaneMatrix(this._brushStrokePlaneMat);
+                this._selectedBrushStroke.setPlaneMatrixInverse(glmat4.inverse(this._brushStrokePlaneMat,[]));
+                this._selectedBrushStroke.setDragPlane(this._draggingPlane);
+            }
 
             //display the previously drawn stroke in a separate canvas
             this.RenderCurrentBrushStroke();
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 16990ca7..fd470af7 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
@@ -454,19 +476,18 @@ exports.PenTool = Montage.create(ShapeTool, {
                     else if (this._editMode & this.EDIT_PREV) {
                         localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[0]);
                         selAnchor.translatePrev(localTranslation[0], localTranslation[1], localTranslation[2]);
-
-                        //move the next point if Alt key is down to ensure relative angle between prev and next
-                        if (this._isAltDown) {
-                            selAnchor.translateNextFromPrev(localTranslation[0], localTranslation[1], localTranslation[2]);
+                        if (!this._isAltDown){
+                            //selAnchor.translateNextFromPrev(localTranslation[0], localTranslation[1], localTranslation[2]);
+                            selAnchor.setNextFromPrev();
                         }
                     }
                     else if (this._editMode & this.EDIT_NEXT) {
                         localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[2]);
-                        selAnchor.translateNext(localTranslation[0], localTranslation[1], localTranslation[2]);
-
                         //move the prev point if Alt key is down to ensure relative angle between prev and next
-                        if (this._isAltDown) {
-                            selAnchor.translatePrevFromNext(localTranslation[0], localTranslation[1], localTranslation[2]);
+                        selAnchor.translateNext(localTranslation[0], localTranslation[1], localTranslation[2]);
+                        if (!this._isAltDown){
+                            //selAnchor.translatePrevFromNext(localTranslation[0], localTranslation[1], localTranslation[2]);
+                            selAnchor.setPrevFromNext();
                         }
                     }
                     else if (this._editMode & this.EDIT_PREV_NEXT) {
@@ -714,14 +735,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;
+
+
         }
     },
 
@@ -1255,10 +1286,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";
@@ -1312,17 +1378,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
         }
     },
@@ -1331,38 +1401,57 @@ exports.PenTool = Montage.create(ShapeTool, {
         value: function(event){
              //clear the selected subpath...the only new additions to this function w.r.t. ToolBase
              if (this._selectedSubpath){
+                 var removeSelectedSubpathCanvas = false;
+                 var removeSelectedSubpath = true; //this is applicable only if the subpath canvas is to be removed
                  if (this._selectedSubpath.getSelectedAnchorIndex()>=0){
                      this._hoveredAnchorIndex=-1;
                      this._selectedSubpath.removeAnchor(this._selectedSubpath.getSelectedAnchorIndex());
                      this._selectedSubpath.createSamples(false);
                      //clear the canvas
                      this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
+
                      this.PrepareSelectedSubpathForRendering();
                      this.DrawSubpathAnchors(this._selectedSubpath);