Bump versions and CI

.github/workflows/ci.yml

@@ -3,21 +3,21 @@ name: Java CI
 
 on: [push, pull_request]
 env:
-  JAVA_REFERENCE_VERSION: 11
+  JAVA_REFERENCE_VERSION: 17
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        java: [11, 17, 19]
+        java: [17, 20]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
     environment: coverage # open environment, no critical secrets
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 25
       - name: Set version environment for version string

.github/workflows/coverity.yml

@@ -19,12 +19,12 @@ jobs:
     environment: coverity # environment needs to be manually triggered only use on demand
     steps:
       - name: Checkout branch on that the Coverity scan was dispatched
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         if: ${{ github.event_name == 'workflow_run' }}
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
           fetch-depth: 25
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         if: ${{ github.event_name != 'workflow_run' }}
         with:
           fetch-depth: 25
@@ -41,15 +41,15 @@ jobs:
           echo "setting env:"
           cat ${GITHUB_ENV}
       - name: Cache the Maven packages to speed up build
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Set up JDK11
-        uses: actions/setup-java@v2.1.0
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Download Coverity Build Tool
         run: |

chartfx-chart/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>testfx-junit5</artifactId>
-            <version>4.0.16-alpha</version>
+            <version>4.0.17</version>
             <scope>test</scope>
         </dependency>
         <dependency>

chartfx-chart/src/main/java/io/fair_acc/chartfx/XYChart.java

@@ -14,6 +14,7 @@
 import io.fair_acc.bench.MeasurementRecorder;
 import io.fair_acc.chartfx.axes.Axis;
 import io.fair_acc.chartfx.axes.spi.AxisRange;
+import io.fair_acc.chartfx.axes.spi.CategoryAxis;
 import io.fair_acc.chartfx.plugins.ChartPlugin;
 import io.fair_acc.chartfx.renderer.PolarTickStep;
 import io.fair_acc.chartfx.renderer.Renderer;
@@ -228,6 +229,20 @@
             if (changed && (axis.isAutoRanging() || axis.isAutoGrowRanging())) {
                 axis.invalidateRange();
             }
+
+            // Feature for backwards compatibility: Category axes that do not have
+            // their categories set copy the categories of the first dataset of the
+            // first renderer that is using this axis.
+            if (axis instanceof CategoryAxis catAxis) {
+                for (Renderer renderer : getRenderers()) {
+                    if (renderer.isUsingAxis(axis)) {
+                        if (!renderer.getDatasets().isEmpty()) {
+                            catAxis.updateCategories(renderer.getDatasets().get(0));
+                        }
+                        break;
+                    }
+                }
+            }
         }
     }
 

chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/EditDataSet.java

@@ -5,6 +5,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
+import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -53,6 +54,7 @@
 import io.fair_acc.dataset.DataSet;
 import io.fair_acc.dataset.EditConstraints;
 import io.fair_acc.dataset.EditableDataSet;
+import io.fair_acc.dataset.events.ChartBits;
 
 /**
  *
@@ -151,6 +153,14 @@ public class EditDataSet extends TableViewer {
         }
     };
 
+    @Override
+    public void runPostLayout() {
+        super.runPostLayout();
+        if (getChart().getBitState().isDirty(ChartBits.AxisMask | ChartBits.DataSetMask)) {
+            updateMarker();
+        }
+    }
+
     /**
      * Creates an event handler that handles a mouse drag on the node.
      */
