|
10 | 10 | var optsY = plot.getYAxes()[0].options;
|
11 | 11 | var optsX = plot.getXAxes()[0].options;
|
12 | 12 | var data = plot.getData();
|
13 |
| - var maxX = 0, maxY = 0; |
| 13 | + var maxX = 0, maxY = 0, minX = 0, minY = 0; |
14 | 14 |
|
15 | 15 | $.each(data, function (index, s) {
|
16 | 16 | var max = autoScale(plot, s, s.data, s.datapoints);
|
17 | 17 | maxX = Math.max(maxX, max['maxX']);
|
18 | 18 | maxY = Math.max(maxY, max['maxY']);
|
| 19 | + minX = Math.max(minX, min['minX']); |
| 20 | + minY = Math.max(minY, min['minY']); |
19 | 21 | });
|
20 | 22 |
|
21 |
| - optsX.min = 0; |
| 23 | + optsX.min = minX; |
22 | 24 | optsX.max = maxX;
|
23 |
| - optsY.min = 0; |
| 25 | + optsY.min = minY; |
24 | 26 | optsY.max = maxY;
|
25 | 27 |
|
26 | 28 | plot.setupGrid();
|
27 | 29 | plot.draw();
|
28 | 30 |
|
29 | 31 | return {
|
30 |
| - min: optsY.min, |
31 |
| - max: optsY.max |
| 32 | + minY: optsY.min, |
| 33 | + maxY: optsY.max, |
| 34 | + minX: optsX.min, |
| 35 | + maxX: optsX.max, |
32 | 36 | };
|
33 | 37 | }
|
34 | 38 |
|
|
39 | 43 | if (series.lines.show || series.points.show || series.bars.show) {
|
40 | 44 | var maxX = Number.NEGATIVE_INFINITY;
|
41 | 45 | var maxY = Number.NEGATIVE_INFINITY;
|
| 46 | + var minX = Number.POSITIVE_INFINITY; |
| 47 | + var minY = Number.POSITIVE_INFINITY; |
42 | 48 |
|
43 | 49 | for (var i = 0; i < data.length; i++) {
|
44 | 50 | maxX = Math.max(maxX, data[i][0]);
|
45 | 51 | maxY = Math.max(maxY, data[i][1]);
|
| 52 | + minX = Math.min(minX, data[i][0]); |
| 53 | + minY = Math.min(minY, data[i][1]); |
46 | 54 | }
|
47 | 55 |
|
48 | 56 | maxX += 2;
|
49 | 57 | maxY += maxY * options.yaxis.autoscaleMargin * 10;
|
| 58 | + |
| 59 | + minY -= 2; |
| 60 | + minY -= minY * options.yaxis.autoscaleMargin * 10; |
50 | 61 | return {
|
| 62 | + minX: minX, |
| 63 | + minY: minY, |
51 | 64 | maxX: maxX,
|
52 | 65 | maxY: maxY
|
53 | 66 | };
|
54 | 67 | } else {
|
55 | 68 | return {
|
| 69 | + minX: 0, |
| 70 | + minY: 0, |
56 | 71 | maxX: 0,
|
57 | 72 | maxY: 0
|
58 | 73 | };
|
|
0 commit comments