CategoryAxis: update category axis from dataset labels

fair-acc · Sep 27, 2023 · 849e8d4 · 849e8d4
1 parent ee5fb7d
commit 849e8d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/Chart.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/Chart.java
@@ -27,6 +27,7 @@
 import io.fair_acc.bench.MeasurementRecorder;
 import io.fair_acc.chartfx.axes.Axis;
 import io.fair_acc.chartfx.axes.spi.AbstractAxis;
+import io.fair_acc.chartfx.axes.spi.CategoryAxis;
 import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis;
 import io.fair_acc.chartfx.legend.Legend;
 import io.fair_acc.chartfx.legend.spi.DefaultLegend;
@@ -515,6 +516,14 @@ protected void runPreLayout() {
             }
         }
 
+        if (getBitState().isDirty(ChartBits.DataSetData)) {
+            for (Axis axis : getAxes()) {
+                if (axis instanceof CategoryAxis categoryAxis) { // update category axes
+                    getRenderers().stream().filter(renderer -> renderer.getAxes().contains(categoryAxis)).findFirst().flatMap(renderer -> renderer.getDatasets().stream().findFirst()).ifPresent(categoryAxis::updateCategories);
+                }
+            }
+        }
+
         for (ChartPlugin plugin : plugins) {
             plugin.runPreLayout();
         }

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java
@@ -85,6 +85,7 @@ public void updateAxes() {
         if (yAxis == null) {
             yAxis = chart.getYAxis();
         }
+        getAxes().setAll(xAxis, yAxis);
     }
 
     protected Axis ensureAxisInChart(Axis axis) {

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXYZ.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXYZ.java
@@ -35,6 +35,7 @@ public void updateAxes() {
         if (zAxis == null) {
             zAxis = ensureAxisInChart(createZAxis());
         }
+        getAxes().add(zAxis);
     }
 
     @Override