2 files changed, 67 insertions, 7 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 4ce9976a..90010cdf 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -85,7 +85,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
 
                     var strokeHardness = 100;
                     if (this.options.strokeHardness){
-                        strokeHardness = ShapesController.GetValueInPixels(this.options.strokeHardness.value, this.options.strokeHardness.units);
+                        strokeHardness = this.options.strokeHardness.value;
                     }
                     this._selectedBrushStroke.setStrokeHardness(strokeHardness);
 
@@ -94,7 +94,10 @@ exports.BrushTool = Montage.create(ShapeTool, {
                         doSmoothing = this.options.doSmoothing;
                     }
                     this._selectedBrushStroke.setDoSmoothing(doSmoothing);
-
+                    if (doSmoothing){
+                        this._selectedBrushStroke.setSmoothingAmount(this.options.smoothingAmount.value);
+                    }
+                    
                     var useCalligraphic = false;
                     if (this.options.useCalligraphic){
                         useCalligraphic = this.options.useCalligraphic;
@@ -103,7 +106,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                         this._selectedBrushStroke.setStrokeUseCalligraphic(true);
                         var strokeAngle = 0;
                         if (this.options.strokeAngle){
-                            strokeAngle= ShapesController.GetValueInPixels(this.options.strokeAngle.value, this.options.strokeAngle.units);
+                            strokeAngle= this.options.strokeAngle.value;
                         }
                         this._selectedBrushStroke.setStrokeAngle(Math.PI * -strokeAngle/180);
                     } else {
@@ -251,7 +254,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 var top = Math.round(midPt[1] - 0.5 * h);
 
                 if (!canvas) {
-                var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
+                    var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas);
                     ElementMediator.addElement(newCanvas, elementModel.data, true);
 
@@ -263,6 +266,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                     var brushStroke = this._selectedBrushStroke;
                     if (brushStroke){
                         brushStroke.setWorld(world);
+                        brushStroke.setCanvas(newCanvas);
 
                         brushStroke.setPlaneMatrix(planeMat);
                         var planeMatInv = glmat4.inverse( planeMat, [] );
@@ -273,10 +277,37 @@ exports.BrushTool = Montage.create(ShapeTool, {
                         world.render();
                         //TODO this will not work if there are multiple shapes in the same canvas
                         newCanvas.elementModel.shapeModel.GLGeomObj = brushStroke;
+
+                        newCanvas.elementModel.shapeModel.shapeCount++;
+                        if(newCanvas.elementModel.shapeModel.shapeCount === 1)
+                        {
+                            newCanvas.elementModel.selection = "BrushStroke";
+                            newCanvas.elementModel.pi = "BrushStrokePi";
+                            newCanvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
+                            var strokeColor = this._selectedBrushStroke.getStrokeColor();
+                            newCanvas.elementModel.shapeModel.stroke = strokeColor;
+                            if(strokeColor) {
+                                newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                            }
+                            newCanvas.elementModel.shapeModel.strokeMaterial = this._selectedBrushStroke.getStrokeMaterial();
+
+                            newCanvas.elementModel.shapeModel.GLGeomObj = brushStroke;
+                            newCanvas.elementModel.shapeModel.useWebGl = this.options.use3D;
+                        }
+                        else
+                        {
+                            // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
+                        }
+
+                        if(newCanvas.elementModel.isShape)
+                        {
+                            this.application.ninja.selectionController.selectElement(canvas);
+                        }
                     }
                 } //if (!canvas) {
                 else {
 
+                    /*
                     var world = null;
                     if (canvas.elementModel.shapeModel && canvas.elementModel.shapeModel.GLWorld) {
                         world = canvas.elementModel.shapeModel.GLWorld;
@@ -317,6 +348,8 @@ exports.BrushTool = Montage.create(ShapeTool, {
                         //TODO this will not work if there are multiple shapes in the same canvas
                         canvas.elementModel.shapeModel.GLGeomObj = brushStroke;
                     }
+                    */
+                    alert("BrushStroke cannot edit existing canvas");
                 } //else of if (!canvas) {
             } //value: function (w, h, planeMat, midPt, canvas) {
         }, //RenderShape: {
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 60ef4f92..779b7f16 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -467,9 +467,9 @@ exports.PenTool = Montage.create(ShapeTool, {
                     if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){
                         this._selectedSubpath.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor);
                     }
-                    //if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){
-                    //    this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor);
-                    //}
+                    if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){
+                        this._selectedSubpath.setFillColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor);
+                    }
                 } //if this is a new path being rendered
 
                 this._selectedSubpath.makeDirty();
@@ -594,6 +594,7 @@ exports.PenTool = Montage.create(ShapeTool, {
 
                 var subpath = this._selectedSubpath; //new GLSubpath();
                 subpath.setWorld(world);
+                subpath.setCanvas(newCanvas);
                 subpath.setPlaneMatrix(planeMat);
                 var planeMatInv = glmat4.inverse( planeMat, [] );
                 subpath.setPlaneMatrixInverse(planeMatInv);
@@ -601,7 +602,33 @@ exports.PenTool = Montage.create(ShapeTool, {
 
                 world.addObject(subpath);
                 world.render();
+                //TODO this will not work if there are multiple shapes in the same canvas
                 newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
+                newCanvas.elementModel.shapeModel.shapeCount++;
+                if(newCanvas.elementModel.shapeModel.shapeCount === 1)
+                {
+                    newCanvas.elementModel.selection = "Subpath";
+                    newCanvas.elementModel.pi = "SubpathPi";
+                    newCanvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
+                    var strokeColor = subpath.getStrokeColor();
+                    newCanvas.elementModel.shapeModel.stroke = strokeColor;
+                    if(strokeColor) {
+                        newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                    }
+                    newCanvas.elementModel.shapeModel.strokeMaterial = subpath.getStrokeMaterial();
+
+                    newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
+                    newCanvas.elementModel.shapeModel.useWebGl = this.options.use3D;
+                }
+                else
+                {
+                    // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
+                }
+
+                if(newCanvas.elementModel.isShape)
+                {
+                    this.application.ninja.selectionController.selectElement(newCanvas);
+                }
             } //if (!canvas) {
             else {