better fix for issue 2208 and prepration for issue-0179 and surfaces …

…with log axis
plotly · archmoj · Nov 30, 2018 · Nov 27, 2018 · Nov 27, 2018 · Nov 27, 2018
commit ac319ef533eb1d829048997fa8a363bfc8f3ed88
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -380,6 +380,11 @@ function computeTraceBounds(scene, trace, bounds) {
                 }
             }
         }
+
+        if(trace.type === 'surface') {
+            bounds[0][d] += trace._worldOffset[d];
+            bounds[1][d] += trace._worldOffset[d];
+        }
     }
 }
 

diff --git a/src/traces/surface/convert.js b/src/traces/surface/convert.js
@@ -65,21 +65,13 @@ proto.getZat = function(a, b, calendar, axis) {
     );
 
     return (calendar === undefined) ? v : axis.d2l(v, 0, calendar);
-    // return (calendar === undefined) ? null2undefined(v) : axis.d2l(v, 0, calendar);
 };
-/*
-function null2undefined(a) {
-    // Note: null * 1.0 = 0.0!
-    // Therefore we convert nul to undefined.
-    // where undefined * 1.0 = NaN
-    return (a === null) ? undefined : a;
-}
-*/
+
 proto.handlePick = function(selection) {
     if(selection.object === this.surface) {
 
-        var j = Math.min(Math.floor(selection.data.index[0] / this.dataScaleX - 1), this.data.z[0].length - 1);
-        var k = Math.min(Math.floor(selection.data.index[1] / this.dataScaleY - 1), this.data._ylength - 1);
+        var j = Math.max(Math.min(Math.floor(selection.data.index[0] / this.dataScaleX - 0.5), this.data._xlength - 1), 0);
+        var k = Math.max(Math.min(Math.floor(selection.data.index[1] / this.dataScaleY - 0.5), this.data._ylength - 1), 0);
 
         selection.index = [j, k];
 
@@ -352,7 +344,7 @@ proto.update = function(data) {
         alpha = data.opacity,
         colormap = parseColorScale(data.colorscale, alpha),
         scaleFactor = scene.dataScale,
-        xlen = data.z.length,
+        xlen = data._xlength,
         ylen = data._ylength,
         contourLevels = scene.contourLevels;
 
@@ -423,7 +415,7 @@ proto.update = function(data) {
     }
 
     for(i = 0; i < 3; i++) {
-        this.midValues[i] = 0.5 * (this.minValues[i] + this.maxValues[i]);
+        data._worldOffset = this.midValues[i] = 0.0; // 0.5 * (this.minValues[i] + this.maxValues[i]);
     }
 
     for(i = 0; i < 3; i++) {
@@ -550,7 +542,6 @@ proto.update = function(data) {
     }
 
     params.coords = coords;
-
     surface.update(params);
 
     surface.visible = data.visible;

diff --git a/src/traces/surface/defaults.js b/src/traces/surface/defaults.js
@@ -35,6 +35,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     traceOut._xlength = (Array.isArray(x) && Lib.isArrayOrTypedArray(x[0])) ? z.length : z[0].length;
     traceOut._ylength = z.length;
 
+    traceOut._worldOffset = [0, 0, 0];
+
     var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');
     handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);
-Original file line number
+Diff line change
@@ Expand Up / @@ -380,6 +380,11 @@ function computeTraceBounds(scene, trace, bounds) { @@
                     }
                 }
             }
+            if(trace.type === 'surface') {
+                bounds[0][d] += trace._worldOffset[d];
+                bounds[1][d] += trace._worldOffset[d];
+            }
         }
     }
@@ Expand Down @@