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

Moved to java 11

Browse Source
This commit is contained in:
Alexander Nozik 2018-11-29 18:31:52 +03:00
parent aab01f964f
commit fd7be105cd
7 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8Display.kt
View File

@ -7,7 +7,6 @@ import hep.dataforge.fx.fragments.LogFragment
import hep.dataforge.fx.plots.PlotContainer import hep.dataforge.fx.plots.PlotContainer
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.plots.Plot import hep.dataforge.plots.Plot
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.PlotUtils import hep.dataforge.plots.PlotUtils
import hep.dataforge.plots.data.TimePlot import hep.dataforge.plots.data.TimePlot
import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.plots.jfreechart.JFreeChartFrame
@ -143,7 +142,7 @@ class PKT8Display : DeviceDisplayFX<PKT8Device>(), PKT8ValueListener {
inner class CryoPlotView : Fragment("PKT8 temperature plot", dfIconView) { inner class CryoPlotView : Fragment("PKT8 temperature plot", dfIconView) {
private val plotFrameMeta: Meta = device.meta.getMetaOrEmpty("plotConfig") private val plotFrameMeta: Meta = device.meta.getMetaOrEmpty("plotConfig")
private val plotFrame: PlotFrame by lazy { private val plotFrame by lazy {
JFreeChartFrame().apply { JFreeChartFrame().apply {
configure(plotFrameMeta) configure(plotFrameMeta)
plots.setType<TimePlot>() plots.setType<TimePlot>()

1
numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspDevice.kt
View File

@ -22,6 +22,7 @@ import hep.dataforge.context.Context
import hep.dataforge.control.collectors.RegularPointCollector import hep.dataforge.control.collectors.RegularPointCollector
import hep.dataforge.control.connections.Roles import hep.dataforge.control.connections.Roles
import hep.dataforge.control.devices.PortSensor import hep.dataforge.control.devices.PortSensor
import hep.dataforge.control.devices.notifyError
import hep.dataforge.control.ports.GenericPortController import hep.dataforge.control.ports.GenericPortController
import hep.dataforge.control.ports.Port import hep.dataforge.control.ports.Port
import hep.dataforge.control.ports.PortFactory import hep.dataforge.control.ports.PortFactory

3
numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspDisplay.kt
View File

@ -24,7 +24,6 @@ import hep.dataforge.fx.fragments.LogFragment
import hep.dataforge.fx.plots.PlotContainer import hep.dataforge.fx.plots.PlotContainer
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.PlotGroup import hep.dataforge.plots.PlotGroup
import hep.dataforge.plots.PlotUtils import hep.dataforge.plots.PlotUtils
import hep.dataforge.plots.data.TimePlot import hep.dataforge.plots.data.TimePlot
@ -76,7 +75,7 @@ class MspDisplay() : DeviceDisplayFX<MspDevice>(), NamedValueListener {
inner class MspView : View("Numass mass-spectrometer measurement") { inner class MspView : View("Numass mass-spectrometer measurement") {
private val plotFrameMeta: Meta = device.meta.getMeta("plotConfig", device.meta) private val plotFrameMeta: Meta = device.meta.getMeta("plotConfig", device.meta)
private val plotFrame: PlotFrame by lazy { private val plotFrame by lazy {
val basePlotConfig = MetaBuilder("plotFrame") val basePlotConfig = MetaBuilder("plotFrame")
.setNode(MetaBuilder("yAxis") .setNode(MetaBuilder("yAxis")
.setValue("type", "log") .setValue("type", "log")

3
numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt
View File

@ -8,7 +8,6 @@ import hep.dataforge.fx.runGoal
import hep.dataforge.fx.ui import hep.dataforge.fx.ui
import hep.dataforge.goals.Goal import hep.dataforge.goals.Goal
import hep.dataforge.names.Name import hep.dataforge.names.Name
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.PlotGroup import hep.dataforge.plots.PlotGroup
import hep.dataforge.plots.Plottable import hep.dataforge.plots.Plottable
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
@ -29,7 +28,7 @@ import tornadofx.*
class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = ImageView(dfIcon)) { class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = ImageView(dfIcon)) {
private val frame: PlotFrame = JFreeChartFrame().configure { private val frame = JFreeChartFrame().configure {
"title" to "Detector response plot" "title" to "Detector response plot"
node("xAxis") { node("xAxis") {
"title" to "ADC" "title" to "ADC"

3
numass-viewer/src/main/kotlin/inr/numass/viewer/HVView.kt
View File

@ -6,7 +6,6 @@ import hep.dataforge.fx.plots.PlotContainer
import hep.dataforge.fx.runGoal import hep.dataforge.fx.runGoal
import hep.dataforge.fx.ui import hep.dataforge.fx.ui
import hep.dataforge.names.Name import hep.dataforge.names.Name
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
import hep.dataforge.plots.data.TimePlot import hep.dataforge.plots.data.TimePlot
import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.plots.jfreechart.JFreeChartFrame
@ -24,7 +23,7 @@ import tornadofx.*
*/ */
class HVView : View(title = "High voltage time plot", icon = ImageView(dfIcon)) { class HVView : View(title = "High voltage time plot", icon = ImageView(dfIcon)) {
private val frame: PlotFrame = JFreeChartFrame().configure { private val frame = JFreeChartFrame().configure {
"xAxis.title" to "time" "xAxis.title" to "time"
"xAxis.type" to "time" "xAxis.type" to "time"
"yAxis.title" to "HV" "yAxis.title" to "HV"

3
numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt
View File

@ -6,7 +6,6 @@ import hep.dataforge.fx.plots.PlotContainer
import hep.dataforge.fx.runGoal import hep.dataforge.fx.runGoal
import hep.dataforge.fx.ui import hep.dataforge.fx.ui
import hep.dataforge.names.Name import hep.dataforge.names.Name
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.plots.jfreechart.JFreeChartFrame
import hep.dataforge.tables.Adapters import hep.dataforge.tables.Adapters
@ -31,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger
*/ */
class SpectrumView : View(title = "Numass spectrum plot", icon = ImageView(dfIcon)) { class SpectrumView : View(title = "Numass spectrum plot", icon = ImageView(dfIcon)) {
private val frame: PlotFrame = JFreeChartFrame().configure { private val frame = JFreeChartFrame().configure {
"xAxis.title" to "U" "xAxis.title" to "U"
"xAxis.units" to "V" "xAxis.units" to "V"
"yAxis.title" to "count rate" "yAxis.title" to "count rate"

3
numass-viewer/src/main/kotlin/inr/numass/viewer/TimeView.kt
View File

@ -9,7 +9,6 @@ import hep.dataforge.fx.ui
import hep.dataforge.goals.Goal import hep.dataforge.goals.Goal
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.names.Name import hep.dataforge.names.Name
import hep.dataforge.plots.PlotFrame
import hep.dataforge.plots.Plottable import hep.dataforge.plots.Plottable
import hep.dataforge.plots.data.DataPlot import hep.dataforge.plots.data.DataPlot
import hep.dataforge.plots.jfreechart.JFreeChartFrame import hep.dataforge.plots.jfreechart.JFreeChartFrame
@ -25,7 +24,7 @@ import tornadofx.*
class TimeView : View(title = "Numass time spectrum plot", icon = ImageView(dfIcon)) { class TimeView : View(title = "Numass time spectrum plot", icon = ImageView(dfIcon)) {
private val frame: PlotFrame = JFreeChartFrame().configure { private val frame = JFreeChartFrame().configure {
"title" to "Time plot" "title" to "Time plot"
node("xAxis") { node("xAxis") {
"title" to "delay" "title" to "delay"