Trying to implement caching
This commit is contained in:
parent
875123c81f
commit
bc05ae5006
@ -47,6 +47,14 @@ import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -6,8 +6,8 @@
|
||||
package inr.numass.actions;
|
||||
|
||||
import hep.dataforge.actions.GenericAction;
|
||||
import hep.dataforge.context.DFProcess;
|
||||
import hep.dataforge.context.ProcessManager.Callback;
|
||||
import hep.dataforge.work.Work;
|
||||
import hep.dataforge.work.WorkManager.Callback;
|
||||
import hep.dataforge.data.Data;
|
||||
import hep.dataforge.data.DataFilter;
|
||||
import hep.dataforge.data.DataNode;
|
||||
@ -42,7 +42,7 @@ public class ReadNumassStorageAction extends GenericAction<Void, NumassData> {
|
||||
boolean forwardOnly = actionMeta.getBoolean("forwardOnly", false);
|
||||
boolean reverseOnly = actionMeta.getBoolean("reverseOnly", false);
|
||||
|
||||
DFProcess<DataSet<NumassData>> process = getContext().processManager()
|
||||
Work<DataSet<NumassData>> process = getContext().workManager()
|
||||
.<DataSet<NumassData>>post(getName(), (Callback callback) -> {
|
||||
//FIXME remove in later revisions
|
||||
SetDirectionUtility.load(getContext());
|
||||
|
@ -35,6 +35,14 @@ import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
import static java.lang.Double.isNaN;
|
||||
import static java.lang.Math.abs;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -7,7 +7,7 @@ package inr.numass.tasks;
|
||||
|
||||
import hep.dataforge.actions.Action;
|
||||
import hep.dataforge.context.Context;
|
||||
import hep.dataforge.context.ProcessManager;
|
||||
import hep.dataforge.work.WorkManager;
|
||||
import hep.dataforge.data.DataNode;
|
||||
import hep.dataforge.data.DataTree;
|
||||
import hep.dataforge.meta.Meta;
|
||||
@ -44,7 +44,7 @@ public class PrepareTask extends GenericTask {
|
||||
*/
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
protected TaskState transform(ProcessManager.Callback callback, Context context, TaskState state, Meta config) {
|
||||
protected TaskState transform(WorkManager.Callback callback, Context context, TaskState state, Meta config) {
|
||||
//acquiring initial data. Data node could not be empty
|
||||
Meta dataMeta = Template.compileTemplate(config.getNode("data"), config);
|
||||
DataNode<NumassData> data = runAction(new ReadNumassStorageAction(), callback, context, DataNode.empty(), dataMeta);
|
||||
@ -70,8 +70,8 @@ public class PrepareTask extends GenericTask {
|
||||
return state;
|
||||
}
|
||||
|
||||
private <T, R> DataNode<R> runAction(Action<T, R> action, ProcessManager.Callback callback, Context context, DataNode<T> data, Meta meta) {
|
||||
return action.withContext(context).withParentProcess(callback.processName()).run(data, meta);
|
||||
private <T, R> DataNode<R> runAction(Action<T, R> action, WorkManager.Callback callback, Context context, DataNode<T> data, Meta meta) {
|
||||
return action.withContext(context).withParentProcess(callback.workName()).run(data, meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -41,6 +41,22 @@ import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -152,7 +152,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
|
||||
this.context = this.contextFactory.build(parentContext, config);
|
||||
|
||||
// attachig visual process manager
|
||||
processWindow.setManager(context.processManager());
|
||||
processWindow.setManager(context.workManager());
|
||||
|
||||
// setting io manager
|
||||
context.setIO(new WorkbenchIOManager(new NumassIO(), this));
|
||||
|
@ -37,7 +37,7 @@ public class Workbench extends Application {
|
||||
primaryStage.show();
|
||||
|
||||
scene.getWindow().setOnCloseRequest((WindowEvent event) -> {
|
||||
controller.getContext().processManager().getRootProcess().cancel(true);
|
||||
controller.getContext().workManager().getRoot().cancel(true);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -56,6 +56,38 @@ import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
import static java.util.Locale.setDefault;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -17,7 +17,7 @@ package inr.numass.viewer;
|
||||
|
||||
import hep.dataforge.context.Context;
|
||||
import hep.dataforge.context.GlobalContext;
|
||||
import hep.dataforge.context.ProcessManager;
|
||||
import hep.dataforge.work.WorkManager;
|
||||
import hep.dataforge.exceptions.StorageException;
|
||||
import hep.dataforge.fx.ConsoleFragment;
|
||||
import hep.dataforge.fx.process.ProcessManagerFragment;
|
||||
@ -139,7 +139,7 @@ public class MainViewerController implements Initializable {
|
||||
}
|
||||
|
||||
private void loadDirectory(String path) {
|
||||
getContext().processManager().post("viewer.loadDirectory", (ProcessManager.Callback callback) -> {
|
||||
getContext().workManager().post("viewer.loadDirectory", (WorkManager.Callback callback) -> {
|
||||
callback.updateTitle("Load storage (" + path + ")");
|
||||
callback.setProgress(-1);
|
||||
callback.updateMessage("Building numass storage tree...");
|
||||
@ -161,8 +161,8 @@ public class MainViewerController implements Initializable {
|
||||
|
||||
public void setRootStorage(NumassStorage root) {
|
||||
|
||||
getContext().processManager().cleanup();
|
||||
getContext().processManager().post("viewer.storage.load", (ProcessManager.Callback callback) -> {
|
||||
getContext().workManager().cleanup();
|
||||
getContext().workManager().post("viewer.storage.load", (WorkManager.Callback callback) -> {
|
||||
callback.updateTitle("Fill data to UI (" + root.getName() + ")");
|
||||
callback.setProgress(-1);
|
||||
Platform.runLater(() -> statusBar.setProgress(-1));
|
||||
|
@ -21,7 +21,7 @@ package inr.numass.viewer;
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
import hep.dataforge.context.Context;
|
||||
import hep.dataforge.context.ProcessManager;
|
||||
import hep.dataforge.work.WorkManager;
|
||||
import hep.dataforge.exceptions.StorageException;
|
||||
import hep.dataforge.plots.PlotUtils;
|
||||
import hep.dataforge.plots.data.DynamicPlottable;
|
||||
@ -85,7 +85,7 @@ public class MspViewController {
|
||||
|
||||
public void fillMspData(Storage rootStorage) {
|
||||
if (rootStorage != null) {
|
||||
context.processManager().post("viewer.msp.fill", (ProcessManager.Callback callback) -> {
|
||||
context.workManager().post("viewer.msp.fill", (WorkManager.Callback callback) -> {
|
||||
try {
|
||||
// callback.updateTitle("Fill msp data (" + rootStorage.getName() + ")");
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
*/
|
||||
package inr.numass.viewer;
|
||||
|
||||
import hep.dataforge.context.ProcessManager;
|
||||
import hep.dataforge.work.WorkManager;
|
||||
import hep.dataforge.exceptions.StorageException;
|
||||
import inr.numass.storage.NumassData;
|
||||
import inr.numass.storage.NumassStorage;
|
||||
@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
|
||||
*/
|
||||
public class NumassLoaderTreeBuilder {
|
||||
|
||||
public void build(ProcessManager.Callback callback,
|
||||
public void build(WorkManager.Callback callback,
|
||||
TreeTableView<TreeItemValue> numassLoaderDataTree,
|
||||
NumassStorage rootStorage,
|
||||
Consumer<NumassData> numassViewBuilder) throws StorageException {
|
||||
@ -81,7 +81,7 @@ public class NumassLoaderTreeBuilder {
|
||||
}
|
||||
|
||||
private TreeItem<TreeItemValue> buildNode(NumassStorage storage,
|
||||
Consumer<NumassData> numassViewBuilder, ProcessManager.Callback callback) throws StorageException {
|
||||
Consumer<NumassData> numassViewBuilder, WorkManager.Callback callback) throws StorageException {
|
||||
TreeItem<TreeItemValue> node = new TreeItem<>(buildValue(storage));
|
||||
node.getChildren().setAll(buildChildren(storage, numassViewBuilder, callback));
|
||||
return node;
|
||||
@ -92,7 +92,7 @@ public class NumassLoaderTreeBuilder {
|
||||
}
|
||||
|
||||
private List<TreeItem<TreeItemValue>> buildChildren(NumassStorage storage,
|
||||
Consumer<NumassData> numassViewBuilder, ProcessManager.Callback callback) throws StorageException {
|
||||
Consumer<NumassData> numassViewBuilder, WorkManager.Callback callback) throws StorageException {
|
||||
List<TreeItem<TreeItemValue>> list = new ArrayList<>();
|
||||
|
||||
storage.shelves().values().stream().forEach(subStorage -> {
|
||||
|
@ -21,7 +21,7 @@ package inr.numass.viewer;
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
import hep.dataforge.context.Context;
|
||||
import hep.dataforge.context.ProcessManager;
|
||||
import hep.dataforge.work.WorkManager;
|
||||
import hep.dataforge.io.ColumnedDataWriter;
|
||||
import hep.dataforge.meta.Meta;
|
||||
import hep.dataforge.meta.MetaBuilder;
|
||||
@ -227,7 +227,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
|
||||
public void loadData(NumassData data) {
|
||||
this.data = data;
|
||||
if (data != null) {
|
||||
context.processManager().<List<NMPoint>>post("viewer.numass.load", (ProcessManager.Callback callback) -> {
|
||||
context.workManager().<List<NMPoint>>post("viewer.numass.load", (WorkManager.Callback callback) -> {
|
||||
callback.updateTitle("Load numass data (" + data.getName() + ")");
|
||||
points = data.getNMPoints();
|
||||
|
||||
@ -252,7 +252,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
|
||||
}
|
||||
|
||||
private void setupHVPane(Supplier<Table> hvData) {
|
||||
context.processManager().post("viewer.numass.hv", (ProcessManager.Callback callback) -> {
|
||||
context.workManager().post("viewer.numass.hv", (WorkManager.Callback callback) -> {
|
||||
Table t = hvData.get();
|
||||
Platform.runLater(() -> {
|
||||
if (t != null) {
|
||||
@ -356,7 +356,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
|
||||
detectorPlot.removePlot();
|
||||
}
|
||||
|
||||
context.processManager().post("viewer.numass.load.detector", (ProcessManager.Callback callback) -> {
|
||||
context.workManager().post("viewer.numass.load.detector", (WorkManager.Callback callback) -> {
|
||||
Meta plottableConfig = new MetaBuilder("plot")
|
||||
.setValue("connectionType", "step")
|
||||
.setValue("thickness", 2)
|
||||
|
Loading…
Reference in New Issue
Block a user