NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #55. Removed Plottable specialization.

Browse Source
This commit is contained in:
Alexander Nozik 2017-03-21 20:32:02 +03:00
parent 83cfc86b7e
commit 237ad3b6c3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8PlotController.java
View File

@ -22,7 +22,6 @@ import hep.dataforge.meta.MetaUtils;
import hep.dataforge.plots.PlotUtils; import hep.dataforge.plots.PlotUtils;
import hep.dataforge.plots.data.TimePlottable; import hep.dataforge.plots.data.TimePlottable;
import hep.dataforge.plots.data.TimePlottableGroup; import hep.dataforge.plots.data.TimePlottableGroup;
import hep.dataforge.plots.data.XYPlottable;
import hep.dataforge.plots.fx.FXPlotFrame; import hep.dataforge.plots.fx.FXPlotFrame;
import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.fx.PlotContainer;
import hep.dataforge.plots.jfreechart.JFreeChartFrame; import hep.dataforge.plots.jfreechart.JFreeChartFrame;
@ -45,7 +44,7 @@ import java.util.ResourceBundle;
public class PKT8PlotController implements Initializable, MeasurementListener<PKT8Result> { public class PKT8PlotController implements Initializable, MeasurementListener<PKT8Result> {
private final PKT8Device device; private final PKT8Device device;
private FXPlotFrame<XYPlottable> plotFrame; private FXPlotFrame plotFrame;
private TimePlottableGroup plottables; private TimePlottableGroup plottables;
@FXML @FXML

2
numass-viewer/build.gradle
View File

@ -5,7 +5,7 @@ if (!hasProperty('mainClass')) {
} }
mainClassName = mainClass mainClassName = mainClass
version = "0.3.7 - SNAPSHOT" version = "0.3.7"
description = "The viewer for numass data" description = "The viewer for numass data"

7
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
View File

@ -28,7 +28,10 @@ import hep.dataforge.io.ColumnedDataWriter;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.plots.XYPlotFrame; 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.FXPlotFrame;
import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.fx.PlotContainer;
import hep.dataforge.plots.jfreechart.JFreeChartFrame; import hep.dataforge.plots.jfreechart.JFreeChartFrame;
@ -324,7 +327,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
* update detector pane with new data * update detector pane with new data
*/ */
private void updateDetectorPane(List<NMPoint> points, int binning, boolean normalize) { private void updateDetectorPane(List<NMPoint> points, int binning, boolean normalize) {
FXPlotFrame<XYPlottable> detectorPlotFrame; FXPlotFrame detectorPlotFrame;
if (detectorPlot.getPlot() == null) { if (detectorPlot.getPlot() == null) {
Meta frameMeta = new MetaBuilder("frame") Meta frameMeta = new MetaBuilder("frame")
.setValue("title", "Detector response plot") .setValue("title", "Detector response plot")