Layout and notification system

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

@@ -1,30 +1,22 @@
 package io.fair_acc.chartfx;
 
-import java.security.InvalidParameterException;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Deque;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import io.fair_acc.chartfx.axes.spi.AxisRange;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.application.Platform;
+import io.fair_acc.chartfx.utils.PropUtil;
+import io.fair_acc.dataset.events.ChartBits;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
-import javafx.scene.Node;
 import javafx.scene.canvas.GraphicsContext;
-import javafx.util.Duration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,9 +49,6 @@ public class XYChart extends Chart {
     protected final BooleanProperty polarPlot = new SimpleBooleanProperty(this, "polarPlot", false);
     private final ObjectProperty<PolarTickStep> polarStepSize = new SimpleObjectProperty<>(PolarTickStep.THIRTY);
     private final GridRenderer gridRenderer = new GridRenderer();
-    protected final ChangeListener<? super Boolean> gridLineVisibilitychange = (ob, o, n) -> requestLayout();
-    private long lastCanvasUpdate;
-    private boolean callCanvasUpdateLater;
 
     /**
      * Construct a new XYChart with the given axes.
@@ -97,11 +86,18 @@ public XYChart(final Axis... axes) {
             getAxes().add(axis);
         }
 
-        gridRenderer.horizontalGridLinesVisibleProperty().addListener(gridLineVisibilitychange);
-        gridRenderer.verticalGridLinesVisibleProperty().addListener(gridLineVisibilitychange);
-        gridRenderer.getHorizontalMinorGrid().visibleProperty().addListener(gridLineVisibilitychange);
-        gridRenderer.getVerticalMinorGrid().visibleProperty().addListener(gridLineVisibilitychange);
-        gridRenderer.drawOnTopProperty().addListener(gridLineVisibilitychange);
+        getChildren().add(0, gridRenderer);
+        PropUtil.runOnChange(getBitState().onAction(ChartBits.ChartCanvas),
+                gridRenderer.horizontalGridLinesVisibleProperty(),
+                gridRenderer.verticalGridLinesVisibleProperty(),
+                gridRenderer.getHorizontalMinorGrid().visibleProperty(),
+                gridRenderer.getVerticalMinorGrid().visibleProperty(),
+                gridRenderer.drawOnTopProperty(),
+                gridRenderer.getHorizontalMajorGrid().changeCounterProperty(),
+                gridRenderer.getVerticalMajorGrid().changeCounterProperty(),
+                gridRenderer.getHorizontalMinorGrid().changeCounterProperty(),
+                gridRenderer.getVerticalMinorGrid().changeCounterProperty()
+        );
 
         this.setAnimated(false);
         getRenderers().addListener(this::rendererChanged);
@@ -120,7 +116,12 @@ public ObservableList<DataSet> getAllDatasets() {
 
         allDataSets.clear();
         allDataSets.addAll(getDatasets());
-        getRenderers().stream().filter(renderer -> !(renderer instanceof LabelledMarkerRenderer)).forEach(renderer -> allDataSets.addAll(renderer.getDatasets()));
+        for (Renderer renderer : getRenderers()) {
+            if(renderer instanceof LabelledMarkerRenderer){
+                continue;
+            }
+            allDataSets.addAll(renderer.getDatasets());
+        }
 
         return allDataSets;
     }
@@ -253,26 +254,17 @@ public void updateAxisRange() {
             return;
         }
 
-        // lock datasets to prevent writes while updating the axes
-        ObservableList<DataSet> dataSets = this.getAllDatasets();
-        // check that all registered data sets have proper ranges defined
-        dataSets.parallelStream()
-                .forEach(dataset -> dataset.getAxisDescriptions().parallelStream().filter(axisD -> !axisD.isDefined()).forEach(axisDescription -> dataset.lock().writeLockGuard(() -> dataset.recomputeLimits(axisDescription.getDimIndex()))));
-
-        final ArrayDeque<DataSet> lockQueue = new ArrayDeque<>(dataSets);
-        recursiveLockGuard(lockQueue, () -> getAxes().forEach(chartAxis -> {
-            final List<DataSet> dataSetForAxis = getDataSetForAxis(chartAxis);
-            updateNumericAxis(chartAxis, dataSetForAxis);
-            // chartAxis.requestAxisLayout()
-        }));
-    }
+        // Check that all registered data sets have proper ranges defined. The datasets
+        // are already locked, so we can use parallel stream without extra synchronization.
+        getAllDatasets().stream()
+                .filter(DataSet::isVisible)
+                .forEach(dataset -> dataset.getAxisDescriptions().parallelStream()
+                        .filter(axisD -> !axisD.isDefined())
+                        .forEach(axisDescription -> dataset.recomputeLimits(axisDescription.getDimIndex())));
+
+        // Update each of the axes
+        getAxes().forEach(chartAxis -> updateNumericAxis(chartAxis, getDataSetForAxis(chartAxis)));
 
-    protected void recursiveLockGuard(final Deque<DataSet> queue, final Runnable runnable) { // NOPMD
-        if (queue.isEmpty()) {
-            runnable.run();
-        } else {
-            queue.pop().lock().readLockGuard(() -> recursiveLockGuard(queue, runnable));
-        }
     }
 
     /**
@@ -309,7 +301,7 @@ protected void axesChanged(final ListChangeListener.Change<? extends Axis> chang
             });
         }
 
-        requestLayout();
+        invalidate();
     }
 
     /**
@@ -348,55 +340,47 @@ protected List<DataSet> getDataSetForAxis(final Axis axis) {
         return retVal;
     }
 
+    @Override
+    protected void runPreLayout() {
+        for (Renderer renderer : getRenderers()) {
+            // check for and add required axes
+            checkRendererForRequiredAxes(renderer);
+        }
+        super.runPreLayout();
+    }
+
     @Override
     protected void redrawCanvas() {
         if (DEBUG && LOGGER.isDebugEnabled()) {
             LOGGER.debug("   xychart redrawCanvas() - pre");
         }
-        setAutoNotification(false);
         FXUtils.assertJavaFxThread();
         final long now = System.nanoTime();
-        final double diffMillisSinceLastUpdate = TimeUnit.NANOSECONDS.toMillis(now - lastCanvasUpdate);
-        if (diffMillisSinceLastUpdate < XYChart.BURST_LIMIT_MS) {
-            if (!callCanvasUpdateLater) {
-                callCanvasUpdateLater = true;
-                // repaint 20 ms later in case this was just a burst operation
-                final KeyFrame kf1 = new KeyFrame(Duration.millis(20), e -> requestLayout());
-
-                final Timeline timeline = new Timeline(kf1);
-                Platform.runLater(timeline::play);
-            }
-
-            return;
-        }
         if (DEBUG && LOGGER.isDebugEnabled()) {
             LOGGER.debug("   xychart redrawCanvas() - executing");
             LOGGER.debug("   xychart redrawCanvas() - canvas size = {}", String.format("%fx%f", canvas.getWidth(), canvas.getHeight()));
         }
 
-        lastCanvasUpdate = now;
-        callCanvasUpdateLater = false;
-
         final GraphicsContext gc = canvas.getGraphicsContext2D();
         gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
 
+        // Bottom grid
         if (!gridRenderer.isDrawOnTop()) {
             gridRenderer.render(gc, this, 0, null);
         }
 
+        // Data
         int dataSetOffset = 0;
         for (final Renderer renderer : getRenderers()) {
-            // check for and add required axes
-            checkRendererForRequiredAxes(renderer);
-
             final List<DataSet> drawnDataSets = renderer.render(gc, this, dataSetOffset, getDatasets());
             dataSetOffset += drawnDataSets == null ? 0 : drawnDataSets.size();
         }
 
+        // Top grid
         if (gridRenderer.isDrawOnTop()) {
             gridRenderer.render(gc, this, 0, null);
         }
-        setAutoNotification(true);
+
         if (DEBUG && LOGGER.isDebugEnabled()) {
             LOGGER.debug("   xychart redrawCanvas() - done");
         }
@@ -407,14 +391,13 @@ protected static void updateNumericAxis(final Axis axis, final List<DataSet> dat
             return;
         }
 
-        final boolean oldAutoState = axis.autoNotification().getAndSet(false);
         final Side side = axis.getSide();
         final boolean isHorizontal = side.isHorizontal();
 
         // Determine the range of all datasets for this axis
         final AxisRange dsRange = new AxisRange();
         dsRange.clear();
-        dataSets.stream().filter(DataSet::isVisible).forEach(dataset -> dataset.lock().readLockGuard(() -> {
+        dataSets.stream().filter(DataSet::isVisible).forEach(dataset -> {
             if (dataset.getDimension() > 2 && (side == Side.RIGHT || side == Side.TOP)) {
                 if (!dataset.getAxisDescription(DataSet.DIM_Z).isDefined()) {
                     dataset.recomputeLimits(DataSet.DIM_Z);
@@ -429,11 +412,11 @@ protected static void updateNumericAxis(final Axis axis, final List<DataSet> dat
                 dsRange.add(dataset.getAxisDescription(nDim).getMin());
                 dsRange.add(dataset.getAxisDescription(nDim).getMax());
             }
-        }));
+        });
 
         // Update the auto range
         final boolean changed;
-        if (axis.isAutoGrowRanging()) {
+        if (axis.isAutoGrowRanging() && axis.getAutoRange().isDefined()) {
             changed = axis.getAutoRange().add(dsRange);
         } else {
             changed = axis.getAutoRange().set(dsRange);
@@ -442,14 +425,12 @@ protected static void updateNumericAxis(final Axis axis, final List<DataSet> dat
         // Trigger a redraw
         if (changed && (axis.isAutoRanging() || axis.isAutoGrowRanging())) {
             axis.invalidateRange();
-            axis.requestAxisLayout();
         }
 
         // TODO: is this used for anything? can it be removed?
         double axisLength = axis.getLength() == 0 ? 1 : axis.getLength();
         axis.getAutoRange().setAxisLength(axisLength, side);
         axis.getUserRange().setAxisLength(axisLength, side);
 
-        axis.autoNotification().set(oldAutoState);
     }
 }

chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/Axis.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import io.fair_acc.dataset.events.BitState;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -202,18 +203,6 @@ public interface Axis extends AxisDescription {
      */
     BooleanProperty invertAxisProperty();
 
-    /**
-     * invoke object within update listener list
-     *
-     * @param updateEvent the event the listeners are notified with
-     * @param executeParallel {@code true} execute event listener via parallel executor service
-     */
-    @Override
-    default void invokeListener(final UpdateEvent updateEvent, final boolean executeParallel) {
-        // implemented for forwarding purposes
-        AxisDescription.super.invokeListener(updateEvent, executeParallel);
-    }
-
     /**
      * This is true when the axis determines its range from the data automatically and grows it if necessary
      *

chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/AxisLabelFormatter.java

@@ -1,8 +1,7 @@
 package io.fair_acc.chartfx.axes;
 
-import java.util.List;
-
 import io.fair_acc.chartfx.axes.spi.format.DefaultTickUnitSupplier;
+import io.fair_acc.dataset.spi.fastutil.DoubleArrayList;
 import javafx.beans.property.ObjectProperty;
 
 /**
@@ -61,6 +60,6 @@ public interface AxisLabelFormatter {
      * @param newMajorTickMarks for which the labels should be computed
      * @param unitScaling scaling applied to the raw data set units
      */
-    void updateFormatter(List<Double> newMajorTickMarks, double unitScaling);
+    void updateFormatter(DoubleArrayList newMajorTickMarks, double unitScaling);
 
 }