Skip to content

Commit 89090ef

Browse files
schaumbschaumb
committed
Remove marker labels at intermediate steps
1 parent 9a24410 commit 89090ef

File tree

4 files changed

+49
-37
lines changed

4 files changed

+49
-37
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Fixed
66

77
- Legend title bottomPadding extended.
8+
- Remove marker labels at intermediate steps.
89

910
### Added
1011

‎src/chart/animator/animation.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,17 @@ Gen::PlotPtr Animation::getIntermediate(const Gen::PlotPtr &base,
194194

195195
if (*extOptions != *other->getOptions()
196196
&& *extOptions != *base->getOptions()) {
197+
198+
auto &labelChannel =
199+
extOptions->getChannels().at(Gen::ChannelId::label);
200+
201+
for (const auto &series : labelChannel.dimensions())
202+
extOptions->getChannels()
203+
.at(Gen::ChannelId::noop)
204+
.dimensionIds.push_back(series);
205+
206+
labelChannel.reset();
207+
197208
res =
198209
Gen::PlotBuilder{dataTable, extOptions, base->getStyle()}
199210
.build();

‎test/e2e/test_cases/test_cases.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
"refs": ["041cc6e"]
7878
},
7979
"basic_animations/legend_transitions/color_off_on_series_anim": {
80-
"refs": ["ea45913"]
80+
"refs": ["801f840"]
8181
},
8282
"basic_animations/legend_transitions/lightness_2discrete_anim": {
83-
"refs": ["219235d"]
83+
"refs": ["bd84d4f"]
8484
},
8585
"basic_animations/legend_transitions/lightness_conti_anim": {
8686
"refs": ["828148b"]
@@ -221,7 +221,7 @@
221221
"refs": ["984f6a4"]
222222
},
223223
"operations/all_operations": {
224-
"refs": ["87763e6"]
224+
"refs": ["0479b15"]
225225
},
226226
"operations/all_operations_sizeing": {
227227
"refs": ["713b086"]
@@ -578,7 +578,7 @@
578578
"refs": ["fc9d14b"]
579579
},
580580
"web_content/analytical_operations/drilldown/column_3": {
581-
"refs": ["2c51570"]
581+
"refs": ["f7917f4"]
582582
},
583583
"web_content/analytical_operations/drilldown/column_4": {
584584
"refs": ["198e5f2"]
@@ -704,7 +704,7 @@
704704
"refs": ["47754fa"]
705705
},
706706
"web_content/analytical_operations/sum/bubbleplot_1": {
707-
"refs": ["34557ae"]
707+
"refs": ["f65d95d"]
708708
},
709709
"web_content/analytical_operations/sum/bubbleplot_2": {
710710
"refs": ["18e6318"]
@@ -719,10 +719,10 @@
719719
"refs": ["f981033"]
720720
},
721721
"web_content/analytical_operations/sum/column_2": {
722-
"refs": ["ee6e53a"]
722+
"refs": ["f064ea6"]
723723
},
724724
"web_content/analytical_operations/sum/column_to_bar": {
725-
"refs": ["5cdbbca"]
725+
"refs": ["b5690e0"]
726726
},
727727
"web_content/analytical_operations/sum/column_to_waterfall": {
728728
"refs": ["623babf"]
@@ -737,13 +737,13 @@
737737
"refs": ["155f675"]
738738
},
739739
"web_content/analytical_operations/sum/column_stacked_2": {
740-
"refs": ["60788e5"]
740+
"refs": ["77927ba"]
741741
},
742742
"web_content/analytical_operations/sum/coxcomb_1": {
743743
"refs": ["0a8ea50"]
744744
},
745745
"web_content/analytical_operations/sum/coxcomb_2": {
746-
"refs": ["b17fcd8"]
746+
"refs": ["9ad562c"]
747747
},
748748
"web_content/analytical_operations/sum/coxcomb_split": {
749749
"refs": ["38c5f24"]
@@ -767,7 +767,7 @@
767767
"refs": ["342860d"]
768768
},
769769
"web_content/analytical_operations/sum/scatterplot": {
770-
"refs": ["a09c882"]
770+
"refs": ["bbf6383"]
771771
},
772772
"web_content/analytical_operations/sum/stream_stacked": {
773773
"refs": ["a59f246"]
@@ -818,7 +818,7 @@
818818
"refs": ["549404c"]
819819
},
820820
"web_content_removed/animated/orientation_rectangle": {
821-
"refs": ["ed644fc"]
821+
"refs": ["388ca5e"]
822822
},
823823
"web_content_removed/animated/pie_donut2_rectangle_1dis_1con": {
824824
"refs": ["2543753"]
@@ -1778,16 +1778,16 @@
17781778
"refs": ["26b2686"]
17791779
},
17801780
"ww_next_steps/next_steps_Tests/02_C_R": {
1781-
"refs": ["07a3161"]
1781+
"refs": ["7fa6b9d"]
17821782
},
17831783
"ww_next_steps/next_steps_Tests/02_C_R_water_comparison_sum": {
17841784
"refs": ["e4126f6"]
17851785
},
17861786
"ww_next_steps/next_steps_Tests/03_C_R": {
1787-
"refs": ["2f85528"]
1787+
"refs": ["f3bbd9a"]
17881788
},
17891789
"ww_next_steps/next_steps_Tests/04_C_R": {
1790-
"refs": ["87b761e"]
1790+
"refs": ["6d92828"]
17911791
},
17921792
"ww_next_steps/next_steps_Tests/05_C_R": {
17931793
"refs": ["533ff4f"]
@@ -1880,7 +1880,7 @@
18801880
"refs": ["c159fb6"]
18811881
},
18821882
"ww_next_steps/next_steps_byOperations/drilldown/drilldown_01": {
1883-
"refs": ["1cd042b"]
1883+
"refs": ["d2ba645"]
18841884
},
18851885
"ww_next_steps/next_steps_byOperations/drilldown/drilldown_02": {
18861886
"refs": ["3d6557e"]
@@ -1955,22 +1955,22 @@
19551955
"refs": ["a3fffec"]
19561956
},
19571957
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_03": {
1958-
"refs": ["6604dfd"]
1958+
"refs": ["b80a546"]
19591959
},
19601960
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_04": {
19611961
"refs": ["4004cf9"]
19621962
},
19631963
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_05": {
1964-
"refs": ["3cb73b6"]
1964+
"refs": ["6a30f78"]
19651965
},
19661966
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_06": {
19671967
"refs": ["2f12434"]
19681968
},
19691969
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_07": {
1970-
"refs": ["e3cb0b7"]
1970+
"refs": ["94d8521"]
19711971
},
19721972
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_08": {
1973-
"refs": ["f9db953"]
1973+
"refs": ["d507686"]
19741974
},
19751975
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09": {
19761976
"refs": ["e02a016"]
@@ -1985,10 +1985,10 @@
19851985
"refs": ["ef2f675"]
19861986
},
19871987
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_13": {
1988-
"refs": ["9c8a8c1"]
1988+
"refs": ["580ad13"]
19891989
},
19901990
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_14": {
1991-
"refs": ["d3d3d1d"]
1991+
"refs": ["2e729bf"]
19921992
},
19931993
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_16": {
19941994
"refs": ["d8a5a32"]
@@ -2012,16 +2012,16 @@
20122012
"refs": ["d200cb1"]
20132013
},
20142014
"ww_next_steps/next_steps_byOperations/total/total_01": {
2015-
"refs": ["6a0650c"]
2015+
"refs": ["272a929"]
20162016
},
20172017
"ww_next_steps/next_steps_byOperations/total/total_02": {
2018-
"refs": ["d0e74b5"]
2018+
"refs": ["5f5e11c"]
20192019
},
20202020
"ww_next_steps/next_steps_byOperations/total/total_03": {
2021-
"refs": ["bbb180d"]
2021+
"refs": ["084e492"]
20222022
},
20232023
"ww_next_steps/next_steps_byOperations/total/total_04": {
2024-
"refs": ["13cc929"]
2024+
"refs": ["814e87a"]
20252025
},
20262026
"ww_next_steps/next_steps_byOperations/total/total_05": {
20272027
"refs": ["550ee57"]
@@ -2099,13 +2099,13 @@
20992099
"refs": ["30fc050"]
21002100
},
21012101
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/4a_06b_rec_1c": {
2102-
"refs": ["c6cf6ae"]
2102+
"refs": ["f392fdb"]
21032103
},
21042104
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/5_04a_rec_1c": {
2105-
"refs": ["453be51"]
2105+
"refs": ["14bedf4"]
21062106
},
21072107
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/6_04a_cir_1c": {
2108-
"refs": ["e78cbf1"]
2108+
"refs": ["c91dfd2"]
21092109
},
21102110
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/7_05_cir_2c": {
21112111
"refs": ["9498382"]
@@ -2171,7 +2171,7 @@
21712171
"refs": ["a3c9ce4"]
21722172
},
21732173
"ww_noFade/wNoFade_Tests/1_des_pol/circle/04a_cir_1c": {
2174-
"refs": ["6eef1b5"]
2174+
"refs": ["e79abc9"]
21752175
},
21762176
"ww_noFade/wNoFade_Tests/1_des_pol/circle/04b_cir_1c": {
21772177
"refs": ["8fab0a6"]
@@ -2465,7 +2465,7 @@
24652465
"refs": ["3961fff"]
24662466
},
24672467
"ww_noFade/wNoFade_Tests/Marker_transition_problem/line_drilldown_aggregate_x": {
2468-
"refs": ["cba228a"]
2468+
"refs": ["eec3413"]
24692469
},
24702470
"ww_noFade/wNoFade_Tests/Marker_transition_problem/line_orientation": {
24712471
"refs": ["626756e"]
@@ -3164,22 +3164,22 @@
31643164
"refs": ["40ed193"]
31653165
},
31663166
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_1": {
3167-
"refs": ["d24a0be"]
3167+
"refs": ["72b2bbf"]
31683168
},
31693169
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_2": {
3170-
"refs": ["f801afa"]
3170+
"refs": ["c76ede1"]
31713171
},
31723172
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_to_Bar": {
3173-
"refs": ["0a93730"]
3173+
"refs": ["d65644e"]
31743174
},
31753175
"www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_1": {
3176-
"refs": ["a9e28ef"]
3176+
"refs": ["76f46b7"]
31773177
},
31783178
"www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_2": {
3179-
"refs": ["bb3cea0"]
3179+
"refs": ["a306f12"]
31803180
},
31813181
"www_new_analytical_operations/operations/02_sum/Coxcomb_Coxcomb_to_Donut": {
3182-
"refs": ["c707f14"]
3182+
"refs": ["60d7166"]
31833183
},
31843184
"www_new_analytical_operations/operations/02_sum/Line_Line_3": {
31853185
"refs": ["ea115f0"]

‎test/e2e/tests/fixes.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"refs": ["40a70bd"]
3636
},
3737
"540": {
38-
"refs": ["bc34559"]
38+
"refs": ["91b45be"]
3939
},
4040
"32303048": {
4141
"refs": ["b5d95ea"]

0 commit comments

Comments
 (0)