CategoryAxis: update category axis from dataset labels

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

Hide file tree

Showing 6 changed files with 39 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,16 @@ 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.usedAxes().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/Renderer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/Renderer.java
@@ -1,11 +1,14 @@
 package io.fair_acc.chartfx.renderer;
 
+import java.util.List;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
 
 import io.fair_acc.bench.Measurable;
+import io.fair_acc.bench.MeasurementRecorder;
 import io.fair_acc.chartfx.Chart;
 import io.fair_acc.chartfx.axes.Axis;
 import io.fair_acc.chartfx.axes.spi.AxisRange;
@@ -142,4 +145,6 @@ default Node getNode() {
         // add nothing if not needed
         return null;
     }
+
+    List<Axis> usedAxes();
 }
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
@@ -1,6 +1,7 @@
 package io.fair_acc.chartfx.renderer.spi;
 
 import java.security.InvalidParameterException;
+import java.util.List;
 
 import javafx.geometry.Orientation;
 import javafx.scene.canvas.GraphicsContext;
@@ -40,6 +41,11 @@ private XYChart requireChartXY(Chart chart) {
                                             + this.getClass().getSimpleName());
     }
 
+    @Override
+    public List<Axis> usedAxes() {
+        return List.of(xAxis, yAxis);
+    }
+
     @Override
     public XYChart getChart() {
         return (XYChart) super.getChart();

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
@@ -71,6 +71,11 @@ public static DefaultNumericAxis createZAxis() {
         return zAxis;
     }
 
+    @Override
+    public List<Axis> usedAxes() {
+        return List.of(xAxis, yAxis, zAxis);
+    }
+
     public void shiftZAxisToLeft() {
         zAxis.setSide(Side.LEFT);
     }

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/GridRenderer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/GridRenderer.java
@@ -371,6 +371,11 @@ public int getGlobalIndexOffset() {
         return 0;
     }
 
+    @Override
+    public List<Axis> usedAxes() {
+        return List.of(chart.getXAxis(), chart.getYAxis());
+    }
+
     @Override
     public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
         return getClassCssMetaData();

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/MetaDataRenderer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/MetaDataRenderer.java
@@ -2,6 +2,8 @@
 
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
@@ -328,6 +330,11 @@ public BooleanProperty showInLegendProperty() {
         return null;
     }
 
+    @Override
+    public List<Axis> usedAxes() {
+        return Collections.emptyList();
+    }
+
     protected void updateInfoBoxLocation() {
         final Side side = getInfoBoxSide();