From 237ad3b6c310e0f8b7aabe31ec46689a94742964 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 21 Mar 2017 20:32:02 +0300 Subject: [PATCH] Fixed #55. Removed Plottable specialization. --- .../main/java/inr/numass/cryotemp/PKT8PlotController.java | 3 +-- numass-viewer/build.gradle | 2 +- .../java/inr/numass/viewer/NumassLoaderViewComponent.java | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8PlotController.java b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8PlotController.java index a488fdae..2dd4e1ea 100644 --- a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8PlotController.java +++ b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8PlotController.java @@ -22,7 +22,6 @@ import hep.dataforge.meta.MetaUtils; import hep.dataforge.plots.PlotUtils; import hep.dataforge.plots.data.TimePlottable; import hep.dataforge.plots.data.TimePlottableGroup; -import hep.dataforge.plots.data.XYPlottable; import hep.dataforge.plots.fx.FXPlotFrame; import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.jfreechart.JFreeChartFrame; @@ -45,7 +44,7 @@ import java.util.ResourceBundle; public class PKT8PlotController implements Initializable, MeasurementListener { private final PKT8Device device; - private FXPlotFrame plotFrame; + private FXPlotFrame plotFrame; private TimePlottableGroup plottables; @FXML diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle index 1f92a995..4c969b29 100644 --- a/numass-viewer/build.gradle +++ b/numass-viewer/build.gradle @@ -5,7 +5,7 @@ if (!hasProperty('mainClass')) { } mainClassName = mainClass -version = "0.3.7 - SNAPSHOT" +version = "0.3.7" description = "The viewer for numass data" diff --git a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java index 0e4d5da5..08289b51 100644 --- a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java +++ b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java @@ -28,7 +28,10 @@ import hep.dataforge.io.ColumnedDataWriter; import hep.dataforge.meta.Meta; import hep.dataforge.meta.MetaBuilder; import hep.dataforge.plots.XYPlotFrame; -import hep.dataforge.plots.data.*; +import hep.dataforge.plots.data.PlotDataUtils; +import hep.dataforge.plots.data.PlottableData; +import hep.dataforge.plots.data.TimePlottable; +import hep.dataforge.plots.data.TimePlottableGroup; import hep.dataforge.plots.fx.FXPlotFrame; import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.jfreechart.JFreeChartFrame; @@ -324,7 +327,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab * update detector pane with new data */ private void updateDetectorPane(List points, int binning, boolean normalize) { - FXPlotFrame detectorPlotFrame; + FXPlotFrame detectorPlotFrame; if (detectorPlot.getPlot() == null) { Meta frameMeta = new MetaBuilder("frame") .setValue("title", "Detector response plot")