Skip to content

Commit 4107ec3

Browse files
schaumbschaumb
authored
Merge pull request #574 from vizzuhq/intermediate_steps_labels
Intermediate steps labels
2 parents d4e27e2 + fe9ec9d commit 4107ec3

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
@@ -14,6 +14,7 @@
1414
- Fix axis step parameter if not match with the range sign (neg/pos).
1515
- Fix axis interpolation. From now the axis and axis labels are following the markers.
1616
- Fix measure axis labels when the range started after the 2000th step value from origo.
17+
- Remove marker labels at intermediate steps.
1718

1819
### Added
1920

‎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": ["85486cf"]
7878
},
7979
"basic_animations/legend_transitions/color_off_on_series_anim": {
80-
"refs": ["2df672c"]
80+
"refs": ["6eedb6a"]
8181
},
8282
"basic_animations/legend_transitions/lightness_2discrete_anim": {
83-
"refs": ["53e87b6"]
83+
"refs": ["d9310a7"]
8484
},
8585
"basic_animations/legend_transitions/lightness_conti_anim": {
8686
"refs": ["0bfbe8a"]
@@ -221,7 +221,7 @@
221221
"refs": ["cf8b2de"]
222222
},
223223
"operations/all_operations": {
224-
"refs": ["3124dc3"]
224+
"refs": ["bee6141"]
225225
},
226226
"operations/all_operations_sizeing": {
227227
"refs": ["666bc09"]
@@ -578,7 +578,7 @@
578578
"refs": ["7cacbdb"]
579579
},
580580
"web_content/analytical_operations/drilldown/column_3": {
581-
"refs": ["097d2a5"]
581+
"refs": ["45882ba"]
582582
},
583583
"web_content/analytical_operations/drilldown/column_4": {
584584
"refs": ["e03d86f"]
@@ -704,7 +704,7 @@
704704
"refs": ["9d5ded4"]
705705
},
706706
"web_content/analytical_operations/sum/bubbleplot_1": {
707-
"refs": ["dbfe2c8"]
707+
"refs": ["2347f68"]
708708
},
709709
"web_content/analytical_operations/sum/bubbleplot_2": {
710710
"refs": ["5cb0f7b"]
@@ -719,10 +719,10 @@
719719
"refs": ["b3f85e4"]
720720
},
721721
"web_content/analytical_operations/sum/column_2": {
722-
"refs": ["4a90b4d"]
722+
"refs": ["7b92bbb"]
723723
},
724724
"web_content/analytical_operations/sum/column_to_bar": {
725-
"refs": ["49ccb0a"]
725+
"refs": ["2d87e8a"]
726726
},
727727
"web_content/analytical_operations/sum/column_to_waterfall": {
728728
"refs": ["102d434"]
@@ -737,13 +737,13 @@
737737
"refs": ["fd06a27"]
738738
},
739739
"web_content/analytical_operations/sum/column_stacked_2": {
740-
"refs": ["5404785"]
740+
"refs": ["44300db"]
741741
},
742742
"web_content/analytical_operations/sum/coxcomb_1": {
743743
"refs": ["a2e7910"]
744744
},
745745
"web_content/analytical_operations/sum/coxcomb_2": {
746-
"refs": ["35b476c"]
746+
"refs": ["b8ae1ed"]
747747
},
748748
"web_content/analytical_operations/sum/coxcomb_split": {
749749
"refs": ["aae59d3"]
@@ -767,7 +767,7 @@
767767
"refs": ["c464e0c"]
768768
},
769769
"web_content/analytical_operations/sum/scatterplot": {
770-
"refs": ["2da577f"]
770+
"refs": ["4e1f1e8"]
771771
},
772772
"web_content/analytical_operations/sum/stream_stacked": {
773773
"refs": ["9f4e0b4"]
@@ -818,7 +818,7 @@
818818
"refs": ["14d41fa"]
819819
},
820820
"web_content_removed/animated/orientation_rectangle": {
821-
"refs": ["2a3c2e8"]
821+
"refs": ["289a8b0"]
822822
},
823823
"web_content_removed/animated/pie_donut2_rectangle_1dis_1con": {
824824
"refs": ["2543753"]
@@ -1778,16 +1778,16 @@
17781778
"refs": ["4b3eb43"]
17791779
},
17801780
"ww_next_steps/next_steps_Tests/02_C_R": {
1781-
"refs": ["0f4b04b"]
1781+
"refs": ["316fcd1"]
17821782
},
17831783
"ww_next_steps/next_steps_Tests/02_C_R_water_comparison_sum": {
17841784
"refs": ["5b29cc1"]
17851785
},
17861786
"ww_next_steps/next_steps_Tests/03_C_R": {
1787-
"refs": ["7ac6486"]
1787+
"refs": ["6e6522f"]
17881788
},
17891789
"ww_next_steps/next_steps_Tests/04_C_R": {
1790-
"refs": ["8c56ab3"]
1790+
"refs": ["8c91a64"]
17911791
},
17921792
"ww_next_steps/next_steps_Tests/05_C_R": {
17931793
"refs": ["d80c108"]
@@ -1880,7 +1880,7 @@
18801880
"refs": ["101d566"]
18811881
},
18821882
"ww_next_steps/next_steps_byOperations/drilldown/drilldown_01": {
1883-
"refs": ["bb4d641"]
1883+
"refs": ["7469171"]
18841884
},
18851885
"ww_next_steps/next_steps_byOperations/drilldown/drilldown_02": {
18861886
"refs": ["10bc921"]
@@ -1955,22 +1955,22 @@
19551955
"refs": ["1a76add"]
19561956
},
19571957
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_03": {
1958-
"refs": ["2e4cd98"]
1958+
"refs": ["835e6c7"]
19591959
},
19601960
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_04": {
19611961
"refs": ["374d580"]
19621962
},
19631963
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_05": {
1964-
"refs": ["40b3de6"]
1964+
"refs": ["6e453d1"]
19651965
},
19661966
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_06": {
19671967
"refs": ["a59a1f0"]
19681968
},
19691969
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_07": {
1970-
"refs": ["beb92f2"]
1970+
"refs": ["5bc8e6e"]
19711971
},
19721972
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_08": {
1973-
"refs": ["9146ecd"]
1973+
"refs": ["c7f642f"]
19741974
},
19751975
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09": {
19761976
"refs": ["5f44bd9"]
@@ -1985,10 +1985,10 @@
19851985
"refs": ["d133017"]
19861986
},
19871987
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_13": {
1988-
"refs": ["cd1c4b3"]
1988+
"refs": ["15d5fdf"]
19891989
},
19901990
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_14": {
1991-
"refs": ["ba3b9e0"]
1991+
"refs": ["5eee769"]
19921992
},
19931993
"ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_16": {
19941994
"refs": ["466659b"]
@@ -2012,16 +2012,16 @@
20122012
"refs": ["28709e1"]
20132013
},
20142014
"ww_next_steps/next_steps_byOperations/total/total_01": {
2015-
"refs": ["928ab80"]
2015+
"refs": ["c45395c"]
20162016
},
20172017
"ww_next_steps/next_steps_byOperations/total/total_02": {
2018-
"refs": ["8f36fcc"]
2018+
"refs": ["fddbede"]
20192019
},
20202020
"ww_next_steps/next_steps_byOperations/total/total_03": {
2021-
"refs": ["ffa0137"]
2021+
"refs": ["5677959"]
20222022
},
20232023
"ww_next_steps/next_steps_byOperations/total/total_04": {
2024-
"refs": ["6dacce8"]
2024+
"refs": ["0bdadb8"]
20252025
},
20262026
"ww_next_steps/next_steps_byOperations/total/total_05": {
20272027
"refs": ["9acd65e"]
@@ -2099,13 +2099,13 @@
20992099
"refs": ["f294471"]
21002100
},
21012101
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/4a_06b_rec_1c": {
2102-
"refs": ["8bde315"]
2102+
"refs": ["7daf92a"]
21032103
},
21042104
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/5_04a_rec_1c": {
2105-
"refs": ["00fc66d"]
2105+
"refs": ["9d9da96"]
21062106
},
21072107
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/6_04a_cir_1c": {
2108-
"refs": ["817c055"]
2108+
"refs": ["d861240"]
21092109
},
21102110
"ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/7_05_cir_2c": {
21112111
"refs": ["a994946"]
@@ -2171,7 +2171,7 @@
21712171
"refs": ["1c7947c"]
21722172
},
21732173
"ww_noFade/wNoFade_Tests/1_des_pol/circle/04a_cir_1c": {
2174-
"refs": ["6efac5b"]
2174+
"refs": ["6adfc52"]
21752175
},
21762176
"ww_noFade/wNoFade_Tests/1_des_pol/circle/04b_cir_1c": {
21772177
"refs": ["6960915"]
@@ -2465,7 +2465,7 @@
24652465
"refs": ["ef99cc4"]
24662466
},
24672467
"ww_noFade/wNoFade_Tests/Marker_transition_problem/line_drilldown_aggregate_x": {
2468-
"refs": ["3024aed"]
2468+
"refs": ["3a64717"]
24692469
},
24702470
"ww_noFade/wNoFade_Tests/Marker_transition_problem/line_orientation": {
24712471
"refs": ["fd49850"]
@@ -3164,22 +3164,22 @@
31643164
"refs": ["698d565"]
31653165
},
31663166
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_1": {
3167-
"refs": ["2eafa7e"]
3167+
"refs": ["db77f53"]
31683168
},
31693169
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_2": {
3170-
"refs": ["9e64bf7"]
3170+
"refs": ["adb1ee3"]
31713171
},
31723172
"www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_to_Bar": {
3173-
"refs": ["cc3aff6"]
3173+
"refs": ["3e4d864"]
31743174
},
31753175
"www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_1": {
3176-
"refs": ["3a72ef5"]
3176+
"refs": ["9d0c92b"]
31773177
},
31783178
"www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_2": {
3179-
"refs": ["e85fe1c"]
3179+
"refs": ["766cacb"]
31803180
},
31813181
"www_new_analytical_operations/operations/02_sum/Coxcomb_Coxcomb_to_Donut": {
3182-
"refs": ["7af195d"]
3182+
"refs": ["98bfd0d"]
31833183
},
31843184
"www_new_analytical_operations/operations/02_sum/Line_Line_3": {
31853185
"refs": ["c108bef"]

‎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": ["b0a2fc6"]
3636
},
3737
"540": {
38-
"refs": ["bc34559"]
38+
"refs": ["91b45be"]
3939
},
4040
"32303048": {
4141
"refs": ["b5d95ea"]

0 commit comments

Comments
 (0)