change the PI to make it look like the fill color affects the brush stroke color

3 files changed, 18 insertions, 12 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 157cbc64..c6cbc3cf 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -703,13 +703,14 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             prop: "border",
-                            id : "stroke"
+                            id : "stroke",
+                            visible: false
                         },
                         {
                             type : "color",
                             id : "fill",
                             prop: "background",
-                            visible : false,
+                            visible : true,
                             divider : true
                         }
                     ],
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index b2e56149..d9c2ab53 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -45,7 +45,7 @@ var BrushStroke = function GLBrushStroke() {
     this._strokeAmountSmoothing = 0;
 
     // currently, brush does not support a fill region
-    this.canFill = false;
+    this.canFill = true;
 
     //threshold that tells us whether two samples are too far apart
     this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5;
@@ -180,7 +180,7 @@ BrushStroke.prototype.setStrokeWidth = function (w) {
     }
     this._isDirty=true;
 };
-
+/*
 BrushStroke.prototype.getStrokeMaterial = function () {
     return this._strokeMaterial;
 };
@@ -188,18 +188,24 @@ BrushStroke.prototype.getStrokeMaterial = function () {
 BrushStroke.prototype.setStrokeMaterial = function (m) {
     this._strokeMaterial = m; this._isDirty = true;
 };
-
+*/
 BrushStroke.prototype.getStrokeColor = function () {
-    return this._strokeColor;
+    return null;//return this._strokeColor;
 };
 
 BrushStroke.prototype.setStrokeColor = function (c) {
-    this._strokeColor = c; this._isDirty = true;
+    //this._strokeColor = c; this._isDirty = true;
 };
 
 BrushStroke.prototype.setFillColor = function(c){
-    return;
-}; //NO-OP for now as we have no fill region
+    this._strokeColor = c; this._isDirty = true;
+};
+//sets stroke color for now as we have no fill region
+
+BrushStroke.prototype.getFillColor = function() {
+    return this._strokeColor;
+};
+//return strokeColor for now as we have no fill region
 
 BrushStroke.prototype.setSecondStrokeColor = function(c){
     this._secondStrokeColor=c; this._isDirty = true;
@@ -732,8 +738,7 @@ BrushStroke.prototype.drawToContext = function(ctx, drawStageWorldPts, stageWorl
                 ctx.strokeStyle = this.buildColor(ctx, this._strokeColor, w, h, this._strokeWidth, alphaVal);
             }
             //linearly interpolate between the two stroke colors
-            var currStrokeColor = VecUtils.vecInterpolate(4, this._strokeColor, this._secondStrokeColor, t/numTraces);
-            //ctx.strokeStyle="rgba("+parseInt(255*currStrokeColor[0])+","+parseInt(255*currStrokeColor[1])+","+parseInt(255*currStrokeColor[2])+","+alphaVal+")";
+            //var currStrokeColor = VecUtils.vecInterpolate(4, this._strokeColor, this._secondStrokeColor, t/numTraces);
             ctx.translate(disp[0],disp[1]);
             ctx.beginPath();
             if (drawStageWorldPts) {
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index f85978ad..db369a88 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -138,7 +138,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                  } else {
                      colorArray = [1,1,1,0];
                  }
-                 this._selectedBrushStroke.setStrokeColor(colorArray);
+                 this._selectedBrushStroke.setFillColor(colorArray);
 
                  //add this point to the brush stroke in case the user does a mouse up before doing a mouse move
                  var currMousePos = hitRec.calculateStageWorldPoint();