adapt gl2d to findExtremes

etpinard · etpinard · commit 82d4bcc4b6f7 · 2018-07-31T14:22:15.000-04:00
diff --git a/src/plots/cartesian/autorange.js b/src/plots/cartesian/autorange.js
@@ -196,14 +196,12 @@ function concatExtremes(gd, ax, ext) {
 
     var fullData = gd._fullData;
 
-    // should be general enough for 3d, polar etc.
-
     for(i = 0; i < fullData.length; i++) {
         var trace = fullData[i];
         var extremes = trace._extremes;
 
         if(trace.visible === true) {
-            if(Registry.traceIs(trace, 'cartesian')) {
+            if(Registry.traceIs(trace, 'cartesian') || Registry.traceIs(trace, 'gl2d')) {
                 var axId = ax._id;
                 if(extremes[axId]) {
                     out = out.concat(extremes[axId][ext]);
diff --git a/src/plots/gl2d/scene2d.js b/src/plots/gl2d/scene2d.js
@@ -441,7 +441,7 @@ proto.plot = function(fullData, calcData, fullLayout) {
         ax = this[AXES[i]];
         ax._length = options.viewBox[i + 2] - options.viewBox[i];
 
-        doAutoRange(ax);
+        doAutoRange(this.graphDiv, ax);
         ax.setScale();
     }
 
diff --git a/src/traces/contourgl/convert.js b/src/traces/contourgl/convert.js
@@ -125,9 +125,10 @@ proto.update = function(fullTrace, calcTrace) {
     this.contour.update(this.contourOptions);
     this.heatmap.update(this.heatmapOptions);
 
-    // expand axes
-    Axes.expand(this.scene.xaxis, calcPt.x);
-    Axes.expand(this.scene.yaxis, calcPt.y);
+    var xa = this.scene.xaxis;
+    var ya = this.scene.yaxis;
+    fullTrace._extremes[xa._id] = Axes.findExtremes(xa, calcPt.x);
+    fullTrace._extremes[ya._id] = Axes.findExtremes(ya, calcPt.y);
 };
 
 proto.dispose = function() {
diff --git a/src/traces/heatmapgl/convert.js b/src/traces/heatmapgl/convert.js
@@ -95,8 +95,10 @@ proto.update = function(fullTrace, calcTrace) {
 
     this.heatmap.update(this.options);
 
-    Axes.expand(this.scene.xaxis, calcPt.x);
-    Axes.expand(this.scene.yaxis, calcPt.y);
+    var xa = this.scene.xaxis;
+    var ya = this.scene.yaxis;
+    fullTrace._extremes[xa._id] = Axes.findExtremes(xa, calcPt.x);
+    fullTrace._extremes[ya._id] = Axes.findExtremes(ya, calcPt.y);
 };
 
 proto.dispose = function() {
diff --git a/src/traces/pointcloud/convert.js b/src/traces/pointcloud/convert.js
@@ -11,7 +11,7 @@
 var createPointCloudRenderer = require('gl-pointcloud2d');
 
 var str2RGBArray = require('../../lib/str2rgbarray');
-var expandAxis = require('../../plots/cartesian/autorange').expand;
+var findExtremes = require('../../plots/cartesian/autorange').findExtremes;
 var getTraceColor = require('../scatter/get_trace_color');
 
 function Pointcloud(scene, uid) {
@@ -195,14 +195,11 @@ proto.updateFast = function(options) {
     this.pointcloud.update(this.pointcloudOptions);
 
     // add item for autorange routine
-    this.expandAxesFast(bounds, markerSizeMax / 2); // avoid axis reexpand just because of the adaptive point size
-};
-
-proto.expandAxesFast = function(bounds, markerSize) {
-    var pad = markerSize || 0.5;
-
-    expandAxis(this.scene.xaxis, [bounds[0], bounds[2]], {ppad: pad});
-    expandAxis(this.scene.yaxis, [bounds[1], bounds[3]], {ppad: pad});
+    var xa = this.scene.xaxis;
+    var ya = this.scene.yaxis;
+    var pad = markerSizeMax / 2 || 0.5;
+    options._extremes[xa._id] = findExtremes(xa, [bounds[0], bounds[2]], {ppad: pad});
+    options._extremes[ya._id] = findExtremes(ya, [bounds[1], bounds[3]], {ppad: pad});
 };
 
 proto.dispose = function() {

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ proto.plot = function(fullData, calcData, fullLayout) {`
`441`	`441`	`ax = this[AXES[i]];`
`442`	`442`	`ax._length = options.viewBox[i + 2] - options.viewBox[i];`
`443`	`443`
`444`		`- doAutoRange(ax);`
	`444`	`+ doAutoRange(this.graphDiv, ax);`
`445`	`445`	`ax.setScale();`
`446`	`446`	`}`
`447`	`447`