From 89090ef04ccec739f29e2555d480763e8c9224e1 Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Thu, 29 Aug 2024 14:46:34 +0200 Subject: [PATCH 1/3] Remove marker labels at intermediate steps --- CHANGELOG.md | 1 + src/chart/animator/animation.cpp | 11 +++++ test/e2e/test_cases/test_cases.json | 72 ++++++++++++++--------------- test/e2e/tests/fixes.json | 2 +- 4 files changed, 49 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7fa98471..e349dc409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixed - Legend title bottomPadding extended. +- Remove marker labels at intermediate steps. ### Added diff --git a/src/chart/animator/animation.cpp b/src/chart/animator/animation.cpp index 0e9d7a244..9bced5a59 100644 --- a/src/chart/animator/animation.cpp +++ b/src/chart/animator/animation.cpp @@ -194,6 +194,17 @@ Gen::PlotPtr Animation::getIntermediate(const Gen::PlotPtr &base, if (*extOptions != *other->getOptions() && *extOptions != *base->getOptions()) { + + auto &labelChannel = + extOptions->getChannels().at(Gen::ChannelId::label); + + for (const auto &series : labelChannel.dimensions()) + extOptions->getChannels() + .at(Gen::ChannelId::noop) + .dimensionIds.push_back(series); + + labelChannel.reset(); + res = Gen::PlotBuilder{dataTable, extOptions, base->getStyle()} .build(); diff --git a/test/e2e/test_cases/test_cases.json b/test/e2e/test_cases/test_cases.json index 213b61d47..2cd4f3518 100644 --- a/test/e2e/test_cases/test_cases.json +++ b/test/e2e/test_cases/test_cases.json @@ -77,10 +77,10 @@ "refs": ["041cc6e"] }, "basic_animations/legend_transitions/color_off_on_series_anim": { - "refs": ["ea45913"] + "refs": ["801f840"] }, "basic_animations/legend_transitions/lightness_2discrete_anim": { - "refs": ["219235d"] + "refs": ["bd84d4f"] }, "basic_animations/legend_transitions/lightness_conti_anim": { "refs": ["828148b"] @@ -221,7 +221,7 @@ "refs": ["984f6a4"] }, "operations/all_operations": { - "refs": ["87763e6"] + "refs": ["0479b15"] }, "operations/all_operations_sizeing": { "refs": ["713b086"] @@ -578,7 +578,7 @@ "refs": ["fc9d14b"] }, "web_content/analytical_operations/drilldown/column_3": { - "refs": ["2c51570"] + "refs": ["f7917f4"] }, "web_content/analytical_operations/drilldown/column_4": { "refs": ["198e5f2"] @@ -704,7 +704,7 @@ "refs": ["47754fa"] }, "web_content/analytical_operations/sum/bubbleplot_1": { - "refs": ["34557ae"] + "refs": ["f65d95d"] }, "web_content/analytical_operations/sum/bubbleplot_2": { "refs": ["18e6318"] @@ -719,10 +719,10 @@ "refs": ["f981033"] }, "web_content/analytical_operations/sum/column_2": { - "refs": ["ee6e53a"] + "refs": ["f064ea6"] }, "web_content/analytical_operations/sum/column_to_bar": { - "refs": ["5cdbbca"] + "refs": ["b5690e0"] }, "web_content/analytical_operations/sum/column_to_waterfall": { "refs": ["623babf"] @@ -737,13 +737,13 @@ "refs": ["155f675"] }, "web_content/analytical_operations/sum/column_stacked_2": { - "refs": ["60788e5"] + "refs": ["77927ba"] }, "web_content/analytical_operations/sum/coxcomb_1": { "refs": ["0a8ea50"] }, "web_content/analytical_operations/sum/coxcomb_2": { - "refs": ["b17fcd8"] + "refs": ["9ad562c"] }, "web_content/analytical_operations/sum/coxcomb_split": { "refs": ["38c5f24"] @@ -767,7 +767,7 @@ "refs": ["342860d"] }, "web_content/analytical_operations/sum/scatterplot": { - "refs": ["a09c882"] + "refs": ["bbf6383"] }, "web_content/analytical_operations/sum/stream_stacked": { "refs": ["a59f246"] @@ -818,7 +818,7 @@ "refs": ["549404c"] }, "web_content_removed/animated/orientation_rectangle": { - "refs": ["ed644fc"] + "refs": ["388ca5e"] }, "web_content_removed/animated/pie_donut2_rectangle_1dis_1con": { "refs": ["2543753"] @@ -1778,16 +1778,16 @@ "refs": ["26b2686"] }, "ww_next_steps/next_steps_Tests/02_C_R": { - "refs": ["07a3161"] + "refs": ["7fa6b9d"] }, "ww_next_steps/next_steps_Tests/02_C_R_water_comparison_sum": { "refs": ["e4126f6"] }, "ww_next_steps/next_steps_Tests/03_C_R": { - "refs": ["2f85528"] + "refs": ["f3bbd9a"] }, "ww_next_steps/next_steps_Tests/04_C_R": { - "refs": ["87b761e"] + "refs": ["6d92828"] }, "ww_next_steps/next_steps_Tests/05_C_R": { "refs": ["533ff4f"] @@ -1880,7 +1880,7 @@ "refs": ["c159fb6"] }, "ww_next_steps/next_steps_byOperations/drilldown/drilldown_01": { - "refs": ["1cd042b"] + "refs": ["d2ba645"] }, "ww_next_steps/next_steps_byOperations/drilldown/drilldown_02": { "refs": ["3d6557e"] @@ -1955,22 +1955,22 @@ "refs": ["a3fffec"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_03": { - "refs": ["6604dfd"] + "refs": ["b80a546"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_04": { "refs": ["4004cf9"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_05": { - "refs": ["3cb73b6"] + "refs": ["6a30f78"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_06": { "refs": ["2f12434"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_07": { - "refs": ["e3cb0b7"] + "refs": ["94d8521"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_08": { - "refs": ["f9db953"] + "refs": ["d507686"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09": { "refs": ["e02a016"] @@ -1985,10 +1985,10 @@ "refs": ["ef2f675"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_13": { - "refs": ["9c8a8c1"] + "refs": ["580ad13"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_14": { - "refs": ["d3d3d1d"] + "refs": ["2e729bf"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_16": { "refs": ["d8a5a32"] @@ -2012,16 +2012,16 @@ "refs": ["d200cb1"] }, "ww_next_steps/next_steps_byOperations/total/total_01": { - "refs": ["6a0650c"] + "refs": ["272a929"] }, "ww_next_steps/next_steps_byOperations/total/total_02": { - "refs": ["d0e74b5"] + "refs": ["5f5e11c"] }, "ww_next_steps/next_steps_byOperations/total/total_03": { - "refs": ["bbb180d"] + "refs": ["084e492"] }, "ww_next_steps/next_steps_byOperations/total/total_04": { - "refs": ["13cc929"] + "refs": ["814e87a"] }, "ww_next_steps/next_steps_byOperations/total/total_05": { "refs": ["550ee57"] @@ -2099,13 +2099,13 @@ "refs": ["30fc050"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/4a_06b_rec_1c": { - "refs": ["c6cf6ae"] + "refs": ["f392fdb"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/5_04a_rec_1c": { - "refs": ["453be51"] + "refs": ["14bedf4"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/6_04a_cir_1c": { - "refs": ["e78cbf1"] + "refs": ["c91dfd2"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/7_05_cir_2c": { "refs": ["9498382"] @@ -2171,7 +2171,7 @@ "refs": ["a3c9ce4"] }, "ww_noFade/wNoFade_Tests/1_des_pol/circle/04a_cir_1c": { - "refs": ["6eef1b5"] + "refs": ["e79abc9"] }, "ww_noFade/wNoFade_Tests/1_des_pol/circle/04b_cir_1c": { "refs": ["8fab0a6"] @@ -2465,7 +2465,7 @@ "refs": ["3961fff"] }, "ww_noFade/wNoFade_Tests/Marker_transition_problem/line_drilldown_aggregate_x": { - "refs": ["cba228a"] + "refs": ["eec3413"] }, "ww_noFade/wNoFade_Tests/Marker_transition_problem/line_orientation": { "refs": ["626756e"] @@ -3164,22 +3164,22 @@ "refs": ["40ed193"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_1": { - "refs": ["d24a0be"] + "refs": ["72b2bbf"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_2": { - "refs": ["f801afa"] + "refs": ["c76ede1"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_to_Bar": { - "refs": ["0a93730"] + "refs": ["d65644e"] }, "www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_1": { - "refs": ["a9e28ef"] + "refs": ["76f46b7"] }, "www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_2": { - "refs": ["bb3cea0"] + "refs": ["a306f12"] }, "www_new_analytical_operations/operations/02_sum/Coxcomb_Coxcomb_to_Donut": { - "refs": ["c707f14"] + "refs": ["60d7166"] }, "www_new_analytical_operations/operations/02_sum/Line_Line_3": { "refs": ["ea115f0"] diff --git a/test/e2e/tests/fixes.json b/test/e2e/tests/fixes.json index 3dbf34d0c..bc4cf06da 100644 --- a/test/e2e/tests/fixes.json +++ b/test/e2e/tests/fixes.json @@ -35,7 +35,7 @@ "refs": ["40a70bd"] }, "540": { - "refs": ["bc34559"] + "refs": ["91b45be"] }, "32303048": { "refs": ["b5d95ea"] From 9460304ebde790104c68b69b76c7cabf159330dd Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Fri, 6 Sep 2024 12:04:01 +0200 Subject: [PATCH 2/3] Latest tests --- test/e2e/test_cases/test_cases.json | 76 ++++++++++++++--------------- test/e2e/tests/config_tests.json | 2 +- test/e2e/tests/fixes.json | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/test/e2e/test_cases/test_cases.json b/test/e2e/test_cases/test_cases.json index ec8d1d3ed..021e7a87e 100644 --- a/test/e2e/test_cases/test_cases.json +++ b/test/e2e/test_cases/test_cases.json @@ -77,10 +77,10 @@ "refs": ["85486cf"] }, "basic_animations/legend_transitions/color_off_on_series_anim": { - "refs": ["2df672c"] + "refs": ["6eedb6a"] }, "basic_animations/legend_transitions/lightness_2discrete_anim": { - "refs": ["53e87b6"] + "refs": ["d9310a7"] }, "basic_animations/legend_transitions/lightness_conti_anim": { "refs": ["0bfbe8a"] @@ -185,13 +185,13 @@ "refs": ["dae308e"] }, "data_fault_and_formats/column_rectangle_less_disc": { - "refs": ["f2cce92"] + "refs": ["e84920a"] }, "data_fault_and_formats/column_rectangle_more_conti": { "refs": ["7ebabe4"] }, "data_fault_and_formats/column_rectangle_more_disc": { - "refs": ["87e3a08"] + "refs": ["2c2e36e"] }, "data_fault_and_formats/rectangle_data_cube": { "refs": ["e504add"] @@ -221,7 +221,7 @@ "refs": ["cf8b2de"] }, "operations/all_operations": { - "refs": ["3124dc3"] + "refs": ["bee6141"] }, "operations/all_operations_sizeing": { "refs": ["666bc09"] @@ -578,7 +578,7 @@ "refs": ["7cacbdb"] }, "web_content/analytical_operations/drilldown/column_3": { - "refs": ["097d2a5"] + "refs": ["45882ba"] }, "web_content/analytical_operations/drilldown/column_4": { "refs": ["e03d86f"] @@ -704,7 +704,7 @@ "refs": ["9d5ded4"] }, "web_content/analytical_operations/sum/bubbleplot_1": { - "refs": ["dbfe2c8"] + "refs": ["2347f68"] }, "web_content/analytical_operations/sum/bubbleplot_2": { "refs": ["5cb0f7b"] @@ -719,10 +719,10 @@ "refs": ["b3f85e4"] }, "web_content/analytical_operations/sum/column_2": { - "refs": ["4a90b4d"] + "refs": ["7b92bbb"] }, "web_content/analytical_operations/sum/column_to_bar": { - "refs": ["49ccb0a"] + "refs": ["2d87e8a"] }, "web_content/analytical_operations/sum/column_to_waterfall": { "refs": ["102d434"] @@ -737,13 +737,13 @@ "refs": ["fd06a27"] }, "web_content/analytical_operations/sum/column_stacked_2": { - "refs": ["5404785"] + "refs": ["44300db"] }, "web_content/analytical_operations/sum/coxcomb_1": { "refs": ["a2e7910"] }, "web_content/analytical_operations/sum/coxcomb_2": { - "refs": ["35b476c"] + "refs": ["b8ae1ed"] }, "web_content/analytical_operations/sum/coxcomb_split": { "refs": ["aae59d3"] @@ -767,7 +767,7 @@ "refs": ["c464e0c"] }, "web_content/analytical_operations/sum/scatterplot": { - "refs": ["2da577f"] + "refs": ["4e1f1e8"] }, "web_content/analytical_operations/sum/stream_stacked": { "refs": ["9f4e0b4"] @@ -818,7 +818,7 @@ "refs": ["14d41fa"] }, "web_content_removed/animated/orientation_rectangle": { - "refs": ["2a3c2e8"] + "refs": ["289a8b0"] }, "web_content_removed/animated/pie_donut2_rectangle_1dis_1con": { "refs": ["2543753"] @@ -1778,16 +1778,16 @@ "refs": ["4b3eb43"] }, "ww_next_steps/next_steps_Tests/02_C_R": { - "refs": ["0f4b04b"] + "refs": ["316fcd1"] }, "ww_next_steps/next_steps_Tests/02_C_R_water_comparison_sum": { "refs": ["5b29cc1"] }, "ww_next_steps/next_steps_Tests/03_C_R": { - "refs": ["7ac6486"] + "refs": ["6e6522f"] }, "ww_next_steps/next_steps_Tests/04_C_R": { - "refs": ["8c56ab3"] + "refs": ["8c91a64"] }, "ww_next_steps/next_steps_Tests/05_C_R": { "refs": ["d80c108"] @@ -1880,7 +1880,7 @@ "refs": ["101d566"] }, "ww_next_steps/next_steps_byOperations/drilldown/drilldown_01": { - "refs": ["bb4d641"] + "refs": ["7469171"] }, "ww_next_steps/next_steps_byOperations/drilldown/drilldown_02": { "refs": ["10bc921"] @@ -1955,22 +1955,22 @@ "refs": ["1a76add"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_03": { - "refs": ["2e4cd98"] + "refs": ["835e6c7"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_04": { "refs": ["374d580"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_05": { - "refs": ["40b3de6"] + "refs": ["6e453d1"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_06": { "refs": ["a59a1f0"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_07": { - "refs": ["beb92f2"] + "refs": ["5bc8e6e"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_08": { - "refs": ["9146ecd"] + "refs": ["c7f642f"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09": { "refs": ["5f44bd9"] @@ -1985,10 +1985,10 @@ "refs": ["d133017"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_13": { - "refs": ["cd1c4b3"] + "refs": ["15d5fdf"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_14": { - "refs": ["ba3b9e0"] + "refs": ["5eee769"] }, "ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_16": { "refs": ["466659b"] @@ -2012,16 +2012,16 @@ "refs": ["28709e1"] }, "ww_next_steps/next_steps_byOperations/total/total_01": { - "refs": ["928ab80"] + "refs": ["c45395c"] }, "ww_next_steps/next_steps_byOperations/total/total_02": { - "refs": ["8f36fcc"] + "refs": ["fddbede"] }, "ww_next_steps/next_steps_byOperations/total/total_03": { - "refs": ["ffa0137"] + "refs": ["5677959"] }, "ww_next_steps/next_steps_byOperations/total/total_04": { - "refs": ["6dacce8"] + "refs": ["0bdadb8"] }, "ww_next_steps/next_steps_byOperations/total/total_05": { "refs": ["9acd65e"] @@ -2099,13 +2099,13 @@ "refs": ["f294471"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/4a_06b_rec_1c": { - "refs": ["8bde315"] + "refs": ["7daf92a"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/5_04a_rec_1c": { - "refs": ["00fc66d"] + "refs": ["9d9da96"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/6_04a_cir_1c": { - "refs": ["817c055"] + "refs": ["d861240"] }, "ww_next_steps/next_steps_byOperations/wREGIEKBOL/NoFade_Promobol/7_05_cir_2c": { "refs": ["a994946"] @@ -2171,7 +2171,7 @@ "refs": ["1c7947c"] }, "ww_noFade/wNoFade_Tests/1_des_pol/circle/04a_cir_1c": { - "refs": ["6efac5b"] + "refs": ["6adfc52"] }, "ww_noFade/wNoFade_Tests/1_des_pol/circle/04b_cir_1c": { "refs": ["6960915"] @@ -2465,7 +2465,7 @@ "refs": ["ef99cc4"] }, "ww_noFade/wNoFade_Tests/Marker_transition_problem/line_drilldown_aggregate_x": { - "refs": ["3024aed"] + "refs": ["3a64717"] }, "ww_noFade/wNoFade_Tests/Marker_transition_problem/line_orientation": { "refs": ["fd49850"] @@ -3164,22 +3164,22 @@ "refs": ["698d565"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_1": { - "refs": ["2eafa7e"] + "refs": ["db77f53"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_2": { - "refs": ["9e64bf7"] + "refs": ["adb1ee3"] }, "www_new_analytical_operations/operations/02_sum/Column_Groupped_Column_to_Bar": { - "refs": ["cc3aff6"] + "refs": ["3e4d864"] }, "www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_1": { - "refs": ["3a72ef5"] + "refs": ["9d0c92b"] }, "www_new_analytical_operations/operations/02_sum/Column_Stacked_Column_2": { - "refs": ["e85fe1c"] + "refs": ["766cacb"] }, "www_new_analytical_operations/operations/02_sum/Coxcomb_Coxcomb_to_Donut": { - "refs": ["7af195d"] + "refs": ["98bfd0d"] }, "www_new_analytical_operations/operations/02_sum/Line_Line_3": { "refs": ["c108bef"] diff --git a/test/e2e/tests/config_tests.json b/test/e2e/tests/config_tests.json index e5c5e50f7..46e459393 100644 --- a/test/e2e/tests/config_tests.json +++ b/test/e2e/tests/config_tests.json @@ -41,7 +41,7 @@ "refs": ["2ac83c5"] }, "dimension_axis_title": { - "refs": ["33278a6"] + "refs": ["3b54a82"] }, "dimension_axis_density": { "refs": ["0de86a3"] diff --git a/test/e2e/tests/fixes.json b/test/e2e/tests/fixes.json index 2ddbf8e0c..a1f174584 100644 --- a/test/e2e/tests/fixes.json +++ b/test/e2e/tests/fixes.json @@ -50,7 +50,7 @@ "refs": ["034ee91"] }, "47977099": { - "refs": ["2845349"] + "refs": ["1310b69"] }, "53913538": { "refs": ["90f6d38"] From fe9ec9d7dca0b934bb631e4e9be6c6d3538be86a Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Mon, 9 Sep 2024 17:53:31 +0200 Subject: [PATCH 3/3] Fix testcases --- test/e2e/test_cases/test_cases.json | 4 ++-- test/e2e/tests/config_tests.json | 2 +- test/e2e/tests/fixes.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/test_cases/test_cases.json b/test/e2e/test_cases/test_cases.json index 021e7a87e..1c472d1f8 100644 --- a/test/e2e/test_cases/test_cases.json +++ b/test/e2e/test_cases/test_cases.json @@ -185,13 +185,13 @@ "refs": ["dae308e"] }, "data_fault_and_formats/column_rectangle_less_disc": { - "refs": ["e84920a"] + "refs": ["f2cce92"] }, "data_fault_and_formats/column_rectangle_more_conti": { "refs": ["7ebabe4"] }, "data_fault_and_formats/column_rectangle_more_disc": { - "refs": ["2c2e36e"] + "refs": ["87e3a08"] }, "data_fault_and_formats/rectangle_data_cube": { "refs": ["e504add"] diff --git a/test/e2e/tests/config_tests.json b/test/e2e/tests/config_tests.json index 46e459393..e5c5e50f7 100644 --- a/test/e2e/tests/config_tests.json +++ b/test/e2e/tests/config_tests.json @@ -41,7 +41,7 @@ "refs": ["2ac83c5"] }, "dimension_axis_title": { - "refs": ["3b54a82"] + "refs": ["33278a6"] }, "dimension_axis_density": { "refs": ["0de86a3"] diff --git a/test/e2e/tests/fixes.json b/test/e2e/tests/fixes.json index a1f174584..2ddbf8e0c 100644 --- a/test/e2e/tests/fixes.json +++ b/test/e2e/tests/fixes.json @@ -50,7 +50,7 @@ "refs": ["034ee91"] }, "47977099": { - "refs": ["1310b69"] + "refs": ["2845349"] }, "53913538": { "refs": ["90f6d38"]