From e213742165773d376e934cca3b4e5dfe62b5b6f1 Mon Sep 17 00:00:00 2001 From: David Vegh Date: Thu, 28 Nov 2024 12:03:53 +0100 Subject: [PATCH 1/3] Set version to 0.16.0 --- .../workflows/docker-vizzu-dev-desktop.yml | 2 +- .github/workflows/docker-vizzu-dev-wasm.yml | 2 +- CHANGELOG.md | 2 ++ CONTRIBUTING.md | 4 +-- src/chart/main/version.cpp | 2 +- tools/ci/gcp/cloudbuild/cloudbuild.yaml | 26 +++++++++---------- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-vizzu-dev-desktop.yml b/.github/workflows/docker-vizzu-dev-desktop.yml index 3dce230ce..f1d764790 100644 --- a/.github/workflows/docker-vizzu-dev-desktop.yml +++ b/.github/workflows/docker-vizzu-dev-desktop.yml @@ -24,6 +24,6 @@ jobs: - name: Build and Publish run: | IMAGE="vizzu-dev-desktop" - IMAGE_NAME="vizzu/$IMAGE:0.15" + IMAGE_NAME="vizzu/$IMAGE:0.16" docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . docker push $IMAGE_NAME diff --git a/.github/workflows/docker-vizzu-dev-wasm.yml b/.github/workflows/docker-vizzu-dev-wasm.yml index dfdb03bf5..6ca6b230a 100644 --- a/.github/workflows/docker-vizzu-dev-wasm.yml +++ b/.github/workflows/docker-vizzu-dev-wasm.yml @@ -24,6 +24,6 @@ jobs: - name: Build and Publish run: | IMAGE="vizzu-dev-wasm" - IMAGE_NAME="vizzu/$IMAGE:0.15" + IMAGE_NAME="vizzu/$IMAGE:0.16" docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . docker push $IMAGE_NAME diff --git a/CHANGELOG.md b/CHANGELOG.md index f8061d278..80eddefd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [0.16.0] - 2024-11-28 + ### Fixed - Fix align on fake-split charts diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e54b0b7b..0475d862c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,7 +70,7 @@ docker run -i -t -v .:/workspace vizzu/vizzu-dev-desktop bash or you can use a specific version of the prebuilt image: ```sh -docker run -i -t -v .:/workspace vizzu/vizzu-dev-desktop:0.15 bash +docker run -i -t -v .:/workspace vizzu/vizzu-dev-desktop:0.16 bash ``` Run the following commands to build and run the `WASM` version's development @@ -84,7 +84,7 @@ docker run -i -t -v .:/workspace vizzu/vizzu-dev-wasm bash or you can use a specific version of the prebuilt image: ```sh -docker run -i -t -v .:/workspace vizzu/vizzu-dev-wasm:0.15 bash +docker run -i -t -v .:/workspace vizzu/vizzu-dev-wasm:0.16 bash ``` ### Building the project diff --git a/src/chart/main/version.cpp b/src/chart/main/version.cpp index 4541e656c..92ff16a63 100644 --- a/src/chart/main/version.cpp +++ b/src/chart/main/version.cpp @@ -2,6 +2,6 @@ #include "base/app/version.h" -const App::Version Vizzu::Main::version(0, 15, 0); +const App::Version Vizzu::Main::version(0, 16, 0); const char *const Vizzu::Main::siteUrl = "https://vizzu.io/"; diff --git a/tools/ci/gcp/cloudbuild/cloudbuild.yaml b/tools/ci/gcp/cloudbuild/cloudbuild.yaml index 9ddb85f09..f3d9ac60d 100644 --- a/tools/ci/gcp/cloudbuild/cloudbuild.yaml +++ b/tools/ci/gcp/cloudbuild/cloudbuild.yaml @@ -3,15 +3,15 @@ steps: id: pull_wasm waitFor: - '-' - args: ['pull', 'vizzu/vizzu-dev-wasm:0.15'] + args: ['pull', 'vizzu/vizzu-dev-wasm:0.16'] - name: 'gcr.io/cloud-builders/docker' id: pull_desktop waitFor: - '-' - args: ['pull', 'vizzu/vizzu-dev-desktop:0.15'] + args: ['pull', 'vizzu/vizzu-dev-desktop:0.16'] - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: init waitFor: - pull_wasm @@ -24,7 +24,7 @@ steps: ./tools/ci/run/init-py.sh dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: check_src waitFor: - init @@ -41,7 +41,7 @@ steps: npm run lint:src fi dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: check_docs waitFor: - init @@ -58,7 +58,7 @@ steps: npm run lint:docs fi dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: check_tools waitFor: - init @@ -77,7 +77,7 @@ steps: fi dir: /workspace - - name: vizzu/vizzu-dev-desktop:0.15 + - name: vizzu/vizzu-dev-desktop:0.16 id: build_desktop_clangformat waitFor: - pull_desktop @@ -97,7 +97,7 @@ steps: fi dir: /workspace - - name: vizzu/vizzu-dev-desktop:0.15 + - name: vizzu/vizzu-dev-desktop:0.16 id: build_desktop_clangtidy waitFor: - build_desktop_clangformat @@ -113,7 +113,7 @@ steps: ./tools/ci/run/pkg-build-desktop-clangtidy.sh fi dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: build_wasm waitFor: - build_desktop_clangformat @@ -134,7 +134,7 @@ steps: ./tools/ci/run/pkg-build-js.sh dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: lib_sha waitFor: - build_wasm @@ -157,7 +157,7 @@ steps: fi dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: test waitFor: - lib_sha @@ -172,7 +172,7 @@ steps: fi dir: /workspace - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: docs waitFor: - test @@ -215,7 +215,7 @@ steps: - VIZZUHQ_GITHUB_USER - VIZZUHQ_GITHUB_EMAIL - - name: vizzu/vizzu-dev-wasm:0.15 + - name: vizzu/vizzu-dev-wasm:0.16 id: publish waitFor: - docs From f14abbc311b1fc9853196214a123a55418b41e6a Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Thu, 28 Nov 2024 12:37:11 +0100 Subject: [PATCH 2/3] rearrange changelog --- CHANGELOG.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2e167c2..517dac372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,34 +10,37 @@ - Drilldown on split chart is fade. - Fix aggregate on split chart. - Do not interpolate hiding/showing legend -- Fix aggregator interface for 'set' channel parameter: +- Remove rare fantom empty marker space on scrollable legend. +- Same legend with different series are not interpolated. +- Different legend with same series are interpolated. +- Invisible axis labels are not draw. +- Fix chaotic axis labels on sorted chart with multiple dimension. +- Fix dimension axis guides on sorted chart. +- Fix NaN handling on axes and size measures other aggregators than sum. +- Do not draw dimension axis labels when the middle of the text is off the plot. + +### Changed + +- Mekko charts: The main axis handled as dimension. +- Change aggregator interface for 'set' channel parameter: - From now not accepted the same dimension on the same channel. - From now, it is prohibited to set multiple measure on one channel. - From now, it is prohibited to set only aggregator without series name. - Fix series parsing when aggregator comes first. - - Fix disappearing dimension when aggregated dimension was already set. -- Fix legend with multiple dimension duplicated markers: + - Fix disappearing dimension when aggregated dimension was already set. +- Change legend with multiple dimension duplicated markers: - Markers of color are never merged. - Markers of size are always merged. - Markers of lightness are only merged when labelLevel == 0. - When merge happens, the marker shows the middle value of lightness. -- Remove rare fantom empty marker space on scrollable legend. -- Same legend with different series are not interpolated. -- Different legend with same series are interpolated. -- Invisible axis labels are not draw. -- Fix chaotic axis labels on sorted chart with multiple dimension. -- Fix Mekko charts: The main axis handled as dimension. -- LabelLevel can be used to handle measure axis as dimension axis. -- Enable dimension axis ticks and interlacing. -- Enable measure axis guides. -- Fix dimension axis guides on sorted chart. -- Fix NaN handling on axes and size measures other aggregators than sum. -- Add meaning to crossing interlacing. -- Do not draw dimension axis labels when the middle of the text is off the plot. ### Added - Add spacing property for plot axis style structure. +- LabelLevel can be used to handle measure axis as dimension axis. +- Enable dimension axis ticks and interlacing. +- Enable measure axis guides. +- Add meaning to crossing interlacing. ## [0.15.0] - 2024-10-28 From 1a4dd74a31f97869d1d87975e222e9a625ee1c43 Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Thu, 28 Nov 2024 14:49:41 +0100 Subject: [PATCH 3/3] not serialize aggregator on dimension --- src/dataframe/old/datatable.cpp | 9 +++++++++ src/dataframe/old/types.h | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/dataframe/old/datatable.cpp b/src/dataframe/old/datatable.cpp index 33ab6d87e..d3baca7cf 100644 --- a/src/dataframe/old/datatable.cpp +++ b/src/dataframe/old/datatable.cpp @@ -85,6 +85,15 @@ void SeriesIndex::setAggr(const std::string &aggr) aggregator = Refl::get_enum(aggr); } +std::string SeriesIndex::toJSON() const +{ + std::string res; + Conv::JSONObj obj{res}; + obj("name", name); + if (aggregator) obj("aggregator", Conv::toString(*aggregator)); + return res; +} + DataCube::iterator_t DataCube::begin() const { iterator_t res{this, diff --git a/src/dataframe/old/types.h b/src/dataframe/old/types.h index 3625277bb..5684a7c2c 100644 --- a/src/dataframe/old/types.h +++ b/src/dataframe/old/types.h @@ -69,11 +69,7 @@ class SeriesIndex [[nodiscard]] bool isDimension() const { return !aggregator; } - [[nodiscard]] consteval static auto members() - { - return std::tuple{&SeriesIndex::name, - &SeriesIndex::aggregator}; - } + [[nodiscard]] std::string toJSON() const; }; using SeriesList = Type::UniqueList;