applied distinctVals

archmoj · archmoj · commit bc8334b93034 · 2019-01-21T17:13:27.000-05:00
diff --git a/src/traces/isosurface/attributes.js b/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',
diff --git a/src/traces/isosurface/calc.js b/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;
diff --git a/src/traces/isosurface/convert.js b/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;
diff --git a/src/traces/isosurface/defaults.js b/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;
diff --git a/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png b/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png
diff --git a/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png b/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png
diff --git a/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png b/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png
diff --git a/test/image/baselines/gl3d_isosurface_math.png b/test/image/baselines/gl3d_isosurface_math.png
diff --git a/test/image/mocks/gl3d_isosurface_1single-surface_middle-range.json b/test/image/mocks/gl3d_isosurface_1single-surface_middle-range.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 25,
-        "height": 25,
-        "depth": 25,
         "isomin": 250,
         "isomax": 1250,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_2surfaces-checker_spaceframe.json b/test/image/mocks/gl3d_isosurface_2surfaces-checker_spaceframe.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 25,
-        "height": 25,
-        "depth": 25,
         "isomin": 250,
         "isomax": 1250,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_5more-surfaces_between-ranges.json b/test/image/mocks/gl3d_isosurface_5more-surfaces_between-ranges.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 25,
-        "height": 25,
-        "depth": 25,
         "isomin": 250,
         "isomax": 1250,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_log-axis_slices_surface-fill.json b/test/image/mocks/gl3d_isosurface_log-axis_slices_surface-fill.json
@@ -19,9 +19,6 @@
             "show": true,
             "width": 4
         },
-        "width": 21,
-        "height": 21,
-        "depth": 21,
         "isomin": 200,
         "isomax": 500,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_math.json b/test/image/mocks/gl3d_isosurface_math.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 41,
-        "height": 41,
-        "depth": 41,
         "isomin": 4.0,
         "isomax": 40.0,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_multiple-traces.json b/test/image/mocks/gl3d_isosurface_multiple-traces.json
@@ -20,9 +20,6 @@
                 "show": false,
                 "width": 4
             },
-            "width": 9,
-            "height": 9,
-            "depth": 9,
             "isomin": 150,
             "isomax": 250,
             "value": [
@@ -413,9 +410,6 @@
                 "show": false,
                 "width": 4
             },
-            "width": 9,
-            "height": 9,
-            "depth": 9,
             "isomin": 150,
             "isomax": 250,
             "value": [
diff --git a/test/image/mocks/gl3d_isosurface_out_of_iso_range_case.json b/test/image/mocks/gl3d_isosurface_out_of_iso_range_case.json
@@ -19,9 +19,6 @@
             "show": true,
             "width": 4
         },
-        "width": 8,
-        "height": 6,
-        "depth": 4,
         "isomin": -1010,
         "isomax": 1010,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_thin_caps_different_dims.json b/test/image/mocks/gl3d_isosurface_thin_caps_different_dims.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 41,
-        "height": 21,
-        "depth": 11,
         "isomin": 220,
         "isomax": 240,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_uneven-scales_ranges_iso-null.json b/test/image/mocks/gl3d_isosurface_uneven-scales_ranges_iso-null.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 21,
-        "height": 21,
-        "depth": 21,
         "isomin": -200,
         "isomax": null,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_with_surface-pattern.json b/test/image/mocks/gl3d_isosurface_with_surface-pattern.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 21,
-        "height": 21,
-        "depth": 21,
         "isomin": 1000,
         "isomax": 1500,
         "value": [
diff --git a/test/image/mocks/gl3d_isosurface_xycaps_volume_slices.json b/test/image/mocks/gl3d_isosurface_xycaps_volume_slices.json
@@ -19,9 +19,6 @@
             "show": false,
             "width": 4
         },
-        "width": 26,
-        "height": 26,
-        "depth": 26,
         "isomin": 200,
         "isomax": 800,
         "value": [
diff --git a/test/jasmine/tests/isosurface_test.js b/test/jasmine/tests/isosurface_test.js
@@ -14,9 +14,6 @@ function createIsosurfaceFig() {
     return {
         data: [{
             type: 'isosurface',
-            width: 4,
-            height: 4,
-            depth: 4,
             x: [
                 0.1, 0.1, 0.1, 0.1,
                 0.1, 0.1, 0.1, 0.1,
