revised isosurface default function exports

Author: archmoj

src/traces/isosurface/defaults.js

@@ -9,13 +9,107 @@
 'use strict';
 
 var Lib = require('../../lib');
+var Registry = require('../../registry');
 var attributes = require('./attributes');
-var supplyIsoDefaults = require('./iso_defaults');
+var colorscaleDefaults = require('../../components/colorscale/defaults');
 
-module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
+function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     function coerce(attr, dflt) {
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
     supplyIsoDefaults(traceIn, traceOut, defaultColor, layout, coerce);
+}
+
+function supplyIsoDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
+    var isomin = coerce('isomin');
+    var isomax = coerce('isomax');
+
+    if(isomax !== undefined && isomax !== null &&
+        isomin !== undefined && isomin !== null &&
+         isomin > isomax) {
+        // applying default values in this case:
+        traceOut.isomin = null;
+        traceOut.isomax = null;
+    }
+
+    var x = coerce('x');
+    var y = coerce('y');
+    var z = coerce('z');
+    var value = coerce('value');
+
+    if(
+        !x || !x.length ||
+        !y || !y.length ||
+        !z || !z.length ||
+        !value || !value.length
+    ) {
+        traceOut.visible = false;
+        return;
+    }
+
+    var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');
+    handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);
+
+    ['x', 'y', 'z'].forEach(function(dim) {
+        var capDim = 'caps.' + dim;
+        var showCap = coerce(capDim + '.show');
+        if(showCap) {
+            coerce(capDim + '.fill');
+        }
+
+        var sliceDim = 'slices.' + dim;
+        var showSlice = coerce(sliceDim + '.show');
+        if(showSlice) {
+            coerce(sliceDim + '.fill');
+            coerce(sliceDim + '.locations');
+        }
+    });
+
+    var showSpaceframe = coerce('spaceframe.show');
+    if(showSpaceframe) {
+        coerce('spaceframe.fill');
+    }
+
+    var showSurface = coerce('surface.show');
+    if(showSurface) {
+        coerce('surface.count');
+        coerce('surface.fill');
+        coerce('surface.pattern');
+    }
+
+    var showContour = coerce('contour.show');
+    if(showContour) {
+        coerce('contour.color');
+        coerce('contour.width');
+    }
+
+    // Coerce remaining properties
+    [
+        'text',
+        'hovertext',
+        'hovertemplate',
+        'lighting.ambient',
+        'lighting.diffuse',
+        'lighting.specular',
+        'lighting.roughness',
+        'lighting.fresnel',
+        'lighting.vertexnormalsepsilon',
+        'lighting.facenormalsepsilon',
+        'lightposition.x',
+        'lightposition.y',
+        'lightposition.z',
+        'flatshading',
+        'opacity'
+    ].forEach(function(x) { coerce(x); });
+
+    colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'c'});
+
+    // disable 1D transforms (for now)
+    traceOut._length = null;
+}
+
+module.exports = {
+    supplyDefaults: supplyDefaults,
+    supplyIsoDefaults: supplyIsoDefaults
 };

src/traces/isosurface/index.js

@@ -12,7 +12,7 @@
 var Isosurface = {};
 
 Isosurface.attributes = require('./attributes');
