Skip to content

Commit 734927f

Browse files
committed
Fix unique testcase
1 parent fa713fe commit 734927f

File tree

5 files changed

+43
-27
lines changed

5 files changed

+43
-27
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
## [Unreleased]
44

5+
### Fixed
6+
7+
- From now vertical line connections are curved lines.
8+
- Remove duplicated circles on line-circle transition.
9+
- Fix area-circle polar connection transition.
10+
- Fix line-rectangle polar connection linearity.
11+
- Fix all polar connection interpolation (except fading).
12+
- Remove unwanted line connections from line-circle + orientation changed anim.
13+
514
## [0.13.0] - 2024-09-13
615

716
### Fixed

src/chart/rendering/markers/connectingmarker.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,19 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
4747
ctx.getOptions().orientation.factor<Math::FuzzyBool>(
4848
Gen::Orientation::horizontal);
4949

50-
linear = !polar || horizontal;
51-
5250
auto &&isHorizontal =
5351
ctx.getOptions().orientation.get_or_first(lineIndex).value
5452
== Gen::Orientation::horizontal;
5553

54+
linear = !polar || horizontal
55+
|| Math::FuzzyBool::And(
56+
!isHorizontal
57+
&& ctx.plot->axises.at(Gen::Channel::Type::x)
58+
.dimension.enabled,
59+
ctx.plot->axises.at(Gen::Channel::Type::x)
60+
.measure.enabled.factor(false),
61+
!horizontal);
62+
5663
lineWidth[0] = lineWidth[1] = 0;
5764

5865
const auto *prev =

