Merge pull request #632 from vizzuhq/axis_refactor_v12-13-rev

Axis refactor v12 13 review changes

Author: schaumb

.github/workflows/docker-vizzu-dev-desktop.yml

@@ -1,7 +1,7 @@
 name: Docker publish vizzu-dev-desktop
 
 on:
-    push:
+    pull_request:
         branches-ignore:
             - main
         paths:

.github/workflows/docker-vizzu-dev-wasm.yml

@@ -1,7 +1,7 @@
 name: Docker publish vizzu-dev-wasm
 
 on:
-    push:
+    pull_request:
         branches-ignore:
             - main
         paths:

CHANGELOG.md

@@ -8,6 +8,8 @@
 - Waterfall chart preset not aligned.
 - Split chart count negative values too.
 - Split chart handled when same dimension on main and sub axis.
+- Add record didn't handle when a measure got an empty string.
+- Fix no fontparent set bug.
 
 ### Changed
 
@@ -20,8 +22,8 @@
 
 ### Added
 
-- Separate Channel properties to AxisChannel properties at config.
-- Move split align sort and reverse to AxisChannel
+- Separate AxisChannel properties from Channel properties at config.
+- Move split align sort and reverse from config to AxisChannel config.
 - Add new sorting strategy: 'byLabel'.
 - Enable split and align on mainAxis.
 - Add 'isContiguous' property for dimension series

src/apps/weblib/typeschema-api/config.yaml

@@ -78,6 +78,7 @@ definitions:
                     - { type: string, enum: [auto] }
 
     AxisChannel:
+        $extends: Channel
         description: |
             AxisChannels are special channel settings for the positional channels.
         type: object
@@ -138,18 +139,14 @@ definitions:
         type: object
         properties:
             x:
-                allOf:
-                    - $ref: Channel
-                    - $ref: AxisChannel
+                $ref: AxisChannel
                 description: |
                     Parameters for the X-axis, determining the position of the markers on the 
                     x-axis - or their angle when using polar coordinates. 
                     Note: leaving x and y channels empty will result in a 
                     chart "without coordinates" like a Treemap or a Bubble Chart.
             y:
-                allOf:
-                    - $ref: Channel
-                    - $ref: AxisChannel
+                $ref: AxisChannel
                 description: |
                     Parameters for the Y-axis, determining the position of the markers on the 
                     y-axis - or their radius when using polar coordinates) .

src/chart/animator/keyframe.cpp

@@ -71,6 +71,7 @@ void Keyframe::prepareActual()
 	prepareActualMarkersInfo();
 
 	actual = std::make_shared<Gen::Plot>(*source);
+	actual->getStyle().setup();
 	actual->detachOptions();
 }
 
@@ -92,6 +93,7 @@ void Keyframe::copyTarget()
 	if (!targetCopy) {
 		targetCopy = target;
 		target = std::make_shared<Gen::Plot>(*targetCopy);
+		target->getStyle().setup();
 		target->detachOptions();
 	}
 }

src/chart/generator/plot.cpp

@@ -58,7 +58,9 @@ Plot::Plot(PlotOptionsPtr opts, Styles::Chart style) :
     guides(*opts),
     options(std::move(opts)),
     style(std::move(style))
-{}
+{
+	this->style.setup();
+}
 
 void Plot::detachOptions()
 {

src/chart/main/chart.cpp

@@ -29,6 +29,7 @@ Chart::Chart() :
         *events.animation.begin,
         *events.animation.complete)
 {
+	computedStyles.setup();
 	animator.onDraw.attach(
 	    [this](const Gen::PlotPtr &actPlot)
 	    {
@@ -72,8 +73,9 @@ void Chart::animate(Anim::Animation::OnComplete &&onComplete)
 		    }
 		    else {
 			    *nextOptions = prevOptions;
-			    actStyles = prevStyles;
+			    setStyles(prevStyles);
 			    computedStyles = plot->getStyle();
+			    computedStyles.setup();
 		    }
 	    });
 
@@ -132,6 +134,7 @@ Gen::PlotPtr Chart::plot(const Gen::PlotOptionsPtr &options)
 	Styles::Sheet::setAfterStyles(*res, layout.boundary.size);
 
 	computedStyles = res->getStyle();
+	computedStyles.setup();
 
 	return res;
 }

src/chart/main/style.cpp

@@ -584,7 +584,7 @@ struct FontParentSetter
 	{}
 };
 
-void Chart::setup()
+void Chart::setup() &
 {
 	Refl::visit(FontParentSetter{this}, *this);
 	fontParent = &getDefaultFont();

src/chart/main/style.h

@@ -401,7 +401,7 @@ struct Chart : Padding, Box, Font, ChartParams
 	static const Gfx::ColorPalette &getDefaultColorPalette();
 	static Chart def();
 
-	void setup();
+	void setup() &;
 };
 
 }

src/chart/main/stylesheet.cpp

@@ -51,6 +51,7 @@ Chart Sheet::getFullParams(const Gen::PlotOptionsPtr &options,
 void Sheet::calcDefaults(const Geom::Size &size)
 {
 	defaultParams = Chart::def();
+	defaultParams.setup();
 
 	defaultParams.fontSize = Gfx::Length{baseFontSize(size, true)};
 
@@ -219,7 +220,6 @@ void Sheet::setData()
 void Sheet::setAfterStyles(Gen::Plot &plot, const Geom::Size &size)
 {
 	auto &style = plot.getStyle();
-	style.setup();
 
 	if (auto &xLabel =
 	        style.plot