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

build fixes

Browse Source
This commit is contained in:
darksnake 2016-09-14 16:51:58 +03:00
parent efc6a5bb8b
commit e03d8ccfe5
3 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
View File

@ -39,14 +39,6 @@ import hep.dataforge.values.Value;
import inr.numass.client.NumassClient; import inr.numass.client.NumassClient;
import inr.numass.control.msp.MspDevice; import inr.numass.control.msp.MspDevice;
import inr.numass.control.msp.MspListener; import inr.numass.control.msp.MspListener;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
@ -66,6 +58,15 @@ import javafx.util.StringConverter;
import org.controlsfx.control.ToggleSwitch; import org.controlsfx.control.ToggleSwitch;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
/** /**
* FXML Controller class * FXML Controller class
* *
@ -76,19 +77,23 @@ public class MspViewController implements Initializable, MspListener {
public static final String MSP_DEVICE_TYPE = "msp"; public static final String MSP_DEVICE_TYPE = "msp";
public static final String DEFAULT_CONFIG_LOCATION = "msp-config.xml"; public static final String DEFAULT_CONFIG_LOCATION = "msp-config.xml";
private MspDevice device;
private Configuration viewConfig;
private JFreeChartFrame plot;
private final DynamicPlottableSet plottables = new DynamicPlottableSet(); private final DynamicPlottableSet plottables = new DynamicPlottableSet();
private final String mspName = "msp"; private final String mspName = "msp";
private MspDevice device;
private Configuration viewConfig;
private JFreeChartFrame plot;
private ConsoleFragment logArea; private ConsoleFragment logArea;
private StorageConnection connection;
@FXML
private Slider autoRangeSlider;
@FXML
private ToggleSwitch fillamentButton;
@FXML
private Circle fillamentIndicator;
@FXML
private ToggleButton plotButton;
@FXML
private AnchorPane plotPane;
private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() { private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() {
@Override @Override
@ -102,19 +107,6 @@ public class MspViewController implements Initializable, MspListener {
} }
}; };
private StorageConnection connection;
@FXML
private Slider autoRangeSlider;
@FXML
private ToggleSwitch fillamentButton;
@FXML
private Circle fillamentIndicator;
@FXML
private ToggleButton plotButton;
@FXML
private AnchorPane plotPane;
@FXML @FXML
private ToggleButton consoleButton; private ToggleButton consoleButton;
@FXML @FXML

73
numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java
View File

@ -17,9 +17,9 @@ import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.fx.ConsoleFragment; import hep.dataforge.fx.ConsoleFragment;
import hep.dataforge.meta.Meta; import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder; import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.plots.PlotFrame;
import hep.dataforge.plots.data.DynamicPlottable; import hep.dataforge.plots.data.DynamicPlottable;
import hep.dataforge.plots.data.DynamicPlottableSet; import hep.dataforge.plots.data.DynamicPlottableSet;
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;
import hep.dataforge.storage.api.PointLoader; import hep.dataforge.storage.api.PointLoader;
@ -31,16 +31,6 @@ import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.values.Value; import hep.dataforge.values.Value;
import hep.dataforge.values.ValueType; import hep.dataforge.values.ValueType;
import inr.numass.readvac.devices.VacCollectorDevice; import inr.numass.readvac.devices.VacCollectorDevice;
import java.io.File;
import java.net.URL;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
import java.util.function.BiFunction;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
@ -58,6 +48,17 @@ import org.controlsfx.control.Notifications;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URL;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
import java.util.function.BiFunction;
/** /**
* FXML Controller class * FXML Controller class
* *
@ -65,23 +66,17 @@ import org.slf4j.LoggerFactory;
*/ */
public class VacCollectorController implements Initializable, DeviceListener, MeasurementListener<DataPoint> { public class VacCollectorController implements Initializable, DeviceListener, MeasurementListener<DataPoint> {
private Logger logger;
private final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ISO_LOCAL_DATE_TIME; private final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
private final String[] intervalNames = {"1 sec", "5 sec", "10 sec", "30 sec", "1 min"}; private final String[] intervalNames = {"1 sec", "5 sec", "10 sec", "30 sec", "1 min"};
private final int[] intervals = {1000, 5000, 10000, 30000, 60000}; private final int[] intervals = {1000, 5000, 10000, 30000, 60000};
private LoaderConnection storageConnection;
private VacCollectorDevice device;
private final List<VacuumeterView> views = new ArrayList<>(); private final List<VacuumeterView> views = new ArrayList<>();
ConsoleFragment consoleWindow;
private Logger logger;
private LoaderConnection storageConnection;
private VacCollectorDevice device;
private PlotContainer plotContainer; private PlotContainer plotContainer;
private DynamicPlottableSet plottables; private DynamicPlottableSet plottables;
private BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory; private BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory;
ConsoleFragment consoleWindow;
@FXML @FXML
private AnchorPane plotHolder; private AnchorPane plotHolder;
@FXML @FXML
@ -129,6 +124,23 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
return device; return device;
} }
public void setDevice(VacCollectorDevice device) {
this.device = device;
device.getSensors().stream().map((sensor) -> {
VacuumeterView controller;
if (sensor.meta().getBoolean("powerButton", false)) {
controller = new PoweredVacuumeterView();
} else {
controller = new VacuumeterView();
}
sensor.connect(controller, Roles.DEVICE_LISTENER_ROLE, Roles.MEASUREMENT_CONSUMER_ROLE);
return controller;
}).forEach((controller) -> {
views.add(controller);
});
setupView();
}
@Override @Override
public void notifyDeviceStateChanged(Device device, String name, Value state) { public void notifyDeviceStateChanged(Device device, String name, Value state) {
@ -163,7 +175,7 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
plotContainer.setPlot(setupPlot(plottables)); plotContainer.setPlot(setupPlot(plottables));
} }
private PlotFrame setupPlot(DynamicPlottableSet plottables) { private FXPlotFrame setupPlot(DynamicPlottableSet plottables) {
Meta plotConfig = new MetaBuilder("plotFrame") Meta plotConfig = new MetaBuilder("plotFrame")
.setNode(new MetaBuilder("yAxis") .setNode(new MetaBuilder("yAxis")
.setValue("type", "log") .setValue("type", "log")
@ -176,23 +188,6 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
return frame; return frame;
} }
public void setDevice(VacCollectorDevice device) {
this.device = device;
device.getSensors().stream().map((sensor) -> {
VacuumeterView controller;
if (sensor.meta().getBoolean("powerButton", false)) {
controller = new PoweredVacuumeterView();
} else {
controller = new VacuumeterView();
}
sensor.connect(controller, Roles.DEVICE_LISTENER_ROLE, Roles.MEASUREMENT_CONSUMER_ROLE);
return controller;
}).forEach((controller) -> {
views.add(controller);
});
setupView();
}
public void startMeasurement() throws ControlException { public void startMeasurement() throws ControlException {
getDevice().startMeasurement().addListener(this); getDevice().startMeasurement().addListener(this);
startStopButton.setSelected(true); startStopButton.setSelected(true);

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

@ -26,9 +26,9 @@ import hep.dataforge.context.Context;
import hep.dataforge.io.ColumnedDataWriter; 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.PlotFrame;
import hep.dataforge.plots.XYPlotFrame; import hep.dataforge.plots.XYPlotFrame;
import hep.dataforge.plots.data.*; import hep.dataforge.plots.data.*;
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;
import hep.dataforge.storage.commons.JSONMetaWriter; import hep.dataforge.storage.commons.JSONMetaWriter;
@ -321,7 +321,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) {
PlotFrame 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")