applied distinctVals

Author: archmoj

src/traces/isosurface/attributes.js

@@ -84,28 +84,6 @@ function makeCapAttr(axLetter) {
 }
 
 var attrs = module.exports = overrideAll(extendFlat({
-
-    width: {
-        valType: 'integer',
-        role: 'info',
-        description: [
-            'Sets the number of points on X axis.'
-        ].join(' ')
-    },
-    height: {
-        valType: 'integer',
-        role: 'info',
-        description: [
-            'Sets the number of points on Y axis.'
-        ].join(' ')
-    },
-    depth: {
-        valType: 'integer',
-        role: 'info',
-        description: [
-            'Sets the number of points on Z axis.'
-        ].join(' ')
-    },
     x: {
         valType: 'data_array',
         role: 'info',

src/traces/isosurface/calc.js

@@ -12,6 +12,8 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 
 module.exports = function calc(gd, trace) {
 
+    trace._len = Math.min(trace.x.length, trace.y.length, trace.z.length, trace.value.length);
+
     var min = Infinity;
     var max = -Infinity;
     var len = trace.value.length;

src/traces/isosurface/convert.js

@@ -14,6 +14,11 @@ var createMesh = require('gl-mesh3d');
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
 var zip3 = require('../../plots/gl3d/zip3');
+var Lib = require('../../lib');
+
+function distinctVals(col) {
+    return Lib.distinctVals(col).vals;
+}
 
 function IsosurfaceTrace(scene, mesh, uid) {
     this.scene = scene;
@@ -154,9 +159,13 @@ function generateIsosurfaceMesh(data) {
     var numVertices;
     var beginVertextLength;
 
-    var width = data.width;
-    var height = data.height;
-    var depth = data.depth;
+    var Xs = distinctVals(data.x.slice(0, data._len));
+    var Ys = distinctVals(data.y.slice(0, data._len));
+    var Zs = distinctVals(data.z.slice(0, data._len));
+
+    var width = Xs.length;
+    var height = Ys.length;
+    var depth = Zs.length;
 
     function getIndex(i, j, k) {
         return k + depth * j + depth * height * i;

src/traces/isosurface/defaults.js

@@ -30,21 +30,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         traceOut.isomax = null;
     }
 
-    var width = coerce('width');
-    var height = coerce('height');
-    var depth = coerce('depth');
-    var numVertices = width * height * depth;
-
     var x = coerce('x');
     var y = coerce('y');
     var z = coerce('z');
     var value = coerce('value');
 
     if(
-        !x || !x.length || x.length !== numVertices ||
-        !y || !y.length || y.length !== numVertices ||
-        !z || !z.length || z.length !== numVertices ||
-        !value || !value.length || value.length !== numVertices
+        !x || !x.length ||
+        !y || !y.length ||
+        !z || !z.length ||
+        !value || !value.length
     ) {
         traceOut.visible = false;
         return;

test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png

@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 25,
-        "height": 25,
-        "depth": 25,
         "isomin": 250,
         "isomax": 1250,
         "value": [

test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png

@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 25,
-        "height": 25,
-        "depth": 25,
         "isomin": 250,
         "isomax": 1250,
         "value": [