-Isosurface.supplyDefaults = require('./defaults');
+Isosurface.supplyDefaults = require('./defaults').supplyDefaults;
 Isosurface.calc = require('./calc');
 Isosurface.colorbar = {
     min: 'cmin',

src/traces/isosurface/iso_defaults.js

@@ -10,7 +10,8 @@
 
 var createScatter = require('regl-scatter2d');
 var createLine = require('regl-line2d');
-var createError = require('regl-error2d');
+var createErrorX = require('regl-error2d');
+var createErrorY = require('regl-error2d');
 var cluster = require('point-cluster');
 var arrayRange = require('array-range');
 var Text = require('gl-text');
@@ -107,7 +108,8 @@ function calc(gd, trace) {
     if(opts.fill && !scene.fill2d) scene.fill2d = true;
     if(opts.marker && !scene.scatter2d) scene.scatter2d = true;
     if(opts.line && !scene.line2d) scene.line2d = true;
-    if((opts.errorX || opts.errorY) && !scene.error2d) scene.error2d = true;
+    if(opts.errorX && !scene.errorX2d) scene.errorX2d = true;
+    if(opts.errorY && !scene.errorY2d) scene.errorY2d = true;
     if(opts.text && !scene.glText) scene.glText = true;
 
     // FIXME: organize it in a more appropriate manner, probably in sceneOptions
@@ -161,12 +163,15 @@ function sceneOptions(gd, subplot, trace, positions, x, y) {
         );
     }
 
-    if(opts.errorX || opts.errorY) {
-        var errors = convert.errorBarPositions(gd, trace, positions, x, y);
-
+    var errors;
+    if(opts.errorX) {
+        errors = convert.errorBarPositions(gd, trace, positions, x, y);
         if(opts.errorX) {
             Lib.extendFlat(opts.errorX, errors.x);
         }
+    }
+    if(opts.errorY) {
+        errors = convert.errorBarPositions(gd, trace, positions, x, y);
         if(opts.errorY) {
             Lib.extendFlat(opts.errorY, errors.y);
         }
@@ -222,7 +227,8 @@ function sceneUpdate(gd, subplot) {
         // regl- component stubs, initialized in dirty plot call
         fill2d: false,
         scatter2d: false,
-        error2d: false,
+        errorX2d: false,
+        errorY2d: false,
         line2d: false,
         glText: false,
         select2d: null
@@ -244,7 +250,8 @@ function sceneUpdate(gd, subplot) {
             if(scene.fill2d) scene.fill2d.update(opts);
             if(scene.scatter2d) scene.scatter2d.update(opts);
             if(scene.line2d) scene.line2d.update(opts);
-            if(scene.error2d) scene.error2d.update(opts.concat(opts));
+            if(scene.errorX2d) scene.errorX2d.update(opts);
+            if(scene.errorY2d) scene.errorY2d.update(opts);
             if(scene.select2d) scene.select2d.update(opts);
             if(scene.glText) {
                 for(var i = 0; i < scene.count; i++) {
@@ -257,7 +264,8 @@ function sceneUpdate(gd, subplot) {
         scene.draw = function draw() {
             var count = scene.count;
             var fill2d = scene.fill2d;
-            var error2d = scene.error2d;
+            var errorX2d = scene.errorX2d;
+            var errorY2d = scene.errorY2d;
             var line2d = scene.line2d;
             var scatter2d = scene.scatter2d;
             var glText = scene.glText;
@@ -272,9 +280,11 @@ function sceneUpdate(gd, subplot) {
                 if(line2d && scene.lineOptions[i]) {
                     line2d.draw(i);
                 }
-                if(error2d) {
-                    if(scene.errorXOptions[i]) error2d.draw(i);
-                    if(scene.errorYOptions[i]) error2d.draw(i + count);
+                if(errorX2d && scene.errorXOptions[i]) {
+                    errorX2d.draw(i);
+                }
+                if(errorY2d && scene.errorYOptions[i]) {
+                    errorY2d.draw(i);
                 }
                 if(scatter2d && scene.markerOptions[i] && (!selectBatch || !selectBatch[i])) {
                     scatter2d.draw(i);
@@ -296,7 +306,8 @@ function sceneUpdate(gd, subplot) {
         scene.destroy = function destroy() {
             if(scene.fill2d && scene.fill2d.destroy) scene.fill2d.destroy();
             if(scene.scatter2d && scene.scatter2d.destroy) scene.scatter2d.destroy();
-            if(scene.error2d && scene.error2d.destroy) scene.error2d.destroy();
+            if(scene.errorX2d && scene.errorX2d.destroy) scene.errorX2d.destroy();
+            if(scene.errorY2d && scene.errorY2d.destroy) scene.errorY2d.destroy();
             if(scene.line2d && scene.line2d.destroy) scene.line2d.destroy();
             if(scene.select2d && scene.select2d.destroy) scene.select2d.destroy();
             if(scene.glText) {
@@ -370,8 +381,11 @@ function plot(gd, subplot, cdata) {
 
     if(scene.dirty) {
         // make sure scenes are created
-        if(scene.error2d === true) {
-            scene.error2d = createError(regl);
+        if(scene.errorX2d === true) {
+            scene.errorX2d = createErrorX(regl);
+        }
+        if(scene.errorY2d === true) {
+            scene.errorY2d = createErrorY(regl);
         }
         if(scene.line2d === true) {
             scene.line2d = createLine(regl);
@@ -428,9 +442,11 @@ function plot(gd, subplot, cdata) {
             });
             scene.line2d.update(scene.lineOptions);
         }
-        if(scene.error2d) {
-            var errorBatch = (scene.errorXOptions || []).concat(scene.errorYOptions || []);
-            scene.error2d.update(errorBatch);
+        if(scene.errorX2d) {
+            scene.errorX2d.update(scene.errorXOptions);
+        }
+        if(scene.errorY2d) {
+            scene.errorY2d.update(scene.errorYOptions);
         }
         if(scene.scatter2d) {
             scene.scatter2d.update(scene.markerOptions);
@@ -669,8 +685,11 @@ function plot(gd, subplot, cdata) {
     if(scene.line2d) {
         scene.line2d.update(vpRange);
     }
-    if(scene.error2d) {
-        scene.error2d.update(vpRange.concat(vpRange));
+    if(scene.errorX2d) {
+        scene.errorX2d.update(vpRange);
+    }
+    if(scene.errorY2d) {
+        scene.errorY2d.update(vpRange);
     }
     if(scene.scatter2d) {
         scene.scatter2d.update(vpRange);

src/traces/scattergl/index.js

@@ -10,7 +10,7 @@
 
 var Lib = require('../../lib');
 var attributes = require('./attributes');
-var supplyIsoDefaults = require('../isosurface/iso_defaults');
+var supplyIsoDefaults = require('../isosurface/defaults').supplyIsoDefaults;
 
 var MIN = 0.1; // Note: often we don't want the data cube to be disappeared