From dc89e01a3e43dcaafda20ac2119a712aa50f4852 Mon Sep 17 00:00:00 2001 From: Alexander Krimm Date: Wed, 9 Aug 2023 22:14:38 +0200 Subject: [PATCH] Fix Indicators * put indicators into separate packages * move ParameterMeasurements into measurement package * cleanup Chart, remove old comments, initializers, handler variables * Put plugin children into pane instead of group to fix coordinate transformations * fix typos --- .../main/java/io/fair_acc/chartfx/Chart.java | 85 +++++++------------ .../chartfx/plugins/UpdateAxisLabels.java | 3 - .../AbstractRangeValueIndicator.java | 2 +- .../AbstractSingleValueIndicator.java | 23 ++--- .../AbstractValueIndicator.java | 16 +--- .../{ => indicators}/ValueIndicator.java | 2 +- .../{ => indicators}/XRangeIndicator.java | 2 +- .../{ => indicators}/XValueIndicator.java | 2 +- .../{ => indicators}/YRangeIndicator.java | 2 +- .../{ => indicators}/YValueIndicator.java | 2 +- .../YWatchValueIndicator.java | 2 +- .../AbstractChartMeasurement.java | 10 +-- .../measurements/DataSetMeasurements.java | 1 - .../ParameterMeasurements.java | 3 +- .../measurements/SimpleMeasurements.java | 1 - .../utils/ChartMeasurementSelector.java | 2 +- .../measurements/utils/DataSetSelector.java | 2 +- .../utils/ValueIndicatorSelector.java | 8 +- .../io/fair_acc/chartfx/MemoryLeakTests.java | 1 + .../YWatchValueIndicatorTest.java | 3 +- .../DataSetMeasurementsTests.java | 1 - .../measurements/SimpleMeasurementsTests.java | 7 +- .../utils/ChartMeasurementSelectorTests.java | 2 +- .../utils/DataSetSelectorTests.java | 2 +- .../utils/ValueIndicatorSelectorTests.java | 4 +- .../io/fair_acc/dataset/events/BitState.java | 2 +- .../sample/chart/CategoryAxisSample.java | 2 +- .../sample/chart/ChartIndicatorSample.java | 10 +-- .../sample/chart/DataViewerSample.java | 5 +- .../chart/DimReductionDataSetSample.java | 10 +-- .../chart/ErrorDataSetRendererSample.java | 3 +- .../sample/chart/Histogram2DimSample.java | 2 +- .../sample/chart/HistogramRendererSample.java | 2 +- .../sample/chart/HistogramSample.java | 2 +- .../sample/chart/MetaDataRendererSample.java | 4 +- .../sample/chart/MultipleAxesSample.java | 2 +- .../sample/chart/TimeAxisNonLinearSample.java | 4 +- .../sample/chart/ValueIndicatorSample.java | 2 +- .../chart/YWatchValueIndicatorSample.java | 2 +- .../FinancialRealtimeCandlestickSample.java | 4 +- .../fair_acc/sample/math/utils/DemoChart.java | 2 +- .../io/fair_acc/sample/chart/FxmlSample.fxml | 2 +- 42 files changed, 96 insertions(+), 152 deletions(-) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/AbstractRangeValueIndicator.java (99%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/AbstractSingleValueIndicator.java (94%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/AbstractValueIndicator.java (95%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/ValueIndicator.java (94%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/XRangeIndicator.java (98%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/XValueIndicator.java (98%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/YRangeIndicator.java (98%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/YValueIndicator.java (98%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => indicators}/YWatchValueIndicator.java (99%) rename chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/{ => measurements}/ParameterMeasurements.java (98%) rename chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/{ => indicators}/YWatchValueIndicatorTest.java (97%) 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 index ab1ce234f..727eae51c 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/Chart.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/Chart.java @@ -34,9 +34,6 @@ import javafx.scene.paint.Paint; import javafx.util.Duration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import io.fair_acc.chartfx.axes.Axis; import io.fair_acc.chartfx.axes.spi.AbstractAxis; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; @@ -81,24 +78,20 @@ public abstract class Chart extends Region implements EventSource { protected final BitState dataSetState = BitState.initDirtyMultiThreaded(this, BitState.ALL_BITS) .addChangeListener(FXUtils.runOnFxThread((src, deltaBits) -> state.setDirty(src.getBits()))); - private static final Logger LOGGER = LoggerFactory.getLogger(Chart.class); private static final String CHART_CSS = Objects.requireNonNull(Chart.class.getResource("chart.css")).toExternalForm(); private static final CssPropertyFactory CSS = new CssPropertyFactory<>(Control.getClassCssMetaData()); private static final int DEFAULT_TRIGGER_DISTANCE = 50; protected static final boolean DEBUG = Boolean.getBoolean("chartfx.debug"); // for more verbose debugging protected final BooleanProperty showing = new SimpleBooleanProperty(this, "showing", false); - { - showing.bind(FXUtils.getShowingBinding(this)); - } /** * When true any data changes will be animated. */ private final BooleanProperty animated = new SimpleBooleanProperty(this, "animated", true); - // TODO: Check whether 'this' or chart contents need to be added /** * Animator for animating stuff on the chart + * TODO: Check whether 'this' or chart contents need to be added */ protected final ChartLayoutAnimator animator = new ChartLayoutAnimator(this); @@ -113,14 +106,11 @@ public abstract class Chart extends Region implements EventSource { private final ObservableList datasets = FXCollections.observableArrayList(); protected final ObservableList allDataSets = FXCollections.observableArrayList(); private final ObservableList renderers = FXCollections.observableArrayList(); - { - getRenderers().addListener(this::rendererChanged); - } // Inner canvas for the drawn content protected final ResizableCanvas canvas = new ResizableCanvas(); protected final Pane canvasForeground = new Pane(); - protected final Group pluginsArea = Chart.createChildGroup(); + protected final Pane pluginsArea = new Pane(); // Area where plots get drawn protected final Pane plotBackground = new Pane(); @@ -137,37 +127,6 @@ public abstract class Chart extends Region implements EventSource { protected final ToolBarFlowPane toolBar = new ToolBarFlowPane(this); protected final BooleanProperty toolBarPinned = new SimpleBooleanProperty(this, "toolBarPinned", false); - { - // Build hierarchy - // > menuPane (hidden toolbars that slide in from top/bottom) - // > measurement pane (labels/menus for working with data) - // > legend & title pane (static legend and title) - // > axis pane (x/y axes) - // > axes - // > plot area (plotted content, hidden elements for zoom etc.) - // > canvas (main) - // > canvas foreground - // > plugins - // > plot background/foreground - plotArea.setContent(StyleUtil.addStyles(new PlotAreaPane(getCanvas(), getCanvasForeground(), pluginsArea), "chart-plot-area")); - axesAndCanvasPane.addCenter(getPlotBackground(), getPlotArea(), getPlotForeground()); - titleLegendPane.addCenter(axesAndCanvasPane); - measurementPane.addCenter(titleLegendPane); - menuPane.setContent(measurementPane); - getChildren().add(menuPane); - } - - protected final ListChangeListener axesChangeListenerLocal = this::axesChangedLocal; - protected final ListChangeListener axesChangeListener = this::axesChanged; - protected final ListChangeListener datasetChangeListener = this::datasetsChanged; - protected final ListChangeListener pluginsChangedListener = this::pluginsChanged; - - { - getDatasets().addListener(datasetChangeListener); - getAxes().addListener(axesChangeListener); - getAxes().addListener(axesChangeListenerLocal); - } - protected final Label titleLabel = new Label(); protected final StringProperty title = new StringPropertyBase() { @@ -245,7 +204,7 @@ protected void invalidated() { private final StyleableObjectProperty toolBarSide = CSS.createObjectProperty(this, "toolBarSide", Side.TOP, false, StyleConverter.getEnumConverter(Side.class), (oldVal, newVal) -> { AssertUtils.notNull("Side must not be null", newVal); - // remove tool bar from potential other chart side pane locations + // remove toolbar from potential other chart side pane locations menuPane.setTop(null); menuPane.setBottom(null); menuPane.setLeft(null); @@ -278,6 +237,30 @@ protected void invalidated() { * @param axes axes to be added to the chart */ public Chart(Axis... axes) { + // Build hierarchy + // > menuPane (hidden toolbars that slide in from top/bottom) + // > measurement pane (labels/menus for working with data) + // > legend & title pane (static legend and title) + // > axis pane (x/y axes) + // > axes + // > plot area (plotted content, hidden elements for zoom etc.) + // > canvas (main) + // > canvas foreground + // > plugins + // > plot background/foreground + plotArea.setContent(StyleUtil.addStyles(new PlotAreaPane(getCanvas(), getCanvasForeground(), pluginsArea), "chart-plot-area")); + axesAndCanvasPane.addCenter(getPlotBackground(), getPlotArea(), getPlotForeground()); + titleLegendPane.addCenter(axesAndCanvasPane); + measurementPane.addCenter(titleLegendPane); + menuPane.setContent(measurementPane); + getChildren().add(menuPane); + showing.bind(FXUtils.getShowingBinding(this)); + + getDatasets().addListener(this::datasetsChanged); + getAxes().addListener(this::axesChanged); + getAxes().addListener(this::axesChangedLocal); + getRenderers().addListener(this::rendererChanged); + for (int dim = 0; dim < axes.length; dim++) { final Axis axis = axes[dim]; if (!(axis instanceof AbstractAxis)) { @@ -294,16 +277,10 @@ public Chart(Axis... axes) { plotForeGround.toFront(); plotForeGround.setMouseTransparent(true); - // hiddenPane.setTriggerDistance(DEFAULT_TRIGGER_DISTANCE); plotArea.triggerDistanceProperty().bindBidirectional(menuPane.triggerDistanceProperty()); plotArea.setAnimationDelay(Duration.millis(500)); - // hiddenPane.setMouseTransparent(true); plotArea.setPickOnBounds(false); - // alt: canvas resize (default JavaFX Canvas does not automatically - // resize to pref width/height according to parent constraints - // canvas.widthProperty().bind(stackPane.widthProperty()); - // canvas.heightProperty().bind(stackPane.heightProperty()); getCanvasForeground().setManaged(false); final ChangeListener canvasSizeChangeListener = (ch, o, n) -> { final double width = getCanvas().getWidth(); @@ -335,7 +312,7 @@ public Chart(Axis... axes) { canvas.setStyle("-fx-background-color: rgba(200, 250, 200, 0.5);"); // add plugin handling and listeners - getPlugins().addListener(pluginsChangedListener); + getPlugins().addListener(this::pluginsChanged); // add default chart content ie. ToolBar and Legend // can be repositioned via setToolBarSide(...) and setLegendSide(...) @@ -375,7 +352,7 @@ public String getUserAgentStylesheet() { } /** - * Play a animation involving the given keyframes. On every frame of the animation the chart will be relayed out + * Play an animation involving the given keyframes. On every frame of the animation the chart will be relayed out * * @param keyFrames Array of KeyFrames to play */ @@ -939,7 +916,7 @@ protected void rendererChanged(final ListChangeListener.Change updateMouseListener(n)); updateMouseListener(isEditable()); - // remove triangle from chart foregrond when the chart is removed + // remove triangle from chart foreground when the chart is removed chartProperty().addListener((p, o, n) -> { if (o != null) { o.getPlotForeground().getChildren().remove(triangle); } }); - // Need to add them so that at initialization of the stage the CCS is - // applied and we can calculate label's - // width and height + // Need to add them so that at initialization of the stage the CCS is applied, and we can calculate label's width and height getChartChildren().addAll(line, label); PropUtil.runOnChange(state.onAction(ChartBits.ChartPluginState), this.value); } @@ -235,8 +227,7 @@ protected void layoutMarker(final double startX, final double startY, final doub triangle.setTranslateY(startY); triangle.toFront(); // triangle has to be put onto the plot foreground to be able to put it on top of axes - // is removed when the chart is changed - // addChildNodeIfNotPresent(triangle); + // it is removed when the chart is changed if (!getChart().getPlotForeground().getChildren().contains(triangle)) { getChart().getPlotForeground().getChildren().add(triangle); } diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/AbstractValueIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/AbstractValueIndicator.java similarity index 95% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/AbstractValueIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/AbstractValueIndicator.java index 5e47eba08..61b2bf974 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/AbstractValueIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/AbstractValueIndicator.java @@ -1,15 +1,11 @@ -/* - * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved. - */ - -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; +import io.fair_acc.chartfx.plugins.ChartPlugin; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.StringProperty; -import javafx.beans.value.ChangeListener; import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener.Change; import javafx.geometry.Bounds; @@ -34,7 +30,6 @@ */ public abstract class AbstractValueIndicator extends ChartPlugin { private final Axis axis; - private final ChangeListener axisBoundsListener = (obs, oldVal, newVal) -> layoutChildren(); private final ListChangeListener pluginsListListener = (final Change change) -> updateStyleClass(); @@ -143,9 +138,7 @@ protected AbstractValueIndicator(Axis axis, final String text) { } private void addAxisListener() { - final Axis valueAxis = getAxis(); - valueAxis.minProperty().addListener(axisBoundsListener); - valueAxis.maxProperty().addListener(axisBoundsListener); + getAxis().addListener((source, bits) -> layoutChildren()); } protected void addChildNodeIfNotPresent(final Node node) { @@ -299,9 +292,6 @@ protected final void layoutLabel(final Bounds bounds, final double hPos, final d } private void removeAxisListener() { - final Axis valueAxis = getAxis(); - valueAxis.minProperty().removeListener(axisBoundsListener); - valueAxis.maxProperty().removeListener(axisBoundsListener); } private void removePluginsListListener(final Chart chart) { diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ValueIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/ValueIndicator.java similarity index 94% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ValueIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/ValueIndicator.java index 2e18afccb..66888b39a 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ValueIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/ValueIndicator.java @@ -1,4 +1,4 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import javafx.beans.property.DoubleProperty; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XRangeIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XRangeIndicator.java similarity index 98% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XRangeIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XRangeIndicator.java index ccbf52e3a..72e4be2d6 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XRangeIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XRangeIndicator.java @@ -1,4 +1,4 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import javafx.geometry.BoundingBox; import javafx.geometry.Bounds; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XValueIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XValueIndicator.java similarity index 98% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XValueIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XValueIndicator.java index ae5d7de0e..3a95a927b 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/XValueIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/XValueIndicator.java @@ -1,4 +1,4 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import javafx.geometry.BoundingBox; import javafx.geometry.Bounds; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YRangeIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YRangeIndicator.java similarity index 98% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YRangeIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YRangeIndicator.java index 72be51265..cbcca4ccc 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YRangeIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YRangeIndicator.java @@ -1,4 +1,4 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import javafx.geometry.BoundingBox; import javafx.geometry.Bounds; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YValueIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YValueIndicator.java similarity index 98% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YValueIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YValueIndicator.java index 30cfdfbd5..7aba7e90f 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YValueIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YValueIndicator.java @@ -2,7 +2,7 @@ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved. */ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import javafx.geometry.BoundingBox; import javafx.geometry.Bounds; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YWatchValueIndicator.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicator.java similarity index 99% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YWatchValueIndicator.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicator.java index 782f497b1..4f6235f2f 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/YWatchValueIndicator.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicator.java @@ -1,4 +1,4 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import java.util.Arrays; import java.util.Comparator; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/AbstractChartMeasurement.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/AbstractChartMeasurement.java index e8d14a5a3..60e033d53 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/AbstractChartMeasurement.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/AbstractChartMeasurement.java @@ -3,8 +3,6 @@ import static io.fair_acc.chartfx.axes.AxisMode.X; import java.text.DecimalFormat; -import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -43,10 +41,9 @@ 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.indicators.AbstractSingleValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YValueIndicator; 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; @@ -56,7 +53,6 @@ import io.fair_acc.chartfx.viewer.DataViewWindow.WindowDecoration; import io.fair_acc.dataset.DataSet; import io.fair_acc.dataset.event.EventListener; -import io.fair_acc.dataset.event.EventRateLimiter; import io.fair_acc.dataset.event.EventSource; import impl.org.controlsfx.skin.DecorationPane; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurements.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurements.java index 89a3474b9..6c7acb5d8 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurements.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurements.java @@ -47,7 +47,6 @@ import io.fair_acc.chartfx.axes.spi.format.DefaultTimeFormatter; import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Screenshot; import io.fair_acc.chartfx.plugins.TableViewer; import io.fair_acc.chartfx.plugins.Zoomer; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ParameterMeasurements.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/ParameterMeasurements.java similarity index 98% rename from chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ParameterMeasurements.java rename to chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/ParameterMeasurements.java index f21b09e41..30e07cbdc 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/ParameterMeasurements.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/ParameterMeasurements.java @@ -1,5 +1,6 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.measurements; +import io.fair_acc.chartfx.plugins.ChartPlugin; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurements.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurements.java index 36eb4d8e5..dd5181c08 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurements.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurements.java @@ -19,7 +19,6 @@ import io.fair_acc.chartfx.axes.AxisLabelFormatter; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.axes.spi.MetricPrefix; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; import io.fair_acc.chartfx.utils.DragResizerUtil; import io.fair_acc.chartfx.utils.FXUtils; import io.fair_acc.dataset.DataSet; diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelector.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelector.java index ecb863992..97a51541e 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelector.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelector.java @@ -12,7 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.measurements.AbstractChartMeasurement; /** diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelector.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelector.java index a545cf365..f7a696f82 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelector.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelector.java @@ -10,7 +10,7 @@ import javafx.scene.control.SelectionMode; import javafx.scene.layout.GridPane; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.dataset.DataSet; /** diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelector.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelector.java index a1fb3048e..ccc2f206f 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelector.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelector.java @@ -21,11 +21,11 @@ import io.fair_acc.chartfx.Chart; import io.fair_acc.chartfx.axes.AxisMode; -import io.fair_acc.chartfx.plugins.AbstractSingleValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.AbstractSingleValueIndicator; import io.fair_acc.chartfx.plugins.ChartPlugin; -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.measurements.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YValueIndicator; import io.fair_acc.dataset.utils.NoDuplicatesList; public class ValueIndicatorSelector extends GridPane { diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/MemoryLeakTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/MemoryLeakTests.java index 5b87a2690..29fc1efbb 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/MemoryLeakTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/MemoryLeakTests.java @@ -5,6 +5,7 @@ import java.lang.reflect.Field; import java.util.concurrent.atomic.AtomicReference; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; import javafx.stage.Stage; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicatorTest.java similarity index 97% rename from chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java rename to chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicatorTest.java index 0c5affcf6..c91dc68a8 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/YWatchValueIndicatorTest.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/indicators/YWatchValueIndicatorTest.java @@ -1,9 +1,10 @@ -package io.fair_acc.chartfx.plugins; +package io.fair_acc.chartfx.plugins.indicators; import static org.junit.jupiter.api.Assertions.*; import static io.fair_acc.chartfx.renderer.spi.financial.utils.FinancialTestUtils.generateCosData; +import io.fair_acc.chartfx.plugins.indicators.YWatchValueIndicator; import javafx.scene.Scene; import javafx.scene.input.MouseButton; import javafx.scene.input.MouseEvent; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurementsTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurementsTests.java index c3a8798b5..89586c356 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurementsTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/DataSetMeasurementsTests.java @@ -20,7 +20,6 @@ import org.testfx.framework.junit5.Start; import io.fair_acc.chartfx.XYChart; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; import io.fair_acc.chartfx.plugins.measurements.DataSetMeasurements.MeasurementCategory; import io.fair_acc.chartfx.plugins.measurements.DataSetMeasurements.MeasurementType; import io.fair_acc.chartfx.ui.utils.JavaFXInterceptorUtils; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurementsTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurementsTests.java index 9abeb3565..fc2e159c3 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurementsTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/SimpleMeasurementsTests.java @@ -29,10 +29,9 @@ import org.testfx.framework.junit5.Start; import io.fair_acc.chartfx.XYChart; -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.indicators.AbstractSingleValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YValueIndicator; import io.fair_acc.chartfx.plugins.measurements.SimpleMeasurements.MeasurementCategory; import io.fair_acc.chartfx.plugins.measurements.SimpleMeasurements.MeasurementType; import io.fair_acc.chartfx.ui.utils.JavaFXInterceptorUtils; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelectorTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelectorTests.java index 7c24dd764..253d961a6 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelectorTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ChartMeasurementSelectorTests.java @@ -16,7 +16,7 @@ import org.testfx.framework.junit5.Start; import io.fair_acc.chartfx.XYChart; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.measurements.AbstractChartMeasurement; import io.fair_acc.chartfx.plugins.measurements.SimpleMeasurements; import io.fair_acc.chartfx.plugins.measurements.SimpleMeasurements.MeasurementType; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelectorTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelectorTests.java index 68855bbbe..b28e32048 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelectorTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/DataSetSelectorTests.java @@ -15,7 +15,7 @@ import org.testfx.framework.junit5.Start; import io.fair_acc.chartfx.XYChart; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.ui.utils.JavaFXInterceptorUtils; import io.fair_acc.chartfx.ui.utils.TestFx; import io.fair_acc.dataset.DataSet; diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelectorTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelectorTests.java index 413a4f5e0..5f29f518d 100644 --- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelectorTests.java +++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/plugins/measurements/utils/ValueIndicatorSelectorTests.java @@ -18,8 +18,8 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.AxisMode; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; -import io.fair_acc.chartfx.plugins.XValueIndicator; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; import io.fair_acc.chartfx.ui.utils.JavaFXInterceptorUtils; import io.fair_acc.chartfx.ui.utils.TestFx; import io.fair_acc.dataset.testdata.spi.SineFunction; diff --git a/chartfx-dataset/src/main/java/io/fair_acc/dataset/events/BitState.java b/chartfx-dataset/src/main/java/io/fair_acc/dataset/events/BitState.java index 4e4746236..e836d3f0f 100644 --- a/chartfx-dataset/src/main/java/io/fair_acc/dataset/events/BitState.java +++ b/chartfx-dataset/src/main/java/io/fair_acc/dataset/events/BitState.java @@ -352,7 +352,7 @@ public static BitState initDirtyMultiThreaded(Object source, int filter) { } /** - * An single-threaded implementation that should only be modified by a single thread + * A single-threaded implementation that should only be modified by a single thread */ protected static class SingleThreadedBitState extends BitState { diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/CategoryAxisSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/CategoryAxisSample.java index 736e29bbc..05a75cde2 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/CategoryAxisSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/CategoryAxisSample.java @@ -16,7 +16,7 @@ import io.fair_acc.chartfx.axes.spi.CategoryAxis; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.LineStyle; import io.fair_acc.chartfx.renderer.spi.ErrorDataSetRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ChartIndicatorSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ChartIndicatorSample.java index 11304c6fc..533fbee45 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ChartIndicatorSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ChartIndicatorSample.java @@ -26,11 +26,11 @@ import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; import io.fair_acc.chartfx.plugins.Panner; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; -import io.fair_acc.chartfx.plugins.XRangeIndicator; -import io.fair_acc.chartfx.plugins.XValueIndicator; -import io.fair_acc.chartfx.plugins.YRangeIndicator; -import io.fair_acc.chartfx.plugins.YValueIndicator; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.indicators.XRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.YValueIndicator; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.ErrorStyle; import io.fair_acc.chartfx.renderer.datareduction.DefaultDataReducer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DataViewerSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DataViewerSample.java index 2c289f509..057609328 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DataViewerSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DataViewerSample.java @@ -38,7 +38,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.TableViewer; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.ErrorStyle; @@ -49,10 +49,7 @@ import io.fair_acc.chartfx.viewer.DataViewWindow; import io.fair_acc.chartfx.viewer.DataViewWindow.WindowDecoration; import io.fair_acc.chartfx.viewer.DataViewer; -import io.fair_acc.chartfx.viewer.event.WindowClosedEvent; -import io.fair_acc.chartfx.viewer.event.WindowUpdateEvent; import io.fair_acc.dataset.DataSet; -import io.fair_acc.dataset.event.EventListener; import io.fair_acc.dataset.spi.DoubleDataSet; import io.fair_acc.dataset.testdata.TestDataSet; import io.fair_acc.dataset.testdata.spi.RandomStepFunction; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DimReductionDataSetSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DimReductionDataSetSample.java index 8589a80cd..de65ae1f8 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DimReductionDataSetSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/DimReductionDataSetSample.java @@ -23,12 +23,12 @@ import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.TableViewer; -import io.fair_acc.chartfx.plugins.XRangeIndicator; -import io.fair_acc.chartfx.plugins.XValueIndicator; -import io.fair_acc.chartfx.plugins.YRangeIndicator; -import io.fair_acc.chartfx.plugins.YValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.XRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.YValueIndicator; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.spi.ContourDataSetRenderer; import io.fair_acc.chartfx.utils.AxisSynchronizer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ErrorDataSetRendererSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ErrorDataSetRendererSample.java index 2b691252b..0d6dbeabd 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ErrorDataSetRendererSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ErrorDataSetRendererSample.java @@ -18,7 +18,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Screenshot; import io.fair_acc.chartfx.plugins.TableViewer; import io.fair_acc.chartfx.plugins.Zoomer; @@ -26,7 +26,6 @@ import io.fair_acc.chartfx.renderer.spi.ErrorDataSetRenderer; import io.fair_acc.chartfx.ui.ProfilerInfoBox; import io.fair_acc.chartfx.ui.ProfilerInfoBox.DebugLevel; -import io.fair_acc.dataset.event.AddedDataEvent; import io.fair_acc.dataset.spi.DoubleDataSet; import io.fair_acc.dataset.spi.DoubleErrorDataSet; import io.fair_acc.dataset.testdata.spi.RandomDataGenerator; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/Histogram2DimSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/Histogram2DimSample.java index ba68bfb3a..2a3289ae3 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/Histogram2DimSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/Histogram2DimSample.java @@ -14,7 +14,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.LineStyle; import io.fair_acc.chartfx.renderer.spi.ContourDataSetRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramRendererSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramRendererSample.java index acb798dc9..c056649fe 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramRendererSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramRendererSample.java @@ -16,7 +16,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.LineStyle; import io.fair_acc.chartfx.renderer.spi.HistogramRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramSample.java index f00854c5f..252158bf6 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/HistogramSample.java @@ -20,7 +20,7 @@ import io.fair_acc.chartfx.axes.spi.CategoryAxis; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.ErrorStyle; import io.fair_acc.chartfx.renderer.LineStyle; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MetaDataRendererSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MetaDataRendererSample.java index 9c927dff0..e33a20dac 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MetaDataRendererSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MetaDataRendererSample.java @@ -27,9 +27,9 @@ import io.fair_acc.chartfx.plugins.EditAxis; import io.fair_acc.chartfx.plugins.EditDataSet; import io.fair_acc.chartfx.plugins.Panner; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.TableViewer; -import io.fair_acc.chartfx.plugins.XRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.XRangeIndicator; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.Renderer; import io.fair_acc.chartfx.renderer.spi.ErrorDataSetRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MultipleAxesSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MultipleAxesSample.java index 5efc65643..ee12f5d6a 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MultipleAxesSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/MultipleAxesSample.java @@ -22,7 +22,7 @@ import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.Renderer; import io.fair_acc.chartfx.renderer.spi.ErrorDataSetRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisNonLinearSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisNonLinearSample.java index d2cf86299..69f0bde8b 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisNonLinearSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/TimeAxisNonLinearSample.java @@ -1,7 +1,5 @@ package io.fair_acc.sample.chart; -import java.util.ArrayList; -import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -25,7 +23,7 @@ import io.fair_acc.chartfx.axes.spi.format.DefaultTimeFormatter; import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.spi.ErrorDataSetRenderer; import io.fair_acc.chartfx.utils.FXUtils; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ValueIndicatorSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ValueIndicatorSample.java index 68f215dd3..e2ea25c6b 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ValueIndicatorSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/ValueIndicatorSample.java @@ -9,7 +9,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; -import io.fair_acc.chartfx.plugins.XValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.XValueIndicator; import io.fair_acc.dataset.spi.DoubleDataSet; /** diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/YWatchValueIndicatorSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/YWatchValueIndicatorSample.java index 2e0665d32..b9eec6ce5 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/chart/YWatchValueIndicatorSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/chart/YWatchValueIndicatorSample.java @@ -15,7 +15,7 @@ import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; -import io.fair_acc.chartfx.plugins.YWatchValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YWatchValueIndicator; import io.fair_acc.chartfx.ui.geometry.Side; import io.fair_acc.dataset.testdata.spi.CosineFunction; import io.fair_acc.dataset.testdata.spi.SineFunction; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/FinancialRealtimeCandlestickSample.java b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/FinancialRealtimeCandlestickSample.java index 881849b11..0b4596ea1 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/FinancialRealtimeCandlestickSample.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/FinancialRealtimeCandlestickSample.java @@ -16,8 +16,8 @@ import io.fair_acc.chartfx.Chart; import io.fair_acc.chartfx.XYChart; import io.fair_acc.chartfx.axes.Axis; -import io.fair_acc.chartfx.plugins.YRangeIndicator; -import io.fair_acc.chartfx.plugins.YWatchValueIndicator; +import io.fair_acc.chartfx.plugins.indicators.YRangeIndicator; +import io.fair_acc.chartfx.plugins.indicators.YWatchValueIndicator; import io.fair_acc.chartfx.renderer.Renderer; import io.fair_acc.chartfx.renderer.spi.financial.AbstractFinancialRenderer; import io.fair_acc.chartfx.renderer.spi.financial.CandleStickRenderer; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/math/utils/DemoChart.java b/chartfx-samples/src/main/java/io/fair_acc/sample/math/utils/DemoChart.java index 93da3726b..287bb2f2a 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/math/utils/DemoChart.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/math/utils/DemoChart.java @@ -11,7 +11,7 @@ import io.fair_acc.chartfx.axes.spi.DefaultNumericAxis; import io.fair_acc.chartfx.plugins.DataPointTooltip; import io.fair_acc.chartfx.plugins.EditAxis; -import io.fair_acc.chartfx.plugins.ParameterMeasurements; +import io.fair_acc.chartfx.plugins.measurements.ParameterMeasurements; import io.fair_acc.chartfx.plugins.TableViewer; import io.fair_acc.chartfx.plugins.Zoomer; import io.fair_acc.chartfx.renderer.ErrorStyle; diff --git a/chartfx-samples/src/main/resources/io/fair_acc/sample/chart/FxmlSample.fxml b/chartfx-samples/src/main/resources/io/fair_acc/sample/chart/FxmlSample.fxml index dabd0fdd4..5a8dbca46 100644 --- a/chartfx-samples/src/main/resources/io/fair_acc/sample/chart/FxmlSample.fxml +++ b/chartfx-samples/src/main/resources/io/fair_acc/sample/chart/FxmlSample.fxml @@ -6,7 +6,7 @@ - +