reverted userTickUnit split

fair-acc · Aug 8, 2023 · 5703417 · 5703417
1 parent 15b47e7
commit 5703417
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 48 deletions.
diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/Axis.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/Axis.java
@@ -1,6 +1,11 @@
 package io.fair_acc.chartfx.axes;
 
-import javafx.beans.property.*;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
@@ -145,8 +150,6 @@ public interface Axis extends AxisDescription {
 
     double getTickUnit();
 
-    double getUserTickUnit();
-
     /**
      * @return axis primary unit scaling
      */
@@ -308,7 +311,7 @@ default void invokeListener(final UpdateEvent updateEvent, final boolean execute
 
     void setSide(Side newSide);
 
-    void setUserTickUnit(double tickUnit);
+    void setTickUnit(double tickUnit);
 
     /**
      * This is {@code true} when the axis labels and data point should be plotted according to some time-axis definition
@@ -334,9 +337,7 @@ default void invokeListener(final UpdateEvent updateEvent, final boolean execute
 
     ObjectProperty<Side> sideProperty();
 
-    ReadOnlyDoubleProperty tickUnitProperty();
-
-    DoubleProperty userTickUnitProperty();
+    DoubleProperty tickUnitProperty();
 
     /**
      * This is {@code true} when the axis labels and data point should be plotted according to some time-axis definition

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/spi/AbstractAxis.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/spi/AbstractAxis.java
@@ -309,7 +309,7 @@ protected void updateAxisContents() {
         }
 
         // Tick units
-        double mTickUnit = getUserTickUnit();
+        double mTickUnit = getTickUnit();
         if (isAutoRanging() || isAutoGrowRanging() || true /* TODO: zoom never changes scale */){
             mTickUnit = computePreferredTickUnit(length);
         }

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameter.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/axes/spi/AbstractAxisParameter.java
@@ -348,22 +348,14 @@ protected void invalidated() {
         }
     };
 
