Skip to content

Commit 6764876

Browse files
committed
fixup changes to splom grid made in b4b60e4
- this fixed splom_large
1 parent c0880c3 commit 6764876

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/traces/splom/base_plot.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ function makeGridData(gd) {
9898
var k;
9999

100100
function push(prefix, ax, x0, x1, y0, y1) {
101+
x0 *= plotGlPixelRatio;
102+
x1 *= plotGlPixelRatio;
103+
y0 *= plotGlPixelRatio;
104+
y1 *= plotGlPixelRatio;
105+
101106
var lcolor = ax[prefix + 'color'];
102107
var lwidth = ax[prefix + 'width'];
103108
var key = String(lcolor + lwidth);
@@ -123,37 +128,35 @@ function makeGridData(gd) {
123128
var ya = sp.yaxis;
124129
var xVals = xa._gridVals;
125130
var yVals = ya._gridVals;
126-
var b = gs.b * plotGlPixelRatio;
127-
var h = gs.h * plotGlPixelRatio;
128-
var xoffset = xa._offset * plotGlPixelRatio;
129-
var xlength = xa._length * plotGlPixelRatio;
130-
var ylength = ya._length * plotGlPixelRatio;
131+
var xoffset = xa._offset;
132+
var xlength = xa._length;
133+
var ylength = ya._length;
131134

132135
// ya.l2p assumes top-to-bottom coordinate system (a la SVG),
133136
// we need to compute bottom-to-top offsets and slopes:
134-
var yOffset = b + ya.domain[0] * h;
137+
var yoffset = (gs.b + ya.domain[0] * gs.h);
135138
var ym = -ya._m;
136139
var yb = -ym * ya.r2l(ya.range[0], ya.calendar);
137140
var x, y;
138141

139142
if(xa.showgrid) {
140143
for(k = 0; k < xVals.length; k++) {
141-
x = xoffset + xa.l2p(xVals[k].x) * plotGlPixelRatio;
142-
push('grid', xa, x, yOffset, x, yOffset + ylength);
144+
x = xoffset + xa.l2p(xVals[k].x);
145+
push('grid', xa, x, yoffset, x, yoffset + ylength);
143146
}
144147
}
145148
if(ya.showgrid) {
146149
for(k = 0; k < yVals.length; k++) {
147-
y = yOffset + yb + ym * yVals[k].x * plotGlPixelRatio;
150+
y = yoffset + yb + ym * yVals[k].x;
148151
push('grid', ya, xoffset, y, xoffset + xlength, y);
149152
}
150153
}
151154
if(shouldShowZeroLine(gd, xa, ya)) {
152155
x = xoffset + xa.l2p(0);
153-
push('zeroline', xa, x, yOffset, x, yOffset + ylength);
156+
push('zeroline', xa, x, yoffset, x, yoffset + ylength);
154157
}
155158
if(shouldShowZeroLine(gd, ya, xa)) {
156-
y = yOffset + yb + 0;
159+
y = yoffset + yb + 0;
157160
push('zeroline', ya, xoffset, y, xoffset + xlength, y);
158161
}
159162
}

test/image/baselines/splom_large.png

12.2 KB
Loading

0 commit comments

Comments
 (0)