make contour and heatmap have distinct defaults step:

- split up xyz heatmap defaults logic to be reused by contour defaults - split up contour style defaults logic to be resued by histogram2d and histogram2dcontour
plotly · etpinard · Dec 17, 2015 · Dec 15, 2015 · Dec 16, 2015 · Dec 16, 2015
commit 03b1557a6d273bf2f6226220fb1038c69d9521d7
diff --git a/src/traces/contour/defaults.js b/src/traces/contour/defaults.js
@@ -10,8 +10,10 @@
 'use strict';

 var Lib = require('../../lib');
-var heatmapSupplyDefaults = require('../heatmap/defaults');

+var hasColumns = require('../heatmap/has_columns');
+var handleXYZDefaults = require('../heatmap/xyz_defaults');
+var handleStyleDefaults = require('../contour/style_defaults');
 var attributes = require('./attributes');


@@ -20,24 +22,21 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
        return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
    }

+    var len = handleXYZDefaults(traceIn, traceOut, coerce);
+    if(!len) {
+        traceOut.visible = false;
+        return;
+    }
+
+    coerce('text');
+    coerce('connectgaps', hasColumns(traceOut));
+
    var contourStart = Lib.coerce2(traceIn, traceOut, attributes, 'contours.start'),
        contourEnd = Lib.coerce2(traceIn, traceOut, attributes, 'contours.end'),
        autocontour = coerce('autocontour', !(contourStart && contourEnd));

    if(autocontour) coerce('ncontours');
    else coerce('contours.size');

-    var coloring = coerce('contours.coloring');
-
-    if(coloring === 'fill') coerce('contours.showlines');
-
-    if(traceOut.contours.showlines!==false) {
-        if(coloring !== 'lines') coerce('line.color', '#000');
-        coerce('line.width', 0.5);
-        coerce('line.dash');
-    }
-
-    coerce('line.smoothing');
-
-    heatmapSupplyDefaults(traceIn, traceOut, defaultColor, layout);
+    handleStyleDefaults(traceIn, traceOut, coerce, layout);
 };
diff --git a/src/traces/contour/style_defaults.js b/src/traces/contour/style_defaults.js
@@ -0,0 +1,34 @@
+/**
+* Copyright 2012-2015, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var Colorscale = require('../../components/colorscale');
+
+
+module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout) {
+    var coloring = coerce('contours.coloring');
+
+    var showLines;
+    if(coloring === 'fill') showLines = coerce('contours.showlines');
+
+    if(showLines !== false) {
+        if(coloring !== 'lines') coerce('line.color', '#000');
+        coerce('line.width', 0.5);
+        coerce('line.dash');
+    }
+
+    coerce('line.smoothing');
+
+    if((traceOut.contours || {}).coloring !== 'none') {
+        Colorscale.handleDefaults(
+            traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}
+        );
+    }
+};
diff --git a/src/traces/heatmap/xyz_defaults.js b/src/traces/heatmap/xyz_defaults.js
@@ -0,0 +1,87 @@
+/**
+* Copyright 2012-2015, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var isNumeric = require('fast-isnumeric');
+
+var hasColumns = require('./has_columns');
+
+
+module.exports = function handleXYZDefaults(traceIn, traceOut, coerce) {
+    var z = coerce('z');
+    var x, y;
+
+    if(z===undefined || !z.length) return 0;
+
+    if(hasColumns(traceIn)) {
+        x = coerce('x');
+        y = coerce('y');
+
+        // column z must be accompanied by 'x' and 'y' arrays
+        if(!x || !y) return 0;
+    }
+    else {
+        x = coordDefaults('x', coerce);
+        y = coordDefaults('y', coerce);
+
+        // TODO put z validation elsewhere
+        if(!isValidZ(z)) return 0;
+
+        coerce('transpose');
+    }
+
+    return traceOut.z.length;
+};
+
+function coordDefaults(coordStr, coerce) {
+    var coord = coerce(coordStr),
+        coordType = coord ?
+            coerce(coordStr + 'type', 'array') :
+            'scaled';
+
+    if(coordType === 'scaled') {
+        coerce(coordStr + '0');
+        coerce('d' + coordStr);
+    }
+
+    return coord;
+}
+
+function isValidZ(z) {
+    var allRowsAreArrays = true,
+        oneRowIsFilled = false,
+        hasOneNumber = false,
+        zi;
+
+    /*
+     * Without this step:
+     *
+     * hasOneNumber = false breaks contour but not heatmap
+     * allRowsAreArrays = false breaks contour but not heatmap
+     * oneRowIsFilled = false breaks both
+     */
+
+    for(var i = 0; i < z.length; i++) {
+        zi = z[i];
+        if(!Array.isArray(zi)) {
+            allRowsAreArrays = false;
+            break;
+        }
+        if(zi.length > 0) oneRowIsFilled = true;
+        for(var j = 0; j < zi.length; j++) {
+            if(isNumeric(zi[j])) {
+                hasOneNumber = true;
+                break;
+            }
+        }
+    }
+
+    return (allRowsAreArrays && oneRowIsFilled && hasOneNumber);
+}