src/chart/rendering/painter/drawline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ DrawLine::DrawLine(const Geom::Line &line,
5454
options.coordSys.getOriginal(p1),
5555
options.coordSys.getOriginal(p2),
5656
options.coordSys.getOriginal(p3)},
57-
{static_cast<PathSampler::Options>(options),
57+
{static_cast<const PathSampler::Options &>(options),
5858
{.toCircleFactor = 0,
5959
.straightFactor = options.straightFactor}},
6060
canvas,

test/e2e/test_cases/test_cases.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@
185185
"refs": ["dae308e"]
186186
},
187187
"data_fault_and_formats/column_rectangle_less_disc": {
188-
"refs": ["f2cce92"]
188+
"refs": ["e84920a"]
189189
},
190190
"data_fault_and_formats/column_rectangle_more_conti": {
191191
"refs": ["7ebabe4"]
192192
},
193193
"data_fault_and_formats/column_rectangle_more_disc": {
194-
"refs": ["87e3a08"]
194+
"refs": ["2c2e36e"]
195195
},
196196
"data_fault_and_formats/rectangle_data_cube": {
197197
"refs": ["e504add"]
@@ -1151,28 +1151,28 @@
11511151
"refs": ["df5e0ee"]
11521152
},
11531153
"ww_animTiming/descartes-polar_orient/09_d-p_o_r-a-r": {
1154-
"refs": ["915f0e7"]
1154+
"refs": ["4f241d6"]
11551155
},
11561156
"ww_animTiming/descartes-polar_orient/10_d-p_o_c-a-c": {
11571157
"refs": ["a2a9605"]
11581158
},
11591159
"ww_animTiming/descartes-polar_orient/11_d-p_o_a-a-a": {
1160-
"refs": ["ae824e3"]
1160+
"refs": ["bf6abe1"]
11611161
},
11621162
"ww_animTiming/descartes-polar_orient/12_d-p_o_l-a-l": {
1163-
"refs": ["a2ac0fe"]
1163+
"refs": ["fb238ec"]
11641164
},
11651165
"ww_animTiming/descartes-polar_orient/13_d-p_o_r-l-r": {
1166-
"refs": ["d4f67e3"]
1166+
"refs": ["6a458bb"]
11671167
},
11681168
"ww_animTiming/descartes-polar_orient/14_d-p_o_c-l-c": {
1169-
"refs": ["a0d648f"]
1169+
"refs": ["47b646a"]
11701170
},
11711171
"ww_animTiming/descartes-polar_orient/15_d-p_o_a-l-a": {
1172-
"refs": ["bc84b66"]
1172+
"refs": ["2b08ef5"]
11731173
},
11741174
"ww_animTiming/descartes-polar_orient/16_d-p_o_l-l-l": {
1175-
"refs": ["e148dab"]
1175+
"refs": ["1061105"]
11761176
},
11771177
"ww_animTiming/descartes/02_d-d_c-r-c": {
11781178
"refs": ["3faedf5"]
@@ -1292,28 +1292,28 @@
12921292
"refs": ["e137c9a"]
12931293
},
12941294
"ww_animTiming/polar_orientation/09_p-p_o_r-a-r": {
1295-
"refs": ["e9c6c6c"]
1295+
"refs": ["7356a12"]
12961296
},
12971297
"ww_animTiming/polar_orientation/10_p-p_o_c-a-c": {
1298-
"refs": ["3112502"]
1298+
"refs": ["b770021"]
12991299
},
13001300
"ww_animTiming/polar_orientation/11_p-p_o_a-a-a": {
1301-
"refs": ["79d5d9c"]
1301+
"refs": ["3432c12"]
13021302
},
13031303
"ww_animTiming/polar_orientation/12_p-p_o_l-a-l": {
13041304
"refs": ["75ba273"]
13051305
},
13061306
"ww_animTiming/polar_orientation/13_p-p_o_r-l-r": {
1307-
"refs": ["a7e0ab4"]
1307+
"refs": ["6a73484"]
13081308
},
13091309
"ww_animTiming/polar_orientation/14_p-p_o_c-l-c": {
1310-
"refs": ["123e4e2"]
1310+
"refs": ["eec715a"]
13111311
},
13121312
"ww_animTiming/polar_orientation/15_p-p_o_a-l-a": {
1313-
"refs": ["deba322"]
1313+
"refs": ["064b0b7"]
13141314
},
13151315
"ww_animTiming/polar_orientation/16_p-p_o_l-l-l": {
1316-
"refs": ["328ca4c"]
1316+
"refs": ["798b994"]
13171317
},
13181318
"ww_animTiming/without-descartes/01_w-d_r-r-r": {
13191319
"refs": ["b70c147"]
@@ -1484,7 +1484,7 @@
14841484
"refs": ["d1af57c"]
14851485
},
14861486
"ww_animTiming_TESTS/descartes-polar_orient/09_d-p_o_r-a-r": {
1487-
"refs": ["8d5c8f9"]
1487+
"refs": ["ed4d5c6"]
14881488
},
14891489
"ww_animTiming_TESTS/descartes-polar_orient/10_d-p_o_c-a-c": {
14901490
"refs": ["6c32188"]
@@ -1496,7 +1496,7 @@
14961496
"refs": ["3431b25"]
14971497
},
14981498
"ww_animTiming_TESTS/descartes-polar_orient/13_d-p_o_r-l-r": {
1499-
"refs": ["745bcc1"]
1499+
"refs": ["13ba67a"]
15001500
},
15011501
"ww_animTiming_TESTS/descartes-polar_orient/14_d-p_o_c-l-c": {
15021502
"refs": ["3e965dc"]
@@ -1625,10 +1625,10 @@
16251625
"refs": ["597a4a4"]
16261626
},
16271627
"ww_animTiming_TESTS/polar_orientation/09_p-p_o_r-a-r": {
1628-
"refs": ["2d97baa"]
1628+
"refs": ["0584e64"]
16291629
},
16301630
"ww_animTiming_TESTS/polar_orientation/10_p-p_o_c-a-c": {
1631-
"refs": ["238fd07"]
1631+
"refs": ["d1f70e0"]
16321632
},
16331633
"ww_animTiming_TESTS/polar_orientation/11_p-p_o_a-a-a": {
16341634
"refs": ["403eab0"]
@@ -1637,10 +1637,10 @@
16371637
"refs": ["5f58693"]
16381638
},
16391639
"ww_animTiming_TESTS/polar_orientation/13_p-p_o_r-l-r": {
1640-
"refs": ["741f884"]
1640+
"refs": ["9ec60a5"]
16411641
},
16421642
"ww_animTiming_TESTS/polar_orientation/14_p-p_o_c-l-c": {
1643-
"refs": ["cec95dc"]
1643+
"refs": ["4a68bd6"]
16441644
},
16451645
"ww_animTiming_TESTS/polar_orientation/15_p-p_o_a-l-a": {
16461646
"refs": ["69225cb"]

test/e2e/tests/fixes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"refs": ["e4b8a2f"]
2121
},
2222
"327": {
23-
"refs": ["6b87c18"]
23+
"refs": ["8eb7c5d"]
2424
},
2525
"333": {
2626
"refs": ["6a5536c"]
@@ -50,7 +50,7 @@
5050
"refs": ["034ee91"]
5151
},
5252
"47977099": {
53-
"refs": ["2845349"]
53+
"refs": ["1310b69"]
5454
},
5555
"53913538": {
5656
"refs": ["90f6d38"]

0 commit comments

Comments
 (0)