Deterministic layout

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

@@ -9,6 +9,7 @@
 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;
@@ -17,7 +18,6 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -60,7 +60,6 @@ public class XYChart extends Chart {
     protected final ChangeListener<? super Boolean> gridLineVisibilitychange = (ob, o, n) -> requestLayout();
     private long lastCanvasUpdate;
     private boolean callCanvasUpdateLater;
-    private final ChangeListener<Side> axisSideChangeListener = this::axisSideChanged;
 
     /**
      * Construct a new XYChart with the given axes.
@@ -300,59 +299,19 @@ protected void axesChanged(final ListChangeListener.Change<? extends Axis> chang
         while (change.next()) {
             change.getRemoved().forEach(axis -> {
                 AssertUtils.notNull("to be removed axis is null", axis);
-                // check if axis is associated with an existing renderer, if yes
-                // -&gt; throw an exception
-                // remove from axis.side property side listener
-                removeFromAllAxesPanes(axis);
-                axis.sideProperty().removeListener(axisSideChangeListener);
+                // TODO: throw an exception if axis is associated with an existing renderer?
             });
 
             change.getAddedSubList().forEach(axis -> {
                 // check if axis is associated with an existing renderer,
                 // if yes -&gt; throw an exception
                 AssertUtils.notNull("to be added axis is null", axis);
-
-                final Side side = axis.getSide();
-                if (side == null) {
-                    throw new InvalidParameterException("axis '" + axis.getName() + "' has 'null' as side being set");
-                }
-                if (axis instanceof Node && !getAxesPane(axis.getSide()).getChildren().contains(axis)) {
-                    getAxesPane(axis.getSide()).getChildren().add((Node) axis);
-                }
-
-                axis.sideProperty().addListener(axisSideChangeListener);
             });
         }
 
         requestLayout();
     }
 
-    protected void axisSideChanged(final ObservableValue<? extends Side> change, final Side oldValue, final Side newValue) {
-        if (newValue != null && newValue.equals(oldValue)) {
-            return;
-        }
-        // loop through all registered axis
-        for (final Axis axis : axesList) {
-            if (axis.getSide() == null) {
-                // remove axis from all axis panes
-                removeFromAllAxesPanes(axis);
-            }
-
-            // check if axis is in correct pane
-            if (axis instanceof Node && getAxesPane(axis.getSide()).getChildren().contains(axis)) {
-                // yes, it is continue with next axis
-                continue;
-            }
-            // axis needs to be moved to new pane location
-            // first: remove axis from all axis panes
-            removeFromAllAxesPanes(axis);
-
-            // second: add axis to correct axis pane
-            getAxesPane(axis.getSide()).getChildren().add((Node) axis);
-        }
-        requestLayout();
-    }
-
     /**
      * checks whether renderer has required x and y axes and adds the first x or y from the chart itself if necessary
      * <p>
@@ -447,52 +406,50 @@ protected static void updateNumericAxis(final Axis axis, final List<DataSet> dat
         if (dataSets == null || dataSets.isEmpty()) {
             return;
         }
-        final boolean oldAutoState = axis.autoNotification().getAndSet(false);
-        final double oldMin = axis.getAutoRange().getMin();
-        final double oldMax = axis.getAutoRange().getMax();
-        final double oldLength = axis.getLength();
 
-        final boolean isHorizontal = axis.getSide().isHorizontal();
+        final boolean oldAutoState = axis.autoNotification().getAndSet(false);
         final Side side = axis.getSide();
-        axis.getAutoRange().clear();
+        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(() -> {
             if (dataset.getDimension() > 2 && (side == Side.RIGHT || side == Side.TOP)) {
                 if (!dataset.getAxisDescription(DataSet.DIM_Z).isDefined()) {
                     dataset.recomputeLimits(DataSet.DIM_Z);
                 }
-                axis.getAutoRange().add(dataset.getAxisDescription(DataSet.DIM_Z).getMin());
-                axis.getAutoRange().add(dataset.getAxisDescription(DataSet.DIM_Z).getMax());
+                dsRange.add(dataset.getAxisDescription(DataSet.DIM_Z).getMin());
+                dsRange.add(dataset.getAxisDescription(DataSet.DIM_Z).getMax());
             } else {
                 final int nDim = isHorizontal ? DataSet.DIM_X : DataSet.DIM_Y;
                 if (!dataset.getAxisDescription(nDim).isDefined()) {
                     dataset.recomputeLimits(nDim);
                 }
-                axis.getAutoRange().add(dataset.getAxisDescription(nDim).getMin());
-                axis.getAutoRange().add(dataset.getAxisDescription(nDim).getMax());
+                dsRange.add(dataset.getAxisDescription(nDim).getMin());
+                dsRange.add(dataset.getAxisDescription(nDim).getMax());
             }
         }));
 
-        // handling of numeric axis and auto-range or auto-grow setting only
-        if (!axis.isAutoRanging() && !axis.isAutoGrowRanging()) {
-            if (oldMin != axis.getMin() || oldMax != axis.getMax() || oldLength != axis.getLength()) {
-                axis.requestAxisLayout();
-            }
-            axis.autoNotification().set(oldAutoState);
-            return;
-        }
-
+        // Update the auto range
+        final boolean changed;
         if (axis.isAutoGrowRanging()) {
-            axis.getAutoRange().add(oldMin);
-            axis.getAutoRange().add(oldMax);
+            changed = axis.getAutoRange().add(dsRange);
+        } else {
+            changed = axis.getAutoRange().set(dsRange);
         }
 
-        axis.getAutoRange().setAxisLength(axis.getLength() == 0 ? 1 : axis.getLength(), side);
-        axis.getUserRange().setAxisLength(axis.getLength() == 0 ? 1 : axis.getLength(), side);
-        axis.invalidateRange(null);
-
-        if (oldMin != axis.getMin() || oldMax != axis.getMax() || oldLength != axis.getLength()) {
+        // 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

@@ -49,6 +49,12 @@ public interface Axis extends AxisDescription {
      */
     void drawAxis(GraphicsContext gc, double axisWidth, double axisHeight);
 
+    /**
+     * Draws the axis into the axis Canvas. This needs to be called from the containing Chart and
+     * before drawing other items. The axis may omit drawing if nothing has changed.
+     */
+    void drawAxis();
+
     /**
      * forces redrawing of axis (via layoutChildren()). This is used to force an update while the main chart area is
      * being updated (a requestLayout()) would be executed only during the next pulse. This is used explicitly in the
@@ -117,6 +123,11 @@ public interface Axis extends AxisDescription {
 
     StringConverter<Number> getTickLabelFormatter();
 
+    /**
+     * @return the gap between the tick mark lines and the chart canvas
+     */
+    double getTickMarkGap();
+
     /**
      * @return the gap between tick labels and the tick mark lines
      */
@@ -170,13 +181,11 @@ public interface Axis extends AxisDescription {
     double getZeroPosition();
 
     /**
-     * Called when data has changed and the range may not be valid any more. This is only called by the chart if
+     * Called when data has changed and the range may not be valid anymore. This is only called by the chart if
      * isAutoRanging() returns true. If we are auto ranging it will cause layout to be requested and auto ranging to
      * happen on next layout pass.
-     *
-     * @param data The current set of all data that needs to be plotted on this axis
      */
-    void invalidateRange(List<Number> data);
+    void invalidateRange();
 
     /**
      * This is {@code true} when the axis labels and data point order should be inverted