-    /**
-     * user-set tick units when doing auto-ranging
-     */
-    protected final transient StyleableDoubleProperty userTickUnit = CSS.createDoubleProperty(this, "userTickUnit", DEFAULT_TICK_UNIT, () -> {
+    protected final transient StyleableDoubleProperty tickUnit = CSS.createDoubleProperty(this, "tickUnit", DEFAULT_TICK_UNIT, () -> {
         if (isAutoRanging() || isAutoGrowRanging()) {
             return;
         }
         invalidate();
         invokeListener(new AxisChangeEvent(AbstractAxisParameter.this));
     });
 
-    /**
-     * system-set tick units for getting the currently displayed units
-     */
-    protected final transient DoubleProperty tickUnit = new SimpleDoubleProperty(Double.NaN);
-
     protected final transient ChangeListener<? super Number> scaleChangeListener = (ch, o, n) -> {
         final double axisLength = getLength(); // [pixel]
         final double lowerBound = getMin();
@@ -797,11 +789,6 @@ public double getTickUnit() {
         return tickUnitProperty().get();
     }
 
-    @Override
-    public double getUserTickUnit() {
-        return userTickUnitProperty().get();
-    }
-
     @Override
     public String getUnit() {
         return unitProperty().get();
@@ -1198,13 +1185,9 @@ public void setTickMarkVisible(final boolean value) {
      *
      * @param unit major tick unit
      */
-    protected void setTickUnit(final double unit) {
-        tickUnit.set(unit);
-    }
-
     @Override
-    public void setUserTickUnit(final double unit) {
-        userTickUnit.set(unit);
+    public void setTickUnit(final double unit) {
+        tickUnitProperty().set(unit);
     }
 
     /**
@@ -1287,15 +1270,10 @@ public BooleanProperty tickMarkVisibleProperty() {
      * @return tickUnit property
      */
     @Override
-    public ReadOnlyDoubleProperty tickUnitProperty() {
+    public DoubleProperty tickUnitProperty() {
         return tickUnit;
     }
 
-    @Override
-    public DoubleProperty userTickUnitProperty() {
-        return userTickUnit;
-    }
-
     /**
      * This is {@code true} when the axis labels and data point should be plotted according to some time-axis definition
      *

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/EditAxis.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/EditAxis.java
@@ -310,8 +310,7 @@ private void changeAxisRangeLimit(final Axis axis, final boolean isHorizontal, f
 
             if (axis instanceof AbstractAxis) {
                 // ((AbstractAxis) axis).recomputeTickMarks();
-                ((AbstractAxis) axis).setAutoRanging(false); // TODO: this used to set internal units. Is this ok?
-                axis.setUserTickUnit(((AbstractAxis) axis).computePreferredTickUnit(axis.getLength()));
+                axis.setTickUnit(((AbstractAxis) axis).computePreferredTickUnit(axis.getLength()));
             }
         }
 
@@ -426,8 +425,7 @@ private TextField getBoundField(final Axis axis, final boolean isLowerBound) {
 
                     if (axis instanceof AbstractAxis) {
                         // ((AbstractAxis) axis).recomputeTickMarks();
-                        ((AbstractAxis) axis).setAutoRanging(false); // TODO: this used to set internal units. Is this ok?
-                        axis.setUserTickUnit(((AbstractAxis) axis).computePreferredTickUnit(axis.getLength()));
+                        axis.setTickUnit(((AbstractAxis) axis).computePreferredTickUnit(axis.getLength()));
                         if (LOGGER.isDebugEnabled()) {
                             LOGGER.debug("recompute axis tick unit to {}",
                                     ((AbstractAxis) axis).computePreferredTickUnit(axis.getLength()));

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/MountainRangeRenderer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/MountainRangeRenderer.java
@@ -108,7 +108,7 @@ public List<DataSet> render(final GraphicsContext gc, final Chart chart, final i
                     yAxis.setAutoRanging(false);
                     yAxis.setMin(zRangeMin);
                     yAxis.setMax(max);
-                    yAxis.setUserTickUnit(Math.abs(max - zRangeMin) / 10.0);
+                    yAxis.setTickUnit(Math.abs(max - zRangeMin) / 10.0);
                     yAxis.forceRedraw();
                 }
                 yAxis.setAutoRanging(autoRange);

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/utils/AxisSynchronizer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/utils/AxisSynchronizer.java
@@ -69,7 +69,7 @@ private void lowerBoundChanged(ObservableValue<? extends Number> property, Numbe
                     axis.setMin(value);
                     axis.setAutoRanging(false);
                 }
-                axis.setUserTickUnit(tickUnit);
+                axis.setTickUnit(tickUnit);
             }
             updating = false;
         }
@@ -102,7 +102,7 @@ private void upperBoundChanged(ObservableValue<? extends Number> property, Numbe
                     axis.setAutoRanging(false);
                     axis.setMax(value);
                 }
-                axis.setUserTickUnit(tickUnit);
+                axis.setTickUnit(tickUnit);
             }
             updating = false;
         }

diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/utils/MasterSlaveAxisSynchronizer.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/utils/MasterSlaveAxisSynchronizer.java
@@ -31,7 +31,7 @@ public MasterSlaveAxisSynchronizer(AbstractAxis master) {
     public void add(AbstractAxis axis) {
         slaves.add(axis);
         axis.setAutoRanging(false);
-        axis.userTickUnitProperty().bind(master.tickUnitProperty());
+        axis.tickUnitProperty().bind(master.tickUnitProperty());
     }
 
     private void lowerBoundChanged(double value) {
@@ -46,7 +46,7 @@ private void lowerBoundChanged(double value) {
 
     public void remove(AbstractAxis axis) {
         slaves.remove(axis);
-        axis.userTickUnitProperty().unbind();
+        axis.tickUnitProperty().unbind();
         axis.setAutoRanging(true);
     }
 

diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisRangeSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisRangeSample.java
@@ -73,8 +73,7 @@ public void run() {
                     xAxisDyn.minProperty().set(now - range);
                     final String text = "actual range [s]: " + String.format("%#.3f", range) + " ("
                                       + String.format("%#.1f", range / 3600 / 24) + " days)";
-                    xAxisDyn.setAutoRanging(false);
-                    xAxisDyn.setUserTickUnit(range / 12);
+                    xAxisDyn.setTickUnit(range / 12);
                     xAxisDyn.forceRedraw();
                     xAxis9Text.setText(text);
                 });

diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/legacy/utils/TestChart.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/legacy/utils/TestChart.java
@@ -86,8 +86,7 @@ public void setNumberOfSamples(int nSamples) {
         chart.getDatasets().setAll(testFunction);
         xAxis.setMax(nSamples - 1.0);
         xAxis.setMin(0);
-        xAxis.setAutoRanging(false);
-        xAxis.setUserTickUnit(nSamples / 20.0);
+        xAxis.setTickUnit(nSamples / 20.0);
         updateDataSet();
     }
 

diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/math/DataSetAverageSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/math/DataSetAverageSample.java
@@ -37,7 +37,7 @@ public Node getContent() {
         chart.getYAxis(1).setAutoRanging(false);
         chart.getYAxis().maxProperty().bindBidirectional(chart.getYAxis(1).maxProperty());
         chart.getYAxis().minProperty().bindBidirectional(chart.getYAxis(1).minProperty());
-        chart.getYAxis().userTickUnitProperty().bindBidirectional(chart.getYAxis(1).userTickUnitProperty()); // TODO: used tickUnitProperty. Make sure it still works.
+        chart.getYAxis().tickUnitProperty().bindBidirectional(chart.getYAxis(1).tickUnitProperty());
 
         LimitedQueue<DataSet> lastDataSets = new LimitedQueue<>(N_GRAPHS);
         for (int i = 0; i < 20 * N_GRAPHS; i++) {