From 7ba31edb13104ccf49f78afb66cbc309e48b8cd5 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 12 Oct 2017 22:05:54 +0300 Subject: [PATCH] Plots structure update --- .../kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt | 2 -- .../main/kotlin/inr/numass/control/msp/MspViewConnection.kt | 2 -- .../src/main/kotlin/inr/numass/control/FXExtensions.kt | 1 - .../main/groovy/inr/numass/scripts/ShowTransmission.groovy | 1 - .../main/groovy/inr/numass/scripts/SignificanceTest.groovy | 2 +- .../src/main/groovy/inr/numass/scripts/TritiumTest.groovy | 2 +- .../src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy | 1 - .../main/groovy/inr/numass/scripts/times/Histogram.groovy | 1 - .../inr/numass/scripts/times/MultiPointHistogram.groovy | 1 - .../groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy | 1 - .../main/groovy/inr/numass/scripts/times/TestProto.groovy | 1 - .../inr/numass/scripts/underflow/ResponseFunction.groovy | 1 - .../groovy/inr/numass/scripts/underflow/Underflow.groovy | 1 - numass-main/src/main/java/inr/numass/NumassPlugin.java | 1 - .../src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt | 4 ++-- numass-viewer/build.gradle | 5 +---- .../src/main/java/inr/numass/viewer/MspViewController.java | 1 - .../src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt | 1 - .../src/main/kotlin/inr/numass/viewer/SlowControlView.kt | 1 - numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt | 2 +- .../src/main/kotlin/inr/numass/viewer/test/JFCTest.kt | 1 - 21 files changed, 6 insertions(+), 27 deletions(-) diff --git a/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt b/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt index c8e0ce7d..4869c38d 100644 --- a/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt +++ b/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8ViewConnection.kt @@ -10,8 +10,6 @@ import hep.dataforge.meta.Meta import hep.dataforge.plots.PlotUtils import hep.dataforge.plots.data.TimePlot import hep.dataforge.plots.data.TimePlottableGroup -import hep.dataforge.plots.fx.FXPlotFrame -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import inr.numass.control.DeviceViewConnection import javafx.application.Platform diff --git a/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspViewConnection.kt b/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspViewConnection.kt index 78779266..3550881c 100644 --- a/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspViewConnection.kt +++ b/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspViewConnection.kt @@ -26,8 +26,6 @@ import hep.dataforge.meta.MetaBuilder import hep.dataforge.plots.PlotUtils import hep.dataforge.plots.data.TimePlot import hep.dataforge.plots.data.TimePlottableGroup -import hep.dataforge.plots.fx.FXPlotFrame -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.values.Value import inr.numass.control.DeviceViewConnection diff --git a/numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt b/numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt index d8b9175a..5f962f2d 100644 --- a/numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt +++ b/numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt @@ -3,7 +3,6 @@ package inr.numass.control import hep.dataforge.kodex.KMetaBuilder import hep.dataforge.plots.Plot import hep.dataforge.plots.PlotFrame -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.values.Value import javafx.beans.value.ObservableValue diff --git a/numass-main/src/main/groovy/inr/numass/scripts/ShowTransmission.groovy b/numass-main/src/main/groovy/inr/numass/scripts/ShowTransmission.groovy index bc4be8e9..3e4ad116 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/ShowTransmission.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/ShowTransmission.groovy @@ -4,7 +4,6 @@ import hep.dataforge.context.Context import hep.dataforge.context.Global import hep.dataforge.grind.GrindShell import hep.dataforge.grind.helpers.PlotHelper -import hep.dataforge.plots.fx.FXPlotManager import hep.dataforge.stat.fit.ParamSet import inr.numass.NumassPlugin import inr.numass.models.sterile.NumassResolution diff --git a/numass-main/src/main/groovy/inr/numass/scripts/SignificanceTest.groovy b/numass-main/src/main/groovy/inr/numass/scripts/SignificanceTest.groovy index 48d63a1a..59ff99e6 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/SignificanceTest.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/SignificanceTest.groovy @@ -90,7 +90,7 @@ SpectrumInformation sign = new SpectrumInformation(spectrum); // cov = sign.getExpetedCovariance(allPars, config,"U2","E0","N","X"); // // printNamedMatrix(out, cov); -//PlotManager pm = new PlotManager(); +//PlotPlugin pm = new PlotPlugin(); Map functions = new HashMap<>(); diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy index ea990d8f..b0f79c7e 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/TritiumTest.groovy @@ -66,7 +66,7 @@ allPars.setParValue("trap", 1d); allPars.setParError("trap", 0.01d); allPars.setParDomain("trap", 0d, Double.POSITIVE_INFINITY); -// PlotManager pm = new PlotManager(); +// PlotPlugin pm = new PlotPlugin(); // String plotTitle = "Tritium spectrum"; // pm.plotFunction(ParametricUtils.getSpectrumFunction(spectrum, allPars), 14000, 18600, 500,plotTitle, null); // PrintNamed.printSpectrum(Out.onComplete, beta.trapping, allPars, 14000d, 18600d, 500); diff --git a/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy b/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy index 3798345f..a89d4bf2 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy @@ -5,7 +5,6 @@ import hep.dataforge.context.Global import hep.dataforge.grind.Grind import hep.dataforge.grind.GrindShell import hep.dataforge.grind.helpers.PlotHelper -import hep.dataforge.plots.fx.FXPlotManager import hep.dataforge.stat.fit.ParamSet import hep.dataforge.utils.MetaMorph import hep.dataforge.values.Values diff --git a/numass-main/src/main/groovy/inr/numass/scripts/times/Histogram.groovy b/numass-main/src/main/groovy/inr/numass/scripts/times/Histogram.groovy index 6b544009..c0638df7 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/times/Histogram.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/times/Histogram.groovy @@ -6,7 +6,6 @@ import hep.dataforge.grind.GrindShell import hep.dataforge.io.ColumnedDataWriter import hep.dataforge.maths.histogram.SimpleHistogram import hep.dataforge.meta.Meta -import hep.dataforge.plots.fx.FXPlotManager import inr.numass.NumassPlugin import inr.numass.data.analyzers.TimeAnalyzer import inr.numass.data.api.NumassSet diff --git a/numass-main/src/main/groovy/inr/numass/scripts/times/MultiPointHistogram.groovy b/numass-main/src/main/groovy/inr/numass/scripts/times/MultiPointHistogram.groovy index 81b54aad..baeb8a54 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/times/MultiPointHistogram.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/times/MultiPointHistogram.groovy @@ -5,7 +5,6 @@ import hep.dataforge.context.Global import hep.dataforge.grind.Grind import hep.dataforge.grind.GrindShell import hep.dataforge.grind.helpers.PlotHelper -import hep.dataforge.plots.fx.FXPlotManager import inr.numass.NumassPlugin import inr.numass.data.PointAnalyzer import inr.numass.data.analyzers.TimeAnalyzer diff --git a/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy b/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy index dc704b77..d8f2c0bb 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/times/TestPointAnalyzer.groovy @@ -6,7 +6,6 @@ import hep.dataforge.data.DataSet import hep.dataforge.grind.Grind import hep.dataforge.grind.GrindShell import hep.dataforge.meta.Meta -import hep.dataforge.plots.fx.FXPlotManager import inr.numass.NumassPlugin import inr.numass.actions.TimeAnalyzedAction import inr.numass.data.NumassDataUtils diff --git a/numass-main/src/main/groovy/inr/numass/scripts/times/TestProto.groovy b/numass-main/src/main/groovy/inr/numass/scripts/times/TestProto.groovy index 90148f45..957bf4a5 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/times/TestProto.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/times/TestProto.groovy @@ -4,7 +4,6 @@ import hep.dataforge.context.Context import hep.dataforge.context.Global import hep.dataforge.grind.GrindShell import hep.dataforge.grind.helpers.PlotHelper -import hep.dataforge.plots.fx.FXPlotManager import hep.dataforge.tables.ValueMap import inr.numass.NumassPlugin import inr.numass.data.PointAnalyzer diff --git a/numass-main/src/main/groovy/inr/numass/scripts/underflow/ResponseFunction.groovy b/numass-main/src/main/groovy/inr/numass/scripts/underflow/ResponseFunction.groovy index 4ea5fd13..fd925414 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/underflow/ResponseFunction.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/underflow/ResponseFunction.groovy @@ -7,7 +7,6 @@ import hep.dataforge.data.DataNode import hep.dataforge.grind.GrindShell import hep.dataforge.io.ColumnedDataWriter import hep.dataforge.meta.Meta -import hep.dataforge.plots.fx.FXPlotManager import hep.dataforge.tables.ColumnTable import hep.dataforge.tables.Table import inr.numass.NumassPlugin diff --git a/numass-main/src/main/groovy/inr/numass/scripts/underflow/Underflow.groovy b/numass-main/src/main/groovy/inr/numass/scripts/underflow/Underflow.groovy index d1e035fa..493fe15f 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/underflow/Underflow.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/underflow/Underflow.groovy @@ -16,7 +16,6 @@ import hep.dataforge.io.ColumnedDataWriter import hep.dataforge.meta.Meta import hep.dataforge.plots.data.PlotData import hep.dataforge.plots.data.PlottableGroup -import hep.dataforge.plots.fx.FXPlotManager import hep.dataforge.tables.Table import hep.dataforge.tables.TableTransform import hep.dataforge.tables.XYAdapter diff --git a/numass-main/src/main/java/inr/numass/NumassPlugin.java b/numass-main/src/main/java/inr/numass/NumassPlugin.java index 1866fcc5..45d6c37f 100644 --- a/numass-main/src/main/java/inr/numass/NumassPlugin.java +++ b/numass-main/src/main/java/inr/numass/NumassPlugin.java @@ -24,7 +24,6 @@ import hep.dataforge.meta.Meta; import hep.dataforge.plotfit.PlotFitResultAction; import hep.dataforge.plots.PlotDataAction; import hep.dataforge.plots.fx.FXPlotUtils; -import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.jfreechart.JFreeChartFrame; import hep.dataforge.stat.fit.FitManager; import hep.dataforge.stat.models.ModelManager; diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt index be2c9605..a12f26c0 100644 --- a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt +++ b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzedAction.kt @@ -7,7 +7,7 @@ import hep.dataforge.kodex.buildMeta import hep.dataforge.kodex.configure import hep.dataforge.maths.histogram.UnivariateHistogram import hep.dataforge.meta.Laminate -import hep.dataforge.plots.PlotManager +import hep.dataforge.plots.PlotPlugin import hep.dataforge.plots.data.PlotData import hep.dataforge.tables.Table import hep.dataforge.tables.ValueMap @@ -42,7 +42,7 @@ class TimeAnalyzedAction : OneToOneAction() { val t0 = inputMeta.getDouble("t0", 30e3); val loChannel = inputMeta.getInt("window.lo", 500); val upChannel = inputMeta.getInt("window.up", 10000); - val pm = context.getFeature(PlotManager::class.java); + val pm = context.getFeature(PlotPlugin::class.java); val trueCR = analyzer.analyze(input, buildMeta { diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle index 275222b9..442b1f37 100644 --- a/numass-viewer/build.gradle +++ b/numass-viewer/build.gradle @@ -24,11 +24,8 @@ compileKotlin.kotlinOptions.jvmTarget = "1.8" dependencies { compile project(':numass-core') compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc') - compile "hep.dataforge:kodex" + compile "hep.dataforge:kodex-fx" compile 'com.jcraft:jsch:0.1.54' - - compile 'org.controlsfx:controlsfx:8.40.12' - compile "no.tornado:tornadofx:1.7.8" } apply plugin: 'kotlin' diff --git a/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java b/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java index 449d3664..9f592047 100644 --- a/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java +++ b/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java @@ -28,7 +28,6 @@ import hep.dataforge.names.Name; import hep.dataforge.plots.PlotUtils; import hep.dataforge.plots.data.PlotDataUtils; import hep.dataforge.plots.data.XYPlot; -import hep.dataforge.plots.fx.PlotContainer; import hep.dataforge.plots.jfreechart.JFreeChartFrame; import hep.dataforge.storage.api.PointLoader; import hep.dataforge.storage.api.Storage; diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt index ebdb5fa8..e5fb8c9e 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt @@ -11,7 +11,6 @@ import hep.dataforge.plots.data.PlotData import hep.dataforge.plots.data.PlotDataUtils import hep.dataforge.plots.data.PlottableGroup import hep.dataforge.plots.data.TimePlot -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.storage.commons.JSONMetaWriter import hep.dataforge.tables.Table diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt index d0799d89..3d022cac 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt @@ -5,7 +5,6 @@ import hep.dataforge.kodex.configure import hep.dataforge.meta.Meta import hep.dataforge.plots.Plot import hep.dataforge.plots.data.PlotData -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.storage.api.PointLoader import hep.dataforge.storage.api.ValueIndex diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt index 0d47d6ce..e21764ba 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/Viewer.kt @@ -15,7 +15,7 @@ import tornadofx.* class Viewer : App(MainView::class) { override fun start(stage: Stage) { - stage.icons += Image(Global::class.java.getResourceAsStream("/img/df.png")) + stage.icons += Image(Global::class.java.getResourceAsStream("/resource/img/df.png")) (LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger).level = Level.INFO Global.setDefaultContext(Global.instance()) StorageManager().startGlobal() diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/test/JFCTest.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/test/JFCTest.kt index 84c24965..1a1a6d0a 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/test/JFCTest.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/test/JFCTest.kt @@ -1,7 +1,6 @@ package inr.numass.viewer.test import hep.dataforge.plots.data.PlotData -import hep.dataforge.plots.fx.PlotContainer import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.tables.ValueMap import hep.dataforge.tables.XYAdapter