description edit - fixed hover - simplified again finding nearest on axis

Author: archmoj

src/traces/isosurface/convert.js

@@ -31,15 +31,13 @@ function IsosurfaceTrace(scene, mesh, uid) {
 
 var proto = IsosurfaceTrace.prototype;
 
-function findNearestOnAxis(w, arr, nPoints, nDim, step) {
-    var id = nDim;
-    for(var q = nPoints - 1; q > 0 && id > 0; q -= step) {
-        id--;
-        var min = Math.min(arr[q], arr[q - step]);
-        var max = Math.max(arr[q], arr[q - step]);
+function findNearestOnAxis(w, arr) {
+    for(var q = arr.length - 1; q > 0; q--) {
+        var min = Math.min(arr[q], arr[q - 1]);
+        var max = Math.max(arr[q], arr[q - 1]);
         if(max > min && min < w && w <= max) {
             return {
-                id: id,
+                id: q,
                 distRatio: (max - w) / (max - min)
             };
         }
@@ -59,14 +57,12 @@ proto.handlePick = function(selection) {
         var y = this.data.y[rawId];
         var z = this.data.z[rawId];
 
-        var width = this.data.width;
-        var height = this.data.height;
-        var depth = this.data.depth;
-        var nPoints = width * height * depth;
+        var height = this.data._Ys.length;
+        var depth = this.data._Zs.length;
 
-        var i = findNearestOnAxis(x, this.data.x, nPoints, width, 1 + depth * height).id;
-        var j = findNearestOnAxis(y, this.data.y, nPoints, height, 1 + depth).id;
-        var k = findNearestOnAxis(z, this.data.z, nPoints, depth, 1).id;
+        var i = findNearestOnAxis(x, this.data._Xs).id;
+        var j = findNearestOnAxis(y, this.data._Ys).id;
+        var k = findNearestOnAxis(z, this.data._Zs).id;
 
         var selectIndex = selection.index = k + depth * j + depth * height * i;
 
@@ -888,16 +884,11 @@ function generateIsosurfaceMesh(data) {
 
                         for(var q = 0; q < slice.locations.length; q++) {
 
-                            var location = slice.locations[q];
-
-                            var near;
-                            if(e === 'x') {
-                                near = findNearestOnAxis(location, data.x, width * height * depth, width, 1 + depth * height);
-                            } else if(e === 'y') {
-                                near = findNearestOnAxis(location, data.y, width * height * depth, height, 1 + depth);
-                            } else {
-                                near = findNearestOnAxis(location, data.z, width * height * depth, depth, 1);
-                            }
+                            var near = findNearestOnAxis(
+                                slice.locations[q],
+                                (e === 'x') ? Xs :
+                                (e === 'y') ? Ys : Zs
+                            );
 
                             if(near.distRatio === 0) {
                                 exactIndices.push(near.id);
@@ -967,6 +958,10 @@ function generateIsosurfaceMesh(data) {
         data.y = allYs;
         data.z = allZs;
         data.intensity = allVs;
+
+        data._Xs = Xs;
+        data._Ys = Ys;
+        data._Zs = Zs;
     }
 
     drawAll();

src/traces/isosurface/index.js

@@ -26,11 +26,10 @@ Isosurface.basePlotModule = require('../../plots/gl3d');
 Isosurface.categories = ['gl3d'];
 Isosurface.meta = {
     description: [
-        'Draws isosurfaces, with or without caps, slices and braces with coordinates given by',
-        'three 1-dimensional arrays in `x`, `y`, `z` defining axes',
-        'and another 1-dimensional array titled `value`.',
-        'The `value` array (data cube) should have a size equal to',
-        'the multiplication of lengths of `x`, `y`, and `z`.'
+        'Draws isosurfaces between iso-min and iso-max values with coordinates given by',
+        'four 1-dimensional arrays containing the `value`, `x`, `y` and `z` of every vertex',
+        'of a uniform or non-uniform 3-D grid. Horizontal or vertical slices, caps as well as',
+        'spaceframe between iso-min and iso-max values could also be drawn using this trace.'
     ].join(' ')
 };
 

test/jasmine/tests/isosurface_test.js

@@ -335,17 +335,17 @@ describe('Test isosurface', function() {
             }
 
             function _hover2() {
-                mouseEvent('mouseover', 150, 150);
+                mouseEvent('mouseover', 100, 100);
                 return delay(20)();
             }
 
             function _hover3() {
-                mouseEvent('mouseover', 300, 200);
+                mouseEvent('mouseover', 300, 150);
                 return delay(20)();
             }
 
             function _hover4() {
-                mouseEvent('mouseover', 200, 300);
+                mouseEvent('mouseover', 150, 300);
                 return delay(20)();
             }
 
@@ -356,9 +356,9 @@ describe('Test isosurface', function() {
                 assertHoverLabelContent({
                     nums: [
                         'x: 0.4',
-                        'y: 0.01',
+                        'y: 100μ',
                         'z: −8',
-                        'value: −0.31'
+                        'value: −1.31'
                     ].join('\n')
                 });
             })
@@ -367,10 +367,10 @@ describe('Test isosurface', function() {
             .then(function() {
                 assertHoverLabelContent({
                     nums: [
-                        'x: 0.4',
-                        'y: 0.01',
-                        'z: −8',
-                        'value: −0.31'
+                        'x: 0.3',
+                        'y: 0.001',
+                        'z: −16',
+                        'value: −0.27'
                     ].join('\n')
                 });
             })
@@ -380,9 +380,9 @@ describe('Test isosurface', function() {
                 assertHoverLabelContent({
                     nums: [
                         'x: 0.2',
-                        'y: 0.01',
-                        'z: −8',
-                        'value: −0.17'
+                        'y: 100μ',
+                        'z: −16',
+                        'value: −1.12'
                     ].join('\n')
                 });
             })
@@ -391,10 +391,10 @@ describe('Test isosurface', function() {
             .then(function() {
                 assertHoverLabelContent({
                     nums: [
-                        'x: 0.3',
-                        'y: 0.01',
-                        'z: −2',
-                        'value: −1.14'
+                        'x: 0.4',
+                        'y: 100μ',
+                        'z: −4',
+                        'value: −1.3'
                     ].join('\n')
                 });
             })