Merge pull request #2647 from plotly/single-cone

Fix single cone

Author: etpinard

package-lock.json

@@ -70,7 +70,7 @@
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.1",
     "font-atlas-sdf": "^1.3.3",
-    "gl-cone3d": "^v1.0.0",
+    "gl-cone3d": "^v1.0.1",
     "gl-contour2d": "^1.1.4",
     "gl-error3d": "^1.0.7",
     "gl-heatmap2d": "^1.0.4",

package.json

@@ -170,7 +170,7 @@ fromMesh3d.forEach(function(k) {
 attrs.hoverinfo = extendFlat({}, baseAttrs.hoverinfo, {
     editType: 'calc',
     flags: ['x', 'y', 'z', 'u', 'v', 'w', 'norm', 'text', 'name'],
-    dflt: 'x+y+z+norm+text'
+    dflt: 'x+y+z+norm+text+name'
 });
 
 module.exports = attrs;

src/traces/cone/attributes.js

@@ -17,20 +17,15 @@ module.exports = function calc(gd, trace) {
     var len = Math.min(u.length, v.length, w.length);
     var normMax = -Infinity;
     var normMin = Infinity;
-    var compMax = -Infinity;
 
     for(var i = 0; i < len; i++) {
         var uu = u[i];
-        var u2 = uu * uu;
         var vv = v[i];
-        var v2 = vv * vv;
         var ww = w[i];
-        var w2 = ww * ww;
-        var norm = Math.sqrt(u2 + v2 + w2);
+        var norm = Math.sqrt(uu * uu + vv * vv + ww * ww);
 
         normMax = Math.max(normMax, norm);
         normMin = Math.min(normMin, norm);
-        compMax = Math.max(compMax, u2, v2, w2);
     }
 
     trace._normMax = normMax;

src/traces/cone/calc.js

@@ -0,0 +1,16 @@
+{
+  "data": [
+    {
+      "type": "cone",
+      "x": [1], "y": [1], "z": [1],
+      "u": [1], "v": [1], "w": [0]
+    }
+  ],
+  "layout": {
+    "scene": {
+      "camera": {
+        "eye": {"x": -0.76, "y": 1.8, "z": 0.92}
+      }
+    }
+  }
+}

test/image/baselines/gl3d_cone-single.png

@@ -265,4 +265,46 @@ describe('@gl Test cone interactions', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should display hover labels (multi-trace case)', function(done) {
+        function _hover() {
+            mouseEvent('mouseover', 245, 230);
+            return delay(20)();
+        }
+
+        Plotly.plot(gd, [{
+            type: 'cone',
+            name: 'blue cone',
+            x: [1], y: [1], z: [1],
+            u: [1], v: [1], w: [0],
+            colorscale: 'Blues',
+            showscale: false
+        }, {
+            type: 'cone',
+            name: 'green cone',
+            x: [3], y: [3], z: [3],
+            u: [0], v: [0], w: [2],
+            colorscale: 'Greens',
+            showscale: false
+        }], {
+            scene: {
+                camera: {
+                    eye: {x: -0.76, y: 1.8, z: 0.92}
+                }
+            },
+            margin: {l: 0, t: 0, r: 0, b: 0},
+            width: 400,
+            height: 400
+        })
+        .then(delay(20))
+        .then(_hover)
+        .then(function() {
+            assertHoverLabelContent({
+                nums: ['x: 1', 'y: 1', 'z: 1', 'norm: 1.41'].join('\n'),
+                name: 'blue cone'
+            });
+        })
+        .catch(failTest)
+        .then(done);
+    });
 });