Skip to content

Commit 84b0dd1

Browse files
archmojarchmoj
committed
flip processing aspectratio
1 parent c42a899 commit 84b0dd1

8 files changed

+39
-39
lines changed

Diff for: ‎src/traces/funnelarea/plot.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,12 @@ function setCoords(cd) {
245245

246246
var rY = (maxY - minY) / 2;
247247
var scaleX = r / lastX;
248-
var scaleY = r / rY / aspectratio;
248+
var scaleY = r / rY * aspectratio;
249249

250250
if(!trace.scalegroup) {
251-
if(aspectratio < cd0.figMaxH / cd0.figMaxW) {
252-
scaleX *= aspectratio;
253-
scaleY *= aspectratio;
251+
if(aspectratio > cd0.figMaxH / cd0.figMaxW) {
252+
scaleX /= aspectratio;
253+
scaleY /= aspectratio;
254254
}
255255
}
256256

Diff for: ‎src/traces/pie/plot.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ function positionTitleOutside(cd0, plotSize) {
671671
}
672672

673673
function applyAspectRatio(x, aspectratio) {
674-
return x * ((aspectratio === undefined) ? 1 : aspectratio);
674+
return x / ((aspectratio === undefined) ? 1 : aspectratio);
675675
}
676676

677677
function getTitleSpace(cd0, plotSize) {
@@ -852,12 +852,12 @@ function groupScale(cdModule, scaleGroups) {
852852
area = cd0.r * cd0.r;
853853
} else if(trace.type === 'funnelarea') {
854854
var rx, ry;
855-
if(trace.aspectratio < 1) {
855+
if(trace.aspectratio > 1) {
856856
rx = cd0.r;
857-
ry = rx * trace.aspectratio;
857+
ry = rx / trace.aspectratio;
858858
} else {
859859
ry = cd0.r;
860-
rx = ry / trace.aspectratio;
860+
rx = ry * trace.aspectratio;
861861
}
862862
rx *= (1 + trace.baseratio) / 2;
863863

@@ -875,7 +875,7 @@ function groupScale(cdModule, scaleGroups) {
875875
var v = min * cd0.vTotal;
876876
if(trace.type === 'funnelarea') {
877877
v /= (1 + trace.baseratio) / 2;
878-
v *= trace.aspectratio;
878+
v /= trace.aspectratio;
879879
}
880880

881881
cd0.r = Math.sqrt(v);

Diff for: ‎test/image/baselines/funnelarea_no_scalegroup_various_ratios_and_domain.png

378 Bytes
Loading

Diff for: ‎test/image/mocks/funnelarea_aspect_base_ratios.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"data": [
33
{
4-
"aspectratio": 2,
4+
"aspectratio": 0.5,
55
"baseratio": 0.5,
66
"title": { "text": "apsect: 2, base: 0.5" },
77
"type": "funnelarea",
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
{
17-
"aspectratio": 2,
17+
"aspectratio": 0.5,
1818
"baseratio": 0,
1919
"title": { "text": "apsect: 2, base: 0" },
2020
"type": "funnelarea",
@@ -40,7 +40,7 @@
4040
}
4141
},
4242
{
43-
"aspectratio": 0.5,
43+
"aspectratio": 2,
4444
"baseratio": 1,
4545
"title": { "text": "apsect: 0.5, base: 1" },
4646
"type": "funnelarea",
@@ -53,7 +53,7 @@
5353
}
5454
},
5555
{
56-
"aspectratio": 0.5,
56+
"aspectratio": 2,
5757
"baseratio": 0.5,
5858
"title": { "text": "apsect: 0.5, base: 0.5" },
5959
"type": "funnelarea",
@@ -66,7 +66,7 @@
6666
}
6767
},
6868
{
69-
"aspectratio": 0.5,
69+
"aspectratio": 2,
7070
"baseratio": 0,
7171
"title": { "text": "apsect: 0.5, base: 0" },
7272
"type": "funnelarea",
@@ -92,7 +92,7 @@
9292
}
9393
},
9494
{
95-
"aspectratio": 2,
95+
"aspectratio": 0.5,
9696
"baseratio": 1,
9797
"title": { "text": "apsect: 2, base: 1" },
9898
"type": "funnelarea",

Diff for: ‎test/image/mocks/funnelarea_no_scalegroup_various_ratios.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"data": [
33
{
44
"baseratio": 0,
5-
"aspectratio": 0.5,
5+
"aspectratio": 2,
66
"type": "funnelarea",
77
"values": [6, 5, 4, 3, 2, 1],
88
"textinfo": "value",
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"baseratio": 0.5,
20-
"aspectratio": 0.5,
20+
"aspectratio": 2,
2121
"type": "funnelarea",
2222
"values": [16, 15, 14, 13, 12, 11],
2323
"textinfo": "value",
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"baseratio": 1,
35-
"aspectratio": 0.5,
35+
"aspectratio": 2,
3636
"type": "funnelarea",
3737
"values": [60, 50, 40, 30, 20, 10],
3838
"textinfo": "value",
@@ -92,7 +92,7 @@
9292
},
9393
{
9494
"baseratio": 0,
95-
"aspectratio": 2,
95+
"aspectratio": 0.5,
9696
"type": "funnelarea",
9797
"values": [6, 5, 4, 3, 2, 1],
9898
"textinfo": "value",
@@ -107,7 +107,7 @@
107107
},
108108
{
109109
"baseratio": 0.5,
110-
"aspectratio": 2,
110+
"aspectratio": 0.5,
111111
"type": "funnelarea",
112112
"values": [16, 15, 14, 13, 12, 11],
113113
"textinfo": "value",
@@ -122,7 +122,7 @@
122122
},
123123
{
124124
"baseratio": 1,
125-
"aspectratio": 2,
125+
"aspectratio": 0.5,
126126
"type": "funnelarea",
127127
"values": [60, 50, 40, 30, 20, 10],
128128
"textinfo": "value",

Diff for: ‎test/image/mocks/funnelarea_no_scalegroup_various_ratios_and_domain.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"data": [
33
{
44
"baseratio": 0,
5-
"aspectratio": 0.5,
5+
"aspectratio": 2,
66
"type": "funnelarea",
77
"values": [6, 5, 4, 3, 2, 1],
88
"textinfo": "value",
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"baseratio": 0.5,
20-
"aspectratio": 0.5,
20+
"aspectratio": 2,
2121
"type": "funnelarea",
2222
"values": [16, 15, 14, 13, 12, 11],
2323
"textinfo": "value",
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"baseratio": 1,
35-
"aspectratio": 0.5,
35+
"aspectratio": 2,
3636
"type": "funnelarea",
3737
"values": [60, 50, 40, 30, 20, 10],
3838
"textinfo": "value",
@@ -92,7 +92,7 @@
9292
},
9393
{
9494
"baseratio": 0,
95-
"aspectratio": 2,
95+
"aspectratio": 0.5,
9696
"type": "funnelarea",
9797
"values": [6, 5, 4, 3, 2, 1],
9898
"textinfo": "value",
@@ -107,7 +107,7 @@
107107
},
108108
{
109109
"baseratio": 0.5,
110-
"aspectratio": 2,
110+
"aspectratio": 0.5,
111111
"type": "funnelarea",
112112
"values": [16, 15, 14, 13, 12, 11],
113113
"textinfo": "value",
@@ -122,7 +122,7 @@
122122
},
123123
{
124124
"baseratio": 1,
125-
"aspectratio": 2,
125+
"aspectratio": 0.5,
126126
"type": "funnelarea",
127127
"values": [60, 50, 40, 30, 20, 10],
128128
"textinfo": "value",

Diff for: ‎test/image/mocks/funnelarea_scalegroup_various_ratios.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"data": [
33
{
44
"baseratio": 0,
5-
"aspectratio": 0.5,
5+
"aspectratio": 2,
66
"type": "funnelarea",
77
"scalegroup": "one",
88
"values": [60, 50, 40, 30, 20, 10],
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"baseratio": 0.5,
21-
"aspectratio": 0.5,
21+
"aspectratio": 2,
2222
"type": "funnelarea",
2323
"scalegroup": "one",
2424
"values": [60, 50, 40, 30, 20, 10],
@@ -34,7 +34,7 @@
3434
},
3535
{
3636
"baseratio": 1,
37-
"aspectratio": 0.5,
37+
"aspectratio": 2,
3838
"type": "funnelarea",
3939
"scalegroup": "one",
4040
"values": [60, 50, 40, 30, 20, 10],
@@ -98,7 +98,7 @@
9898
},
9999
{
100100
"baseratio": 0,
101-
"aspectratio": 2,
101+
"aspectratio": 0.5,
102102
"type": "funnelarea",
103103
"scalegroup": "one",
104104
"values": [60, 50, 40, 30, 20, 10],
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"baseratio": 0.5,
117-
"aspectratio": 2,
117+
"aspectratio": 0.5,
118118
"type": "funnelarea",
119119
"scalegroup": "one",
120120
"values": [60, 50, 40, 30, 20, 10],
@@ -130,7 +130,7 @@
130130
},
131131
{
132132
"baseratio": 1,
133-
"aspectratio": 2,
133+
"aspectratio": 0.5,
134134
"type": "funnelarea",
135135
"scalegroup": "one",
136136
"values": [60, 50, 40, 30, 20, 10],

Diff for: ‎test/image/mocks/funnelarea_scalegroup_various_ratios_and_domain.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"data": [
33
{
44
"baseratio": 0,
5-
"aspectratio": 0.5,
5+
"aspectratio": 2,
66
"type": "funnelarea",
77
"scalegroup": "one",
88
"values": [60, 50, 40, 30, 20, 10],
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"baseratio": 0.5,
21-
"aspectratio": 0.5,
21+
"aspectratio": 2,
2222
"type": "funnelarea",
2323
"scalegroup": "one",
2424
"values": [60, 50, 40, 30, 20, 10],
@@ -34,7 +34,7 @@
3434
},
3535
{
3636
"baseratio": 1,
37-
"aspectratio": 0.5,
37+
"aspectratio": 2,
3838
"type": "funnelarea",
3939
"scalegroup": "one",
4040
"values": [60, 50, 40, 30, 20, 10],
@@ -98,7 +98,7 @@
9898
},
9999
{
100100
"baseratio": 0,
101-
"aspectratio": 2,
101+
"aspectratio": 0.5,
102102
"type": "funnelarea",
103103
"scalegroup": "one",
104104
"values": [60, 50, 40, 30, 20, 10],
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"baseratio": 0.5,
117-
"aspectratio": 2,
117+
"aspectratio": 0.5,
118118
"type": "funnelarea",
119119
"scalegroup": "one",
120120
"values": [60, 50, 40, 30, 20, 10],
@@ -130,7 +130,7 @@
130130
},
131131
{
132132
"baseratio": 1,
133-
"aspectratio": 2,
133+
"aspectratio": 0.5,
134134
"type": "funnelarea",
135135
"scalegroup": "one",
136136
"values": [60, 50, 40, 30, 20, 10],

0 commit comments

Comments
 (0)