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

[no commit message]

Browse Source
This commit is contained in:
Alexander Nozik 2016-04-21 19:43:58 +03:00
parent 10f98472a8
commit b6323d2f90
14 changed files with 249 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
numass-control/magnet/src/main/java/inr/numass/control/magnet/MagnetController.java
View File

@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*/ */
public class MagnetController implements PortHandler.PortController { public class MagnetController implements PortHandler.PortController {
public static double CURRENT_PRECISION = 0.01; public static double CURRENT_PRECISION = 0.05;
// public static double CURRENT_STEP = 0.05; // public static double CURRENT_STEP = 0.05;
public static int DEFAULT_DELAY = 1; public static int DEFAULT_DELAY = 1;
public static int DEFAULT_MONITOR_DELAY = 2000; public static int DEFAULT_MONITOR_DELAY = 2000;
@ -353,10 +353,11 @@ public class MagnetController implements PortHandler.PortController {
*/ */
public void stopMonitorTask() { public void stopMonitorTask() {
if (monitorTask != null) { if (monitorTask != null) {
monitorTask.cancel(false); monitorTask.cancel(true);
if (listener != null) { if (listener != null) {
listener.monitorTaskStateChanged(getName(), false); listener.monitorTaskStateChanged(getName(), false);
} }
monitorTask = null;
} }
} }

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

@ -23,7 +23,7 @@ import hep.dataforge.points.MapPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.PortException; import hep.dataforge.exceptions.PortException;
import hep.dataforge.exceptions.StorageException; import hep.dataforge.exceptions.StorageException;
import hep.dataforge.fx.ConsoleWindow; import hep.dataforge.fx.ConsoleFragment;
import hep.dataforge.io.MetaFileReader; import hep.dataforge.io.MetaFileReader;
import hep.dataforge.meta.ConfigChangeListener; import hep.dataforge.meta.ConfigChangeListener;
import hep.dataforge.meta.Configuration; import hep.dataforge.meta.Configuration;
@ -88,7 +88,7 @@ public class MspViewController implements Initializable, MspListener {
private final String mspName = "msp"; private final String mspName = "msp";
private ConsoleWindow logArea; private ConsoleFragment logArea;
private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() { private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() {
@ -131,7 +131,8 @@ public class MspViewController implements Initializable, MspListener {
*/ */
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
logArea = new ConsoleWindow(consoleButton); logArea = new ConsoleFragment();
logArea.bindTo(consoleButton);
fillamentSelector.setItems(FXCollections.observableArrayList(1, 2)); fillamentSelector.setItems(FXCollections.observableArrayList(1, 2));
fillamentSelector.setConverter(new StringConverter<Integer>() { fillamentSelector.setConverter(new StringConverter<Integer>() {
@Override @Override

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

@ -15,7 +15,7 @@ import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.points.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.exceptions.ControlException; import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.MeasurementException; import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.fx.ConsoleWindow; 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.PlotFrame;
@ -80,7 +80,7 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
private DynamicPlottableSet plottables; private DynamicPlottableSet plottables;
private BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory; private BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory;
ConsoleWindow consoleWindow; ConsoleFragment consoleWindow;
@FXML @FXML
private AnchorPane plotHolder; private AnchorPane plotHolder;
@ -115,7 +115,8 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
} }
}); });
consoleWindow = new ConsoleWindow(logButton); consoleWindow = new ConsoleFragment();
consoleWindow.bindTo(logButton);
consoleWindow.hookStd(); consoleWindow.hookStd();
} }

29
numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
View File

@ -22,6 +22,7 @@ import hep.dataforge.fx.FXProcessManager;
import hep.dataforge.fx.LogOutputPane; import hep.dataforge.fx.LogOutputPane;
import hep.dataforge.fx.MetaEditor; import hep.dataforge.fx.MetaEditor;
import hep.dataforge.fx.MetaTreeItem; import hep.dataforge.fx.MetaTreeItem;
import hep.dataforge.fx.ProcessManagerFragment;
import hep.dataforge.io.IOManager; import hep.dataforge.io.IOManager;
import hep.dataforge.io.MetaFileReader; import hep.dataforge.io.MetaFileReader;
import hep.dataforge.meta.ConfigChangeListener; import hep.dataforge.meta.ConfigChangeListener;
@ -49,16 +50,13 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.Accordion; import javafx.scene.control.Accordion;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.control.TabPane; import javafx.scene.control.TabPane;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import javafx.scene.control.TitledPane; import javafx.scene.control.TitledPane;
import javafx.scene.layout.AnchorPane;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage;
import org.controlsfx.control.StatusBar; import org.controlsfx.control.StatusBar;
/** /**
@ -80,8 +78,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
Map<String, StagePane> stages = new ConcurrentHashMap<>(); Map<String, StagePane> stages = new ConcurrentHashMap<>();
FXProcessManager processManager = new FXProcessManager(); ProcessManagerFragment processWindow = new ProcessManagerFragment(new FXProcessManager());
Stage processManagerStage;
@FXML @FXML
private StatusBar statusBar; private StatusBar statusBar;
@ -94,7 +91,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
@FXML @FXML
private Accordion metaContainer; private Accordion metaContainer;
@FXML @FXML
private Tab LogTab; private Tab logTab;
LogOutputPane logPane; LogOutputPane logPane;
@FXML @FXML
@ -119,7 +116,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
logPane = new LogOutputPane(); logPane = new LogOutputPane();
LogTab.setContent(logPane); logTab.setContent(logPane);
ConsoleDude.hookStdStreams(consoleArea); ConsoleDude.hookStdStreams(consoleArea);
} }
@ -134,7 +131,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
private void buildContext(Meta config) { private void buildContext(Meta config) {
this.context = this.contextFactory.build(parentContext, config); this.context = this.contextFactory.build(parentContext, config);
context.setIO(new WorkbenchIOManager(new NumassIO(), this)); context.setIO(new WorkbenchIOManager(new NumassIO(), this));
context.setProcessManager(processManager); processWindow = ProcessManagerFragment.attachToContext(context);
buildContextPane(); buildContextPane();
this.logPane.attachLog(context); this.logPane.attachLog(context);
context.getLogger().addAppender(logPane.getLoggerAppender()); context.getLogger().addAppender(logPane.getLoggerAppender());
@ -144,19 +141,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
((PlotsPlugin) context.provide("plots")).setPlotHolderDelegate(this); ((PlotsPlugin) context.provide("plots")).setPlotHolderDelegate(this);
} }
private void showTaskPane() {
if (processManagerStage == null) {
processManagerStage = new Stage();
processManagerStage.setWidth(400);
processManagerStage.setHeight(400);
AnchorPane pane = new AnchorPane();
processManager.show(pane);
Scene scene = new Scene(pane, 400, 400);
processManagerStage.setTitle("Task manager");
processManagerStage.setScene(scene);
}
processManagerStage.show();
}
private Tab findTabWithName(TabPane pane, String name) { private Tab findTabWithName(TabPane pane, String name) {
return pane.getTabs().stream().filter((t) -> t.getText().equals(name)).findFirst().orElse(null); return pane.getTabs().stream().filter((t) -> t.getText().equals(name)).findFirst().orElse(null);
@ -326,7 +311,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void runActions() { public void runActions() {
clearAllStages(); clearAllStages();
showTaskPane(); processWindow.show();
new Thread(() -> { new Thread(() -> {
DataNode data = new FileDataFactory().build(getContext(), getDataConfiguration()); DataNode data = new FileDataFactory().build(getContext(), getDataConfiguration());
if (data.isEmpty()) { if (data.isEmpty()) {

6
numass-main/src/main/java/inr/numass/workbench/TextOutputTab.java
View File

@ -29,7 +29,7 @@ public class TextOutputTab extends OutputTab {
super(name); super(name);
// out = new DataOutputPane(); // out = new DataOutputPane();
out = new FXDataOutputPane(); out = new FXDataOutputPane();
setContent(out); setContent(out.getHolder());
setOnClosed((Event event) -> close()); setOnClosed((Event event) -> close());
} }
@ -43,8 +43,8 @@ public class TextOutputTab extends OutputTab {
clear(); clear();
} }
public OutputStream getStream(OutputStream forward) { public OutputStream getStream() {
return out.getOutputStream(forward); return out.getOutputStream();
} }
} }

5
numass-main/src/main/java/inr/numass/workbench/WorkbenchIOManager.java
View File

@ -11,6 +11,7 @@ import hep.dataforge.names.Name;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import org.apache.commons.io.output.TeeOutputStream;
/** /**
* An IOManager wrapper that redirects output to appropriate FX components * An IOManager wrapper that redirects output to appropriate FX components
@ -53,7 +54,9 @@ public class WorkbenchIOManager implements IOManager {
@Override @Override
public OutputStream out(Name stage, Name name) { public OutputStream out(Name stage, Name name) {
return holder.getStagePane(stage.toString()).buildTextOutput(name.toString()).getStream(manager.out(stage, name)); OutputStream primary = holder.getStagePane(stage.toString()).buildTextOutput(name.toString()).getStream();
OutputStream secondary = manager.out(stage, name);
return new TeeOutputStream(primary, secondary);
} }
@Override @Override

16
numass-viewer/src/main/java/inr/numass/viewer/FXTaskManager.java
View File

@ -1,16 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.viewer;
import javafx.concurrent.Task;
/**
*
* @author Alexander Nozik <altavir@gmail.com>
*/
public interface FXTaskManager {
void postTask(Task task);
}

134
numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java
View File

@ -15,16 +15,19 @@
*/ */
package inr.numass.viewer; package inr.numass.viewer;
import de.jensd.shichimifx.utils.ConsoleDude; import hep.dataforge.context.Context;
import de.jensd.shichimifx.utils.SplitPaneDividerSlider; import hep.dataforge.context.GlobalContext;
import hep.dataforge.context.ProcessManager;
import hep.dataforge.exceptions.StorageException; import hep.dataforge.exceptions.StorageException;
import hep.dataforge.fx.ConsoleFragment;
import hep.dataforge.fx.ProcessManagerFragment;
import inr.numass.data.NumassData; import inr.numass.data.NumassData;
import inr.numass.storage.NumassStorage; import inr.numass.storage.NumassStorage;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;
import java.util.Optional; import java.util.Optional;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.concurrent.ExecutionException; import java.util.function.Consumer;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javafx.application.Platform; import javafx.application.Platform;
@ -39,41 +42,35 @@ import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;
import javafx.scene.control.Dialog; import javafx.scene.control.Dialog;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.SplitPane;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.control.TabPane; import javafx.scene.control.TabPane;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton; import javafx.scene.control.ToggleButton;
import javafx.scene.control.TreeTableView; import javafx.scene.control.TreeTableView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.stage.DirectoryChooser; import javafx.stage.DirectoryChooser;
import javafx.util.Duration;
import javafx.util.Pair; import javafx.util.Pair;
import org.controlsfx.control.StatusBar; import org.controlsfx.control.StatusBar;
import org.controlsfx.control.TaskProgressView;
/** /**
* FXML Controller class * FXML Controller class
* *
* @author Alexander Nozik * @author Alexander Nozik
*/ */
public class MainViewerController implements Initializable, FXTaskManager { public class MainViewerController implements Initializable {
public static MainViewerController build(NumassStorage root) { public static MainViewerController build(NumassStorage root) {
MainViewerController res = new MainViewerController(); MainViewerController res = new MainViewerController();
res.setRootStorage(root); res.setRootStorage(root);
return res; return res;
} }
@FXML
private TextArea consoleArea; // private ConsoleFragment consoleFragment;
// private ProcessManagerFragment processFragment = ProcessManagerFragment.attachToContext(GlobalContext.instance());
@FXML @FXML
private ToggleButton consoleButton; private ToggleButton consoleButton;
@FXML @FXML
private SplitPane consoleSplit;
@FXML
private Button loadDirectoryButton; private Button loadDirectoryButton;
private MspViewController mspController; private MspViewController mspController;
@ -105,9 +102,7 @@ public class MainViewerController implements Initializable, FXTaskManager {
@FXML @FXML
private Label storagePathLabel; private Label storagePathLabel;
@FXML @FXML
private ScrollPane taskPane; private ToggleButton processManagerButton;
private TaskProgressView progressView;
// private Popup progressPopup; // private Popup progressPopup;
/** /**
@ -118,20 +113,10 @@ public class MainViewerController implements Initializable, FXTaskManager {
*/ */
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
// TabPaneDetacher.create().makeTabsDetachable(tabPane); ConsoleFragment consoleFragment = new ConsoleFragment();
ConsoleDude.hookStdStreams(consoleArea); consoleFragment.hookStd();
consoleFragment.bindTo(consoleButton);
SplitPaneDividerSlider slider = new SplitPaneDividerSlider(consoleSplit, 0, ProcessManagerFragment.attachToContext(GlobalContext.instance()).bindTo(processManagerButton);
SplitPaneDividerSlider.Direction.DOWN, Duration.seconds(1));
slider.aimContentVisibleProperty().bindBidirectional(consoleButton.selectedProperty());
consoleButton.setSelected(false);
// loadRemoteButton.setDisable(true);
progressView = new TaskProgressView();
taskPane.setContent(progressView);
// taskPane.setPrefWidth(510);
} }
@FXML @FXML
@ -144,11 +129,25 @@ public class MainViewerController implements Initializable, FXTaskManager {
final File rootDir = chooser.showDialog(((Node) event.getTarget()).getScene().getWindow()); final File rootDir = chooser.showDialog(((Node) event.getTarget()).getScene().getWindow());
if (rootDir != null) { if (rootDir != null) {
Task dirLoadTask = new DirectoryLoadTask(rootDir.toURI().toString()); loadDirectory(rootDir.toURI().toString());
postTask(dirLoadTask); }
Viewer.runTask(dirLoadTask);
} }
private void loadDirectory(String path) {
getContext().processManager().post("viewer.loadDirectory", (ProcessManager.Callback callback) -> {
callback.updateTitle("Load storage (" + path + ")");
callback.updateProgress(-1, 1);
callback.updateMessage("Building numass storage tree...");
try {
NumassStorage root = NumassStorage.buildNumassRoot(path, true, false);
setRootStorage(root);
Platform.runLater(() -> storagePathLabel.setText("Storage: " + path));
} catch (StorageException ex) {
callback.updateProgress(0, 1);
callback.updateMessage("Failed to load storage " + path);
Logger.getLogger(MainViewerController.class.getName()).log(Level.SEVERE, null, ex);
}
});
} }
private class DirectoryLoadTask extends Task<Void> { private class DirectoryLoadTask extends Task<Void> {
@ -178,43 +177,25 @@ public class MainViewerController implements Initializable, FXTaskManager {
} }
@Override private Context getContext() {
@SuppressWarnings("unchecked") return GlobalContext.instance();
public void postTask(Task task) {
Platform.runLater(() -> progressView.getTasks().add(task));
} }
public void setRootStorage(NumassStorage root) { public void setRootStorage(NumassStorage root) {
Task fillTask = new StorageDataFillTask(root); // Task fillTask = new StorageDataFillTask(root);
postTask(fillTask); // postTask(fillTask);
Viewer.runTask(fillTask); // Viewer.runTask(fillTask);
mspController = new MspViewController(this, mspPlotPane);
mspController.fillMspData(root);
pressuresTab.getContent().setVisible(false);
temperaturesTab.getContent().setVisible(false);
}
private class StorageDataFillTask extends Task<Void> {
private final NumassStorage root;
public StorageDataFillTask(NumassStorage root) {
this.root = root;
}
getContext().processManager().post("viewer.storage.load", new Consumer<ProcessManager.Callback>() {
@Override @Override
protected Void call() throws Exception { public void accept(ProcessManager.Callback callback) {
updateTitle("Fill data to UI (" + root.getName() + ")"); callback.updateTitle("Fill data to UI (" + root.getName() + ")");
this.updateProgress(-1, 1); callback.updateProgress(-1, 1);
this.updateMessage("Loading numass storage tree..."); callback.updateMessage("Loading numass storage tree...");
Task treeBuilderTask = new NumassLoaderTreeBuilder(numassLoaderDataTree, root, (NumassData loader) -> { new NumassLoaderTreeBuilder().build(getContext(), numassLoaderDataTree, root, (NumassData loader) -> {
NumassLoaderViewComponent component = new NumassLoaderViewComponent(); NumassLoaderViewComponent component = new NumassLoaderViewComponent(getContext());
component.loadData(loader); component.loadData(loader);
component.setCallback(MainViewerController.this);
numassLoaderViewContainer.getChildren().clear(); numassLoaderViewContainer.getChildren().clear();
numassLoaderViewContainer.getChildren().add(component); numassLoaderViewContainer.getChildren().add(component);
AnchorPane.setTopAnchor(component, 0.0); AnchorPane.setTopAnchor(component, 0.0);
@ -223,19 +204,19 @@ public class MainViewerController implements Initializable, FXTaskManager {
AnchorPane.setBottomAnchor(component, 0.0); AnchorPane.setBottomAnchor(component, 0.0);
numassLoaderViewContainer.requestLayout(); numassLoaderViewContainer.requestLayout();
}); });
postTask(treeBuilderTask);
Viewer.runTask(treeBuilderTask); callback.updateProgress(0, 1);
try { callback.updateMessage("Numass storage tree loaded.");
treeBuilderTask.get();
this.updateProgress(0, 1);
this.updateMessage("Numass storage tree loaded.");
this.succeeded();
} catch (InterruptedException | ExecutionException ex) {
this.failed();
throw new RuntimeException(ex);
} }
return null;
} }
);
mspController = new MspViewController(getContext(), mspPlotPane);
mspController.fillMspData(root);
pressuresTab.getContent().setVisible(false);
temperaturesTab.getContent().setVisible(false);
} }
@ -282,9 +263,8 @@ public class MainViewerController implements Initializable, FXTaskManager {
Optional<Pair<String, String>> result = dialog.showAndWait(); Optional<Pair<String, String>> result = dialog.showAndWait();
if (result.isPresent()) { if (result.isPresent()) {
Task dirLoadTask = new DirectoryLoadTask(result.get().getKey() + "/data/" + result.get().getValue()); String path = result.get().getKey() + "/data/" + result.get().getValue();
postTask(dirLoadTask); loadDirectory(path);
Viewer.runTask(dirLoadTask);
} }
} }
} }

10
numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
View File

@ -20,6 +20,7 @@ package inr.numass.viewer;
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
import hep.dataforge.context.Context;
import hep.dataforge.points.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.points.MapPoint; import hep.dataforge.points.MapPoint;
import hep.dataforge.plots.PlotUtils; import hep.dataforge.plots.PlotUtils;
@ -45,12 +46,12 @@ import org.slf4j.LoggerFactory;
*/ */
public class MspViewController { public class MspViewController {
private FXTaskManager callback;
private final AnchorPane mspPlotPane; private final AnchorPane mspPlotPane;
private final Context context;
public MspViewController(FXTaskManager callback, AnchorPane mspPlotPane) { public MspViewController(Context context, AnchorPane mspPlotPane) {
this.callback = callback; this.context = context;
this.mspPlotPane = mspPlotPane; this.mspPlotPane = mspPlotPane;
} }
@ -168,9 +169,6 @@ public class MspViewController {
} }
public void setCallback(FXTaskManager callback) {
this.callback = callback;
}
/** /**
* Create a null value point to terminate msp series * Create a null value point to terminate msp series

63
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java
View File

@ -15,6 +15,8 @@
*/ */
package inr.numass.viewer; package inr.numass.viewer;
import hep.dataforge.context.Context;
import hep.dataforge.context.ProcessManager;
import hep.dataforge.exceptions.StorageException; import hep.dataforge.exceptions.StorageException;
import hep.dataforge.storage.api.Loader; import hep.dataforge.storage.api.Loader;
import hep.dataforge.storage.api.Storage; import hep.dataforge.storage.api.Storage;
@ -26,7 +28,6 @@ import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.concurrent.Task;
import javafx.scene.control.TreeItem; import javafx.scene.control.TreeItem;
import javafx.scene.control.TreeTableColumn; import javafx.scene.control.TreeTableColumn;
import javafx.scene.control.TreeTableView; import javafx.scene.control.TreeTableView;
@ -36,24 +37,26 @@ import javafx.scene.input.MouseEvent;
* *
* @author darksnake * @author darksnake
*/ */
public class NumassLoaderTreeBuilder extends Task<Void> { public class NumassLoaderTreeBuilder {
private final TreeTableView<TreeItemValue> numassLoaderDataTree; // private final TreeTableView<TreeItemValue> numassLoaderDataTree;
private final NumassStorage rootStorage; // private final NumassStorage rootStorage;
private final Consumer<NumassData> numassViewBuilder; // private final Consumer<NumassData> numassViewBuilder;
//
// public NumassLoaderTreeBuilder(TreeTableView<TreeItemValue> numassLoaderDataTree, NumassStorage rootStorage, Consumer<NumassData> numassViewBuilder) {
// this.numassLoaderDataTree = numassLoaderDataTree;
// this.rootStorage = rootStorage;
// this.numassViewBuilder = numassViewBuilder;
// }
public void build(Context context,
TreeTableView<TreeItemValue> numassLoaderDataTree,
NumassStorage rootStorage,
Consumer<NumassData> numassViewBuilder) {
public NumassLoaderTreeBuilder(TreeTableView<TreeItemValue> numassLoaderDataTree, NumassStorage rootStorage, Consumer<NumassData> numassViewBuilder) { context.processManager().post("viewer.storage.load.buildTree", (ProcessManager.Callback callback) -> {
this.numassLoaderDataTree = numassLoaderDataTree; try {
this.rootStorage = rootStorage; callback.updateTitle("Load numass data (" + rootStorage.getName() + ")");
this.numassViewBuilder = numassViewBuilder; TreeItem<TreeItemValue> root = buildNode(rootStorage, numassViewBuilder, callback);
}
@SuppressWarnings("unchecked")
@Override
protected Void call() throws Exception {
updateTitle("Load numass data ("+rootStorage.getName()+")");
TreeItem<TreeItemValue> root = buildNode(rootStorage, numassViewBuilder);
root.setExpanded(true); root.setExpanded(true);
// numassLoaderDataTree.setShowRoot(true); // numassLoaderDataTree.setShowRoot(true);
@ -86,31 +89,37 @@ public class NumassLoaderTreeBuilder extends Task<Void> {
numassLoaderTimeColumn.setVisible(false); numassLoaderTimeColumn.setVisible(false);
nummassLoaderDescriptionColumn.setVisible(false); nummassLoaderDescriptionColumn.setVisible(false);
}); });
return null; } catch (StorageException ex) {
throw new RuntimeException(ex);
}
});
} }
private TreeItem<TreeItemValue> buildNode(NumassStorage storage, Consumer<NumassData> numassViewBuilder) throws StorageException { private TreeItem<TreeItemValue> buildNode(NumassStorage storage,
Consumer<NumassData> numassViewBuilder, ProcessManager.Callback callback) throws StorageException {
TreeItem<TreeItemValue> node = new TreeItem<>(buildValue(storage)); TreeItem<TreeItemValue> node = new TreeItem<>(buildValue(storage));
node.getChildren().setAll(buildChildren(storage, numassViewBuilder)); node.getChildren().setAll(buildChildren(storage, numassViewBuilder, callback));
return node; return node;
} }
private List<TreeItem<TreeItemValue>> buildChildren(NumassStorage storage, Consumer<NumassData> numassViewBuilder) throws StorageException { private List<TreeItem<TreeItemValue>> buildChildren(NumassStorage storage,
Consumer<NumassData> numassViewBuilder, ProcessManager.Callback callback) throws StorageException {
List<TreeItem<TreeItemValue>> list = new ArrayList<>(); List<TreeItem<TreeItemValue>> list = new ArrayList<>();
for (Storage subStorage : storage.shelves().values()) { for (Storage subStorage : storage.shelves().values()) {
if (subStorage instanceof NumassStorage) { if (subStorage instanceof NumassStorage) {
NumassStorage numassSubStorage = (NumassStorage) subStorage; NumassStorage numassSubStorage = (NumassStorage) subStorage;
list.add(buildNode(numassSubStorage, numassViewBuilder)); list.add(buildNode(numassSubStorage, numassViewBuilder, callback));
} }
} }
updateMessage("Building storage " + storage.getName()); callback.updateMessage("Building storage " + storage.getName());
double counter = 0; double counter = 0;
for (Loader loader : storage.loaders().values()) { for (Loader loader : storage.loaders().values()) {
updateMessage("Building numass data loader " + loader.getName()); callback.updateMessage("Building numass data loader " + loader.getName());
updateProgress(counter, storage.loaders().size()); callback.updateProgress(counter, storage.loaders().size());
if (loader instanceof NumassData) { if (loader instanceof NumassData) {
NumassData numassLoader = (NumassData) loader; NumassData numassLoader = (NumassData) loader;
@ -132,8 +141,8 @@ public class NumassLoaderTreeBuilder extends Task<Void> {
//adding legacy data files //adding legacy data files
counter = 0; counter = 0;
for (NumassData legacyDat : storage.legacyFiles()) { for (NumassData legacyDat : storage.legacyFiles()) {
updateMessage("Loading numass DAT file " + legacyDat.getName()); callback.updateMessage("Loading numass DAT file " + legacyDat.getName());
updateProgress(counter, storage.loaders().size()); callback.updateProgress(counter, storage.loaders().size());
TreeItem<TreeItemValue> numassLoaderTreeItem = new TreeItem<>(buildValue(legacyDat)); TreeItem<TreeItemValue> numassLoaderTreeItem = new TreeItem<>(buildValue(legacyDat));
list.add(numassLoaderTreeItem); list.add(numassLoaderTreeItem);
counter++; counter++;

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

@ -20,6 +20,8 @@ package inr.numass.viewer;
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
import hep.dataforge.context.Context;
import hep.dataforge.context.ProcessManager;
import hep.dataforge.points.DataPoint; import hep.dataforge.points.DataPoint;
import hep.dataforge.points.ListPointSet; import hep.dataforge.points.ListPointSet;
import hep.dataforge.points.MapPoint; import hep.dataforge.points.MapPoint;
@ -42,7 +44,6 @@ import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.concurrent.ExecutionException;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javafx.application.Platform; import javafx.application.Platform;
@ -81,7 +82,7 @@ import hep.dataforge.points.PointSet;
*/ */
public class NumassLoaderViewComponent extends AnchorPane implements Initializable { public class NumassLoaderViewComponent extends AnchorPane implements Initializable {
private FXTaskManager callback; private final Context context;
Logger logger = LoggerFactory.getLogger(NumassLoaderViewComponent.class); Logger logger = LoggerFactory.getLogger(NumassLoaderViewComponent.class);
private NumassData data; private NumassData data;
@ -125,7 +126,8 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
@FXML @FXML
private TextField dTimeField; private TextField dTimeField;
public NumassLoaderViewComponent() { public NumassLoaderViewComponent(Context context) {
this.context = context;
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/NumassLoaderView.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/NumassLoaderView.fxml"));
loader.setRoot(this); loader.setRoot(this);
@ -186,23 +188,30 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
return data; return data;
} }
public void setCallback(FXTaskManager callback) {
this.callback = callback;
}
public void loadData(NumassData data) { public void loadData(NumassData data) {
this.data = data; this.data = data;
if (data != null) { if (data != null) {
LoadPointsTask task = new LoadPointsTask(data); context.processManager().<List<NMPoint>>post("viewer.numass.load", (ProcessManager.Callback callback) -> {
if (callback != null) { callback.updateTitle("Load numass data (" + data.getName() + ")");
callback.postTask(task); points = data.getNMPoints();
} Platform.runLater(() -> {
Viewer.runTask(task); //setup detector data
try { setupDetectorPane(points);
this.points = task.get(); //setup spectrum plot
} catch (InterruptedException |ExecutionException ex) { updateSpectrumPane(points);
logger.error("Can't load spectrum data points", ex); setupInfo(data);
} });
});
// LoadPointsTask task = new LoadPointsTask(data);
// if (callback != null) {
// callback.postTask(task);
// }
// Viewer.runTask(task);
// try {
// this.points = task.get();
// } catch (InterruptedException | ExecutionException ex) {
// logger.error("Can't load spectrum data points", ex);
// }
} else { } else {
logger.error("The data model is null"); logger.error("The data model is null");
} }
@ -359,7 +368,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
for (NMPoint point : points) { for (NMPoint point : points) {
String seriesName = String.format("%d: %.2f (%.2f)", points.indexOf(point), point.getUset(), point.getUread()); String seriesName = String.format("%d: %.2f (%.2f)", points.indexOf(point), point.getUset(), point.getUread());
PlottableData datum = PlottableData.plot(seriesName,new XYAdapter("chanel", "count"), point.getData(binning, normalize)); PlottableData datum = PlottableData.plot(seriesName, new XYAdapter("chanel", "count"), point.getData(binning, normalize));
datum.configure(plottableConfig); datum.configure(plottableConfig);
plottables.add(datum); plottables.add(datum);
} }

3
numass-viewer/src/main/java/inr/numass/viewer/TestDirectoryViewer.java
View File

@ -15,6 +15,7 @@
*/ */
package inr.numass.viewer; package inr.numass.viewer;
import hep.dataforge.context.GlobalContext;
import hep.dataforge.storage.commons.StorageManager; import hep.dataforge.storage.commons.StorageManager;
import inr.numass.storage.NumassDataLoader; import inr.numass.storage.NumassDataLoader;
import java.io.File; import java.io.File;
@ -36,7 +37,7 @@ public class TestDirectoryViewer extends Application {
NumassDataLoader reader = NumassDataLoader.fromLocalDir(null, new File("C:\\Users\\darksnake\\Dropbox\\PlayGround\\data-test\\20150703143643_1\\")); NumassDataLoader reader = NumassDataLoader.fromLocalDir(null, new File("C:\\Users\\darksnake\\Dropbox\\PlayGround\\data-test\\20150703143643_1\\"));
// NumassLoader reader = NumassLoader.fromZip(null, new File("C:\\Users\\darksnake\\Dropbox\\PlayGround\\data-test\\20150703143643_1.zip")); // NumassLoader reader = NumassLoader.fromZip(null, new File("C:\\Users\\darksnake\\Dropbox\\PlayGround\\data-test\\20150703143643_1.zip"));
NumassLoaderViewComponent comp = new NumassLoaderViewComponent(); NumassLoaderViewComponent comp = new NumassLoaderViewComponent(GlobalContext.instance());
comp.loadData(reader); comp.loadData(reader);
// FXMLLoader fxml = new FXMLLoader(getClass().getResource("/fxml/DirectoryViewer.fxml")); // FXMLLoader fxml = new FXMLLoader(getClass().getResource("/fxml/DirectoryViewer.fxml"));
// //

12
numass-viewer/src/main/java/inr/numass/viewer/Viewer.java
View File

@ -49,14 +49,14 @@ public class Viewer extends Application {
@Override @Override
public void stop() throws Exception { public void stop() throws Exception {
super.stop(); super.stop();
System.exit(0); // System.exit(0);
} }
public static void runTask(Task task) { // public static void runTask(Task task) {
Thread th = new Thread(task); // Thread th = new Thread(task);
th.setDaemon(true); // th.setDaemon(true);
th.start(); // th.start();
} // }
/** /**
* @param args the command line arguments * @param args the command line arguments

77
numass-viewer/src/main/resources/fxml/MainView.fxml
View File

@ -16,22 +16,47 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<?import javafx.geometry.*?> <?import javafx.geometry.Insets?>
<?import javafx.scene.text.*?> <?import javafx.scene.control.Button?>
<?import org.controlsfx.control.*?> <?import javafx.scene.control.Label?>
<?import java.lang.*?> <?import javafx.scene.control.SplitPane?>
<?import java.util.*?> <?import javafx.scene.control.Tab?>
<?import javafx.scene.*?> <?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.ToggleButton?>
<?import javafx.scene.layout.*?> <?import javafx.scene.control.ToolBar?>
<?import javafx.scene.control.TreeTableView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<AnchorPane id="AnchorPane" prefHeight="768.0" prefWidth="1024.0" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1" fx:controller="inr.numass.viewer.MainViewerController"> <AnchorPane id="AnchorPane" prefHeight="768.0" prefWidth="1024.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="inr.numass.viewer.MainViewerController">
<children> <children>
<BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<center> <top>
<SplitPane fx:id="consoleSplit" dividerPositions="0.8" orientation="VERTICAL" BorderPane.alignment="CENTER"> <ToolBar nodeOrientation="LEFT_TO_RIGHT" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<items> <items>
<TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE"> <Button fx:id="loadDirectoryButton" mnemonicParsing="false" onAction="#onLoadDirectory" text="Load directory" />
<Button fx:id="loadRemoteButton" mnemonicParsing="false" onAction="#onLoadRemote" text="Remote storage" />
<Label fx:id="storagePathLabel" text="Storage:" textFill="BLUE" textOverrun="CENTER_ELLIPSIS">
<font>
<Font name="System Bold" size="13.0" />
</font>
<padding>
<Insets left="10.0" />
</padding></Label>
<Pane HBox.hgrow="ALWAYS" />
<ToggleButton fx:id="processManagerButton" mnemonicParsing="false" text="ProcessManager" />
<ToggleButton fx:id="consoleButton" contentDisplay="CENTER" mnemonicParsing="false" text="Console" />
</items>
</ToolBar>
</top>
<bottom>
<StatusBar fx:id="statusBar" BorderPane.alignment="CENTER" />
</bottom>
<center>
<TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs> <tabs>
<Tab fx:id="mainTab" closable="false" text="Main"> <Tab fx:id="mainTab" closable="false" text="Main">
<content> <content>
@ -72,35 +97,7 @@ limitations under the License.
</Tab> </Tab>
</tabs> </tabs>
</TabPane> </TabPane>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<ScrollPane fx:id="taskPane" hbarPolicy="NEVER" minWidth="510.0" prefWidth="510.0" vmax="510.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
<TextArea fx:id="consoleArea" editable="false" minHeight="0.0" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="510.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children>
</AnchorPane>
</items>
</SplitPane>
</center> </center>
<top>
<ToolBar nodeOrientation="LEFT_TO_RIGHT" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<items>
<Button fx:id="loadDirectoryButton" mnemonicParsing="false" onAction="#onLoadDirectory" text="Load directory" />
<Button fx:id="loadRemoteButton" mnemonicParsing="false" onAction="#onLoadRemote" text="Remote storage" />
<Label fx:id="storagePathLabel" text="Storage:" textFill="BLUE" textOverrun="CENTER_ELLIPSIS">
<font>
<Font name="System Bold" size="13.0" />
</font>
<padding>
<Insets left="10.0" />
</padding></Label>
<Pane HBox.hgrow="ALWAYS" />
<ToggleButton fx:id="consoleButton" contentDisplay="CENTER" mnemonicParsing="false" text="Console" />
</items>
</ToolBar>
</top>
<bottom>
<StatusBar fx:id="statusBar" BorderPane.alignment="CENTER" />
</bottom>
</BorderPane> </BorderPane>
</children> </children>
</AnchorPane> </AnchorPane>