3D cone traces

src/plots/gl3d/scene.js

@@ -507,8 +507,7 @@ proto.plot = function(sceneData, fullLayout, layout) {
             for(j = 0; j < objects.length; j++) {
                 var obj = objects[j];
                 var objBounds = obj.bounds;
-                var fullTrace = obj._trace.data;
-                var pad = fullTrace._pad || 0;
+                var pad = obj._trace.data._pad || 0;
 
                 sceneBounds[0][i] = Math.min(sceneBounds[0][i], objBounds[0][i] / dataScale[i] - pad);
                 sceneBounds[1][i] = Math.max(sceneBounds[1][i], objBounds[1][i] / dataScale[i] + pad);

src/traces/cone/calc.js

@@ -33,12 +33,7 @@ module.exports = function calc(gd, trace) {
         compMax = Math.max(compMax, u2, v2, w2);
     }
 
-    // stash max norm value to convert cmix/cmax -> vertexIntensityBounds
     trace._normMax = normMax;
-    // stash autorange pad using max 'component' value
-    trace._pad = trace.sizemode === 'absolute' ?
-        trace.sizeref :
-        2 * (Math.sqrt(compMax) / (normMax || 1)) * trace.sizeref;
 
     colorscaleCalc(trace, [normMin, normMax], '', 'c');
 };

src/traces/cone/convert.js

@@ -63,6 +63,7 @@ function zip3(x, y, z) {
 var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
 var sizeMode2sizeKey = {scaled: 'coneSize', absolute: 'absoluteConeSize'};
 var anchor2coneOffset = {tip: 1, tail: 0, cm: 0.25, center: 0.5};
+var anchor2coneSpan = {tip: 1, tail: 1, cm: 0.75, center: 0.5};
 
 function convert(scene, trace) {
     var sceneLayout = scene.fullSceneLayout;
@@ -107,6 +108,9 @@ function convert(scene, trace) {
     meshData.fresnel = trace.lighting.fresnel;
     meshData.opacity = trace.opacity;
 
+    // stash autorange pad value
+    trace._pad = anchor2coneSpan[trace.anchor] * meshData.vectorScale * trace._normMax * trace.sizeref;
+
     return meshData;
 }
 

test/jasmine/tests/cone_test.js

@@ -74,9 +74,9 @@ describe('@gl Test cone autorange:', function() {
 
     function _assertAxisRanges(msg, xrng, yrng, zrng) {
         var sceneLayout = gd._fullLayout.scene;
-        expect(sceneLayout.xaxis.range).toBeCloseToArray(xrng, 2, 'xaxis range -' + msg);
-        expect(sceneLayout.yaxis.range).toBeCloseToArray(yrng, 2, 'yaxis range -' + msg);
-        expect(sceneLayout.zaxis.range).toBeCloseToArray(zrng, 2, 'zaxis range -' + msg);
+        expect(sceneLayout.xaxis.range).toBeCloseToArray(xrng, 2, 'xaxis range - ' + msg);
+        expect(sceneLayout.yaxis.range).toBeCloseToArray(yrng, 2, 'yaxis range - ' + msg);
+        expect(sceneLayout.zaxis.range).toBeCloseToArray(zrng, 2, 'zaxis range - ' + msg);
     }
 
     it('should add pad around cone position to make sure they fit on the scene', function(done) {
@@ -89,7 +89,7 @@ describe('@gl Test cone autorange:', function() {
 
         Plotly.plot(gd, fig).then(function() {
             _assertAxisRanges('base',
-                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+                [-0.66, 4.66], [-0.66, 4.66], [-0.66, 4.66]
             );
 
             var trace = fig.data[0];
@@ -102,7 +102,7 @@ describe('@gl Test cone autorange:', function() {
         })
         .then(function() {
             _assertAxisRanges('scaled up',
-                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+                [-0.66, 4.66], [-0.66, 4.66], [-0.66, 4.66]
             );
 
             var trace = fig.data[0];
@@ -115,7 +115,7 @@ describe('@gl Test cone autorange:', function() {
         })
         .then(function() {
             _assertAxisRanges('scaled down',
-                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+                [-0.66, 4.66], [-0.66, 4.66], [-0.66, 4.66]
             );
 
             var trace = fig.data[0];
@@ -140,21 +140,21 @@ describe('@gl Test cone autorange:', function() {
         })
         .then(function() {
             _assertAxisRanges('after adding one cone outside range but with norm-0',
-                [-0.45, 6.45], [-0.45, 6.45], [-0.45, 6.45]
+                [-0.72, 6.72], [-0.72, 6.72], [-0.72, 6.72]
             );
 
             return Plotly.restyle(gd, 'sizeref', 10);
         })
         .then(function() {
             _assertAxisRanges('after increasing sizeref',
-                [-12.4, 18.4], [-12.4, 18.4], [-12.4, 18.4]
+                [-15.06, 21.06], [-15.06, 21.06], [-15.06, 21.06]
             );
 
             return Plotly.restyle(gd, 'sizeref', 0.1);
         })
         .then(function() {
             _assertAxisRanges('after decreasing sizeref',
-                [0.74, 5.26], [0.74, 5.26], [0.74, 5.26]
+                [0.72, 5.28], [0.72, 5.28], [0.72, 5.28]
             );
 
             return Plotly.restyle(gd, {
@@ -164,7 +164,7 @@ describe('@gl Test cone autorange:', function() {
         })
         .then(function() {
             _assertAxisRanges('with sizemode absolute',
-                [-1.25, 7.25], [-1.25, 7.25], [-1.25, 7.25]
+                [-2.31, 8.31], [-2.31, 8.31], [-2.31, 8.31]
             );
         })
         .catch(failTest)