@@ -967,11 +977,6 @@ protected class SelectedDataPoint extends Circle {
             setOnMouseReleased(dragOver);
             setOnMouseDragOver(dragOver);
             // this.setOnMouseExited(dragOver);
-
-            // TODO: what are these?
-            //            xAxis.addListener(evt -> FXUtils.runFX(() -> this.setCenterX(getX())));
-            //            yAxis.addListener(evt -> FXUtils.runFX(() -> this.setCenterY(getY())));
-            //            dataSet.addListener(e -> FXUtils.runFX(this::update));
         }
 
         public void applyDrag(final double deltaX, final double deltaY) {

chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/UpdateAxisLabels.java

@@ -27,8 +27,10 @@
  * TODO: revisit this plugin. we should be able to turn this into a single chart listener and an update method (ennerf)
  * TODO: this is using Chart::getDataSets() which doesn't really exist anymore
  *
+ * @deprecated prototype which is not usable yet and has to be adopted to the new layout
  * @author akrimm
  */
+@Deprecated
 public class UpdateAxisLabels extends ChartPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(UpdateAxisLabels.class);
 

chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/AbstractChartMeasurement.java

@@ -3,6 +3,7 @@
 import static io.fair_acc.chartfx.axes.AxisMode.X;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -40,10 +41,7 @@
 import io.fair_acc.chartfx.Chart;
 import io.fair_acc.chartfx.axes.Axis;
 import io.fair_acc.chartfx.axes.AxisMode;
-import io.fair_acc.chartfx.plugins.AbstractSingleValueIndicator;
-import io.fair_acc.chartfx.plugins.ParameterMeasurements;
-import io.fair_acc.chartfx.plugins.XValueIndicator;
-import io.fair_acc.chartfx.plugins.YValueIndicator;
+import io.fair_acc.chartfx.plugins.*;
 import io.fair_acc.chartfx.plugins.measurements.utils.CheckedValueField;
 import io.fair_acc.chartfx.plugins.measurements.utils.DataSetSelector;
 import io.fair_acc.chartfx.plugins.measurements.utils.ValueIndicatorSelector;
@@ -301,14 +299,26 @@
     }
 
     protected void removeAction() {
+        // remove unused indicators
+        List<ChartPlugin> toRemove = new ArrayList<>();
+        getValueIndicatorsUser().forEach(ind -> {
+            if (!ind.isAutoRemove()) {
+                return;
+            }
+            boolean used = plugin.getChartMeasurements().stream().anyMatch(measurement -> measurement != this && measurement.getValueIndicatorsUser().contains(ind));
+            if (!used) {
+                toRemove.add(ind);
+            }
+        });
+        plugin.getChart().getPlugins().removeAll(toRemove);
+
         getMeasurementPlugin().getChartMeasurements().remove(this);
         getMeasurementPlugin().getDataView().getChildren().remove(dataViewWindow);
         getMeasurementPlugin().getDataView().getVisibleChildren().remove(dataViewWindow);
         getMeasurementPlugin().getDataView().getUndockedChildren().remove(dataViewWindow);
         getValueIndicatorsUser().removeListener(valueIndicatorsUserChangeListener);
 
         removeSliderChangeListener();
-        cleanUpSuperfluousIndicators();
     }
 
     protected void removeSliderChangeListener() {
@@ -323,15 +333,6 @@
         });
     }
 
