isosurface trace [xyz](min|max) bounds

kig · kig · commit d417e6e43113 · 2018-08-12T15:26:24.000+08:00
diff --git a/src/traces/isosurface/attributes.js b/src/traces/isosurface/attributes.js
@@ -59,32 +59,56 @@ var attrs = {
         description: 'Sets the maximum iso bound of the isosurface.'
     },
 
-    smoothnormals: {
-        valType: 'boolean',
+    xmin: {
+        valType: 'number',
         editType: 'calc',
-        description: ''
+        description: 'Sets the minimum x bound of the isosurface.'
     },
 
-    singlemesh: {
-        valType: 'boolean',
+    xmax: {
+        valType: 'number',
         editType: 'calc',
-        description: ''
+        description: 'Sets the maximum x bound of the isosurface.'
     },
 
-    isocaps: {
+    ymin: {
+        valType: 'number',
+        editType: 'calc',
+        description: 'Sets the minimum y bound of the isosurface.'
+    },
+
+    ymax: {
+        valType: 'number',
+        editType: 'calc',
+        description: 'Sets the maximum y bound of the isosurface.'
+    },
+
+    zmin: {
+        valType: 'number',
+        editType: 'calc',
+        description: 'Sets the minimum z bound of the isosurface.'
+    },
+
+    zmax: {
+        valType: 'number',
+        editType: 'calc',
+        description: 'Sets the maximum z bound of the isosurface.'
+    },
+
+    smoothnormals: {
         valType: 'boolean',
         editType: 'calc',
         description: ''
     },
 
-    boundmin: {
-        valType: 'data_array',
+    singlemesh: {
+        valType: 'boolean',
         editType: 'calc',
         description: ''
     },
 
-    boundmax: {
-        valType: 'data_array',
+    isocaps: {
+        valType: 'boolean',
         editType: 'calc',
         description: ''
     },
diff --git a/src/traces/isosurface/convert.js b/src/traces/isosurface/convert.js
@@ -118,6 +118,32 @@ function getSequence(src) {
     return xs;
 }
 
+// This should find the bounding box min
+// edge index so that `value` lies at the edge or outside
+// the range starting from xs[edge index].
+// That is, xs[edge index] >= value.
+function findMinIndex(xs, value) {
+    for(var i = 0; i < xs.length; i++) {
+        if(xs[i] >= value) {
+            return i;
+        }
+    }
+    return xs.length;
+}
+
+// This should find the bounding box max
+// edge index so that `value` lies at the edge or outside
+// the range ending at xs[edge index].
+// That is, xs[edge index] <= value.
+function findMaxIndex(xs, value) {
+    for(var i = xs.length-1; i >= 0; i--) {
+        if(xs[i] <= value) {
+            return i;
+        }
+    }
+    return -1;
+}
+
 function convert(scene, trace) {
     var sceneLayout = scene.fullSceneLayout;
     var dataScale = scene.dataScale;
@@ -140,11 +166,6 @@ function convert(scene, trace) {
         toDataCoords(zs, 'zaxis')
     ];
 
-    // var bounds = [
-    //    isosurfaceOpts.boundmin || [xs[0], ys[0], zs[0]],
-    //    isosurfaceOpts.boundmax || [xs[xs.length - 1], ys[ys.length - 1], zs[zs.length - 1]]
-    // ];
-
 
     isosurfaceOpts.values = trace.value;
 
@@ -156,7 +177,26 @@ function convert(scene, trace) {
     isosurfaceOpts.isoCaps = trace.isocaps;
     isosurfaceOpts.singleMesh = trace.singlemesh === undefined ? true : trace.singlemesh;
 
-    var bounds = [[0, 0, 0], isosurfaceOpts.dimensions];
+    var bounds = [[0, 0, 0], isosurfaceOpts.dimensions.slice()];
+
+    if(trace.xmin !== undefined) {
+        bounds[0][0] = findMinIndex(xs, trace.xmin);
+    }
+    if(trace.ymin !== undefined) {
+        bounds[0][1] = findMinIndex(ys, trace.ymin);
+    }
+    if(trace.zmin !== undefined) {
+        bounds[0][2] = findMinIndex(zs, trace.zmin);
+    }
+    if(trace.xmax !== undefined) {
+        bounds[1][0] = findMaxIndex(xs, trace.xmax);
+    }
+    if(trace.ymax !== undefined) {
+        bounds[1][1] = findMaxIndex(ys, trace.ymax);
+    }
+    if(trace.zmax !== undefined) {
+        bounds[1][2] = findMaxIndex(zs, trace.zmax);
+    }
 
     var meshData = isosurfacePlot(isosurfaceOpts, bounds);
 
diff --git a/src/traces/isosurface/defaults.js b/src/traces/isosurface/defaults.js
@@ -39,6 +39,14 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('isocaps');
     // coerce('singlemesh');
 
+    coerce('xmin');
+    coerce('ymin');
+    coerce('zmin');
+
+    coerce('xmax');
+    coerce('ymax');
+    coerce('zmax');
+
     coerce('lighting.ambient');
     coerce('lighting.diffuse');
     coerce('lighting.specular');
