From aa9cac6e8aea56123f1af1f0ea5169b32a9c3482 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 6 May 2016 22:58:12 +0300 Subject: [PATCH] [no commit message] --- .../scripts/DetectorSpectrumSubstraction.groovy | 2 +- numass-viewer/build.gradle | 10 +++++++++- .../inr/numass/viewer/MainViewerController.java | 9 +++++---- .../inr/numass/viewer/NumassLoaderTreeBuilder.java | 13 +++++++------ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/numass-main/src/main/groovy/inr/numass/scripts/DetectorSpectrumSubstraction.groovy b/numass-main/src/main/groovy/inr/numass/scripts/DetectorSpectrumSubstraction.groovy index c482628a..d9bac6f9 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/DetectorSpectrumSubstraction.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/DetectorSpectrumSubstraction.groovy @@ -11,7 +11,7 @@ import hep.dataforge.tables.TableFormatBuilder import hep.dataforge.tables.ListTable import hep.dataforge.tables.MapPoint import hep.dataforge.tables.Table -import inr.numass.data.NumassData +import inr.numass.storage.NumassData import inr.numass.data.* import javafx.stage.FileChooser diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle index 5433ef39..467d0e6b 100644 --- a/numass-viewer/build.gradle +++ b/numass-viewer/build.gradle @@ -5,10 +5,18 @@ if (!hasProperty('mainClass')) { } mainClassName = mainClass -version = "0.3.0" +version = "0.3.1" description = "The viewer for numass data" +configurations { + compile.exclude module: 'groovy-all' + compile.exclude module: 'fontawesomefx' + compile.exclude module: 'commons-math3' + compile.exclude module: 'httpclient' + compile.exclude module: 'httpcore' +} + dependencies { compile project(':numass-main') compile project(':dataforge-fx') diff --git a/numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java b/numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java index 01388eb0..91ddb04e 100644 --- a/numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java +++ b/numass-viewer/src/main/java/inr/numass/viewer/MainViewerController.java @@ -134,14 +134,14 @@ public class MainViewerController implements Initializable { private void loadDirectory(String path) { getContext().processManager().post("viewer.loadDirectory", (ProcessManager.Callback callback) -> { callback.updateTitle("Load storage (" + path + ")"); - callback.updateProgress(-1, 1); + callback.setProgress(-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.setProgress(0); callback.updateMessage("Failed to load storage " + path); Logger.getLogger(MainViewerController.class.getName()).log(Level.SEVERE, null, ex); } @@ -157,7 +157,7 @@ public class MainViewerController implements Initializable { getContext().processManager().cleanup(); getContext().processManager().post("viewer.storage.load", (ProcessManager.Callback callback) -> { callback.updateTitle("Fill data to UI (" + root.getName() + ")"); -// callback.updateProgress(-1, 1); + callback.setProgress(-1); Platform.runLater(() -> statusBar.setProgress(-1)); callback.updateMessage("Loading numass storage tree..."); @@ -178,9 +178,10 @@ public class MainViewerController implements Initializable { Logger.getLogger(MainViewerController.class.getName()).log(Level.SEVERE, null, ex); } -// callback.updateProgress(1, 1); +// callback.setProgress(1, 1); Platform.runLater(() -> statusBar.setProgress(0)); callback.updateMessage("Numass storage tree loaded."); + callback.setProgressToMax(); }); mspController = new MspViewController(getContext(), mspPlotPane); diff --git a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java index 7b53f871..4f522a10 100644 --- a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java +++ b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java @@ -54,6 +54,7 @@ public class NumassLoaderTreeBuilder { // callback.updateTitle("Load numass data (" + rootStorage.getName() + ")"); TreeItem root = buildNode(rootStorage, numassViewBuilder, callback); +// callback.updateMessage("finished loading numass tree"); root.setExpanded(true); // numassLoaderDataTree.setShowRoot(true); @@ -122,8 +123,8 @@ public class NumassLoaderTreeBuilder { } callback.updateMessage("Building storage " + storage.getName()); - callback.updateProgress(-1, 1); - callback.updateProgress(0, storage.loaders().size()); + callback.setProgress(0); + callback.setMaxProgress(storage.loaders().size()); for (Loader loader : storage.loaders().values()) { if (loader instanceof NumassData) { callback.updateMessage("Building numass data loader " + loader.getName()); @@ -140,18 +141,18 @@ public class NumassLoaderTreeBuilder { // }); list.add(numassLoaderTreeItem); } - callback.changeProgress(1, 0); + callback.increaseProgress(1); } callback.updateMessage("Loading legacy DAT files"); - callback.updateProgress(-1, 1); + callback.setProgress(0); List legacyFiles = storage.legacyFiles(); - callback.updateProgress(0, legacyFiles.size()); + callback.setMaxProgress(legacyFiles.size()); //adding legacy data files for (NumassData legacyDat : legacyFiles) { callback.updateMessage("Loading numass DAT file " + legacyDat.getName()); TreeItem numassLoaderTreeItem = new TreeItem<>(buildValue(legacyDat)); - callback.changeProgress(1, 0); + callback.increaseProgress(1); list.add(numassLoaderTreeItem); }