-    protected void cleanUpSuperfluousIndicators() {
-        final Chart chart = getMeasurementPlugin().getChart();
-        if (chart == null) {
-            return;
-        }
-        final List<AbstractSingleValueIndicator> allIndicators = chart.getPlugins().stream().filter(p -> p instanceof AbstractSingleValueIndicator).map(p -> (AbstractSingleValueIndicator) p).collect(Collectors.toList());
-        // TODO: allIndicators.stream().filter((final AbstractSingleValueIndicator indicator) -> indicator.isAutoRemove() && indicator.getBitState().isEmpty()).forEach((final AbstractSingleValueIndicator indicator) -> getMeasurementPlugin().getChart().getPlugins().remove(indicator));
-    }
-
     protected void updateSlider() {
         if (!valueIndicatorSelector.isReuseIndicators()) {
             getValueIndicatorsUser().clear();
@@ -340,7 +341,6 @@
         for (int i = 0; i < requiredNumberOfIndicators; i++) {
             updateSlider(i);
         }
-        cleanUpSuperfluousIndicators();
     }
 
     protected AbstractSingleValueIndicator updateSlider(final int requestedIndex) {

chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelector.java

@@ -126,8 +126,7 @@ protected void addNewIndicators(ChartPlugin newPlugin) {
                 valueIndicators.add((AbstractSingleValueIndicator) newPlugin);
             }
 
-            if (reuseIndicators.isSelected() && valueIndicatorsUser.size() < 2 && !valueIndicatorsUser.contains(newPlugin)) {
-                valueIndicatorsUser.add((AbstractSingleValueIndicator) newPlugin);
+            if (reuseIndicators.isSelected() && valueIndicatorsUser.size() < (indicatorListView.getSelectionModel().getSelectionMode() == SelectionMode.SINGLE ? 1 : 2) && !valueIndicatorsUser.contains(newPlugin)) {
                 indicatorListView.getSelectionModel().select((AbstractSingleValueIndicator) newPlugin);
             }
         }

chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/Renderer.java

@@ -95,6 +95,17 @@
         // empty by default
     }
 
+    /**
+     * Checks whether a renderer is actively using a given axis. The
+     * result is only valid after updateAxes has been called.
+     * <p>
+     * @param axis axis to be checked
+     * @return true if the renderer is actively using the given axis
+     */
+    default boolean isUsingAxis(Axis axis) {
+        return getAxes().contains(axis);
+    }
+
     /**
      * Updates the range for the specified axis.
      * Does nothing if the axis is not used.

chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java

@@ -12,6 +12,7 @@
 import io.fair_acc.chartfx.XYChart;
 import io.fair_acc.chartfx.axes.Axis;
 import io.fair_acc.chartfx.axes.spi.AxisRange;
+import io.fair_acc.chartfx.axes.spi.CategoryAxis;
 import io.fair_acc.chartfx.ui.css.DataSetNode;
 import io.fair_acc.dataset.DataSet;
 import io.fair_acc.dataset.utils.AssertUtils;
@@ -85,6 +86,22 @@
         if (yAxis == null) {
             yAxis = chart.getYAxis();
         }
+
+        // Update category axes (TODO: remove this API?)
+        if (!getDatasets().isEmpty()) {
+            var ds = getDatasets().get(0);
+            if (xAxis instanceof CategoryAxis xCat) {
+                xCat.updateCategories(ds);
+            }
+            if (yAxis instanceof CategoryAxis yCat) {
+                yCat.updateCategories(ds);
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsingAxis(Axis axis) {
+        return axis == xAxis || axis == yAxis;
     }
 
     protected Axis ensureAxisInChart(Axis axis) {

chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXYZ.java

@@ -37,6 +37,11 @@ public void updateAxes() {
         }
     }
 
+    @Override
+    public boolean isUsingAxis(Axis axis) {
+        return super.isUsingAxis(axis) || axis == zAxis;
+    }
+
     @Override
     public void updateAxisRange(Axis axis, AxisRange range) {
         super.updateAxisRange(axis, range);

chartfx-generate/pom.xml

@@ -27,26 +27,28 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.6.3</version>
+            <version>3.9.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.0</version>
+            <version>3.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
             <version>2.2.1</version>
-        </dependency>
+            <scope>provided</scope>
+         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin> <!-- move descriptor goal from process-classes to compile phase so that `mvn clean compile` works -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.9.0</version>
                 <executions>
                     <execution>
                         <id>earlierPluginXML</id>
@@ -73,6 +75,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin> <!-- attaching the javadoc fails the build because maven-project introduces a dependency with an invalid module descriptor -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-</project>
+</project>

chartfx-math/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.jafama</groupId>
             <artifactId>jafama</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

chartfx-samples/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>net.jafama</groupId>
             <artifactId>jafama</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.2</version>
         </dependency>
         <dependency> <!-- Hierarchy debugging -->
             <groupId>net.raumzeitfalle.fx</groupId>

chartfx-samples/src/main/java/io/fair_acc/sample/chart/EditDataSetSample.java

@@ -38,7 +38,6 @@ public Node getChartPanel(final Stage primaryStage) {
         chart.getPlugins().add(new EditAxis());
         chart.getPlugins().add(new EditDataSet());
         chart.getPlugins().add(new DataPointTooltip());
-        chart.getPlugins().add(new UpdateAxisLabels());
         root.getChildren().add(chart);
 
         final DoubleDataSet dataSet1 = new DoubleDataSet("data set #1 (full change)");

chartfx-samples/src/main/java/io/fair_acc/sample/chart/TransposedDataSetSample.java

@@ -156,7 +156,6 @@ private static XYChart getDefaultChart() {
         final XYChart chart = new XYChart();
         chart.getPlugins().add(new Zoomer());
         chart.getPlugins().add(new EditAxis());
-        chart.getPlugins().add(new UpdateAxisLabels());
         chart.getXAxis().setAutoRanging(true);
         chart.getYAxis().setAutoRanging(true);
         VBox.setVgrow(chart, Priority.ALWAYS);