first cut streamtube hover

Author: etpinard

package-lock.json

@@ -83,7 +83,7 @@
     "gl-select-box": "^1.0.2",
     "gl-spikes2d": "^1.0.1",
     "gl-surface3d": "^1.3.4",
-    "gl-streamtube3d": "[email protected]:gl-vis/gl-streamtube3d#d004f17506ed7fafc30586836d1a76b55dea8e48",
+    "gl-streamtube3d": "[email protected]:gl-vis/gl-streamtube3d#0ce19fad7570e9d501d7dcc218f3101528dd3e64",
     "glslify": "^6.1.1",
     "has-hover": "^1.0.1",
     "has-passive-events": "^1.0.0",

package.json

@@ -88,7 +88,7 @@ function render(scene) {
 
         var tx;
 
-        if(trace.type === 'cone') {
+        if(trace.type === 'cone' || trace.type === 'streamtube') {
             var coneTx = [];
             if(isHoverinfoAll || hoverinfoParts.indexOf('u') !== -1) {
                 coneTx.push('u: ' + formatter('xaxis', selection.traceCoordinate[3]));

src/plots/gl3d/scene.js

@@ -89,11 +89,11 @@ var attrs = {
         description: ''
     },
 
+    // TODO maybe just remove completely?
     text: {
         valType: 'string',
         role: 'info',
         dflt: '',
-        arrayOk: true,
         editType: 'calc',
         description: [
             'Sets the text elements associated with the cones.',

src/traces/streamtube/attributes.js

@@ -15,6 +15,8 @@ var Lib = require('../../lib');
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var zip3 = require('../../lib/zip3');
 
+var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
+
 function Streamtube(scene, uid) {
     this.scene = scene;
     this.uid = uid;
@@ -25,28 +27,36 @@ function Streamtube(scene, uid) {
 var proto = Streamtube.prototype;
 
 proto.handlePick = function(selection) {
+    var sceneLayout = this.scene.fullSceneLayout;
+    var dataScale = this.scene.dataScale;
+
+    function fromDataScale(v, axisName) {
+        var ax = sceneLayout[axisName];
+        var scale = dataScale[axisName2scaleIndex[axisName]];
+        return ax.l2c(v) / scale;
+    }
+
     if(selection.object === this.mesh) {
-        var selectIndex = selection.index = selection.data.index;
+        var pos = selection.data.position;
+        var vel = selection.data.velocity;
+
+        var uu = fromDataScale(vel[0], 'xaxis');
+        var vv = fromDataScale(vel[1], 'yaxis');
+        var ww = fromDataScale(vel[2], 'zaxis')
 
         selection.traceCoordinate = [
-            this.data.x[selectIndex],
-            this.data.y[selectIndex],
-            this.data.z[selectIndex]
-        ];
+            fromDataScale(pos[0], 'xaxis'),
+            fromDataScale(pos[1], 'yaxis'),
+            fromDataScale(pos[2], 'zaxis'),
 
-        var text = this.data.text;
-        if(Array.isArray(text) && text[selectIndex] !== undefined) {
-            selection.textLabel = text[selectIndex];
-        } else if(text) {
-            selection.textLabel = text;
-        }
+            uu, vv, ww,
+            Math.sqrt(uu * uu + vv * vv + ww * ww)
+        ];
 
         return true;
     }
 };
 
-var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
-
 function distinctVals(col) {
     return Lib.distinctVals(col).vals;
 }