Merge remote-tracking branch 'origin/master' into PlotlyPromisePolyfill

bpostlethwaite · bpostlethwaite · commit 88c795483f6a · 2015-10-15T13:45:48.000-04:00
diff --git a/image_server/test/mocks/boxplots_outlierColorDflt.json b/image_server/test/mocks/boxplots_outlierColorDflt.json
@@ -0,0 +1,60 @@
+{
+    "data": [
+        {
+            "y": [
+                0.75,
+                5.25,
+                5.5,
+                6,
+                6.2,
+                6.6,
+                6.8,
+                7,
+                7.2,
+                7.5,
+                7.5,
+                7.75,
+                8.15,
+                8.15,
+                8.65,
+                8.93,
+                9.2,
+                9.5,
+                10,
+                10.25,
+                11.5,
+                12,
+                16,
+                20.9,
+                22.3,
+                23.25
+            ],
+            "type": "box",
+            "marker": {
+                "outliercolor": "green"
+            },
+            "uid": "511258"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "type": "category",
+            "range": [
+                -0.5,
+                0.5
+            ],
+            "autorange": true
+        },
+        "yaxis": {
+            "type": "linear",
+            "range": [
+                -0.5,
+                24.5
+            ],
+            "autorange": true
+        },
+        "height": 450,
+        "width": 1000,
+        "autosize": true
+    }
+}
diff --git a/image_server/test/test-images-baseline/boxplots_outlierColorDflt.png b/image_server/test/test-images-baseline/boxplots_outlierColorDflt.png
diff --git a/shelly/plotlyjs/static/plotlyjs/src/boxes.js b/shelly/plotlyjs/static/plotlyjs/src/boxes.js
@@ -135,7 +135,7 @@ boxes.attributes = {
     marker: {
         outliercolor: {
             valType: 'color',
-            dflt: 'rgba(0,0,0,0)',
+            dflt: 'rgba(0, 0, 0, 0)',
             role: 'style',
             description: 'Sets the color of the outlier sample points.'
         },
@@ -155,7 +155,10 @@ boxes.attributes = {
             outliercolor: {
                 valType: 'color',
                 role: 'style',
-                description: 'Sets the border line color of the outlier sample points.'
+                description: [
+                    'Sets the border line color of the outlier sample points.',
+                    'Defaults to marker.color'
+                ].join(' ')
             },
             outlierwidth: {
                 valType: 'number',
@@ -252,7 +255,13 @@ boxes.supplyDefaults = function(traceIn, traceOut, defaultColor) {
 
     coerce('whiskerwidth');
     coerce('boxmean');
-    var boxpoints = coerce('boxpoints');
+
+    var outlierColorDflt = Plotly.Lib.coerce2(traceIn, traceOut, boxes.attributes, 'marker.outliercolor'),
+        lineoutliercolor = coerce('marker.line.outliercolor'),
+        boxpoints = outlierColorDflt || 
+                    lineoutliercolor ? coerce('boxpoints', 'suspectedoutliers') : 
+                    coerce('boxpoints');
+                    
     if(boxpoints) {
         coerce('jitter', boxpoints==='all' ? 0.3 : 0);
         coerce('pointpos', boxpoints==='all' ? -1.5 : 0);
@@ -265,8 +274,7 @@ boxes.supplyDefaults = function(traceIn, traceOut, defaultColor) {
         coerce('marker.line.width');
 
         if(boxpoints==='suspectedoutliers') {
-            coerce('marker.outliercolor');
-            coerce('marker.line.outliercolor', traceOut.marker.color);
+            coerce('marker.line.outliercolor', traceOut.marker.color)
             coerce('marker.line.outlierwidth');
         }
     }
diff --git a/shelly/plotlyjs/static/plotlyjs/src/contour.js b/shelly/plotlyjs/static/plotlyjs/src/contour.js
@@ -124,10 +124,9 @@ contour.supplyDefaults = function(traceIn, traceOut, defaultColor, layout) {
         return Plotly.Lib.coerce(traceIn, traceOut, contour.attributes, attr, dflt);
     }
 
-    var contourstart = coerce('contours.start'),
-        contourend = coerce('contours.end'),
-        validcont = contourstart!==undefined && contourend!==undefined,
-        autocontour = validcont ? coerce('autocontour', false) : coerce('autocontour');
+    var contourStart = Plotly.Lib.coerce2(traceIn, traceOut, contour.attributes, 'contours.start'),
+        contourEnd = Plotly.Lib.coerce2(traceIn, traceOut, contour.attributes, 'contours.end'),
+        autocontour = contourStart && contourEnd ? coerce('autocontour', false) : coerce('autocontour');
     if(autocontour) coerce('ncontours');
     else coerce('contours.size');
 
diff --git a/shelly/plotlyjs/static/plotlyjs/src/histogram.js b/shelly/plotlyjs/static/plotlyjs/src/histogram.js
@@ -40,7 +40,6 @@ Plotly.Plots.register(Plotly.Heatmap, 'histogram2d',
 // histogram has its own calc function,
 // but uses Bars.plot to display
 // and Bars.setPositions for stacking and grouping
-
 function makeBinsAttr(axLetter) {
     return {
         start: {
@@ -218,13 +217,12 @@ histogram.supplyDefaults = function(traceIn, traceOut) {
     binDirections.forEach(function(binDirection){
         // data being binned - note that even though it's a little weird,
         // it's possible to have bins without data, if there's inferred data
-        var binstrt = coerce(binDirection + 'bins.start'),
-            binend = coerce(binDirection + 'bins.end'),
-            validbin = binstrt!==undefined && binend!==undefined,
-            autobin = validbin ? 
+        var binstrt = Plotly.Lib.coerce(traceIn, traceOut, histogram.attributes, binDirection + 'bins.start'),
+            binend = Plotly.Lib.coerce(traceIn, traceOut, histogram.attributes, binDirection + 'bins.end'),
+            autobin = binstrt && binend ? 
                 coerce('autobin' + binDirection, false) : 
                 coerce('autobin' + binDirection);
- 
+
         if(autobin) coerce('nbins' + binDirection);
         else coerce(binDirection + 'bins.size');
     });
diff --git a/shelly/plotlyjs/static/plotlyjs/src/lib/lib.js b/shelly/plotlyjs/static/plotlyjs/src/lib/lib.js
@@ -1652,6 +1652,14 @@ lib.coerce = function(containerIn, containerOut, attributes, attribute, dflt) {
     return propOut.get();
 };
 
+// use coerce to get attibute value if user input is valid, return attribute default
+// if user input it not valid or retun false if there is no user input.  
+lib.coerce2 = function(containerIn, containerOut, attributes, attribute, dflt) {
+    var propIn = lib.nestedProperty(containerIn, attribute),
+        propOut = lib.coerce(containerIn, containerOut, attributes, attribute, dflt);
+    return propIn.get() ? propOut : false;
+};
+
 // shortcut to coerce the three font attributes
 // 'coerce' is a lib.coerce wrapper with implied first three arguments
 lib.coerceFont = function(coerce, attr, dfltObj) {
diff --git a/shelly/plotlyjs/static/plotlyjs/tests/lib_test.js b/shelly/plotlyjs/static/plotlyjs/tests/lib_test.js
@@ -494,6 +494,57 @@ describe('Test lib.js:', function() {
             });
         });
 
+    describe('coerce2', function() {
+        var coerce2 = Plotly.Lib.coerce2,
+            out;
+
+        it('should set a value and return the value it sets when user input is valid', function() {
+            var colVal = 'red',
+                sizeVal = 14,
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');               
+
+            expect(colOut).toBe(colVal);
+            expect(colOut).toBe(outObj.testMarker.testColor);
+            expect(sizeOut).toBe(sizeVal);
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+        });
+
+        it('should set and return the default if the user input is not valid', function() {
+            var colVal = 'r',
+                sizeVal = 'aaaaah!',
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');                
+
+            expect(colOut).toBe('rgba(0, 0, 0, 0)');
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+            expect(sizeOut).toBe(20);
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+        });
+
+        it('should return false if there is no user input', function() {
+            var colVal = null,
+                sizeVal = null, 
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');                 
+
+            expect(colOut).toBe(false);
+            expect(sizeOut).toBe(false);
+        });
+    });
+
         describe('info_array valType', function() {
             var infoArrayAttrs = {
                     range: {
