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

Fixed DataPoint reading

Browse Source
This commit is contained in:
darksnake 2017-06-19 16:48:55 +03:00
parent 02a7f66a35
commit 6497e2f04a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,8 @@ class MainView : View("Numass data viewer") {
loaderPane.center = numassLoaderView.root loaderPane.center = numassLoaderView.root
} }
is PointLoader -> { is PointLoader -> {
slowControlView.load(value.content) val loader: PointLoader = value.content;
slowControlView.load(loader);
loaderPane.center = slowControlView.root loaderPane.center = slowControlView.root
} }
} }

12
numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt
View File

@ -1,6 +1,7 @@
package inr.numass.viewer package inr.numass.viewer
import hep.dataforge.kodex.buildMeta import hep.dataforge.kodex.buildMeta
import hep.dataforge.kodex.configure
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.plots.Plottable import hep.dataforge.plots.Plottable
import hep.dataforge.plots.data.PlottableData import hep.dataforge.plots.data.PlottableData
@ -12,13 +13,16 @@ import hep.dataforge.tables.DataPoint
import hep.dataforge.tables.ListTable import hep.dataforge.tables.ListTable
import hep.dataforge.tables.Table import hep.dataforge.tables.Table
import hep.dataforge.tables.XYAdapter import hep.dataforge.tables.XYAdapter
import tornadofx.* import tornadofx.View
import tornadofx.borderpane
/** /**
* Created by darksnake on 18.06.2017. * Created by darksnake on 18.06.2017.
*/ */
class SlowControlView : View("My View") { class SlowControlView : View("My View") {
private val plotMeta = buildMeta("plot") { private val plotMeta = buildMeta("plot") {
"xAxis.type" to "time"
"yAxis.type" to "log"
} }
val plot = JFreeChartFrame(plotMeta) val plot = JFreeChartFrame(plotMeta)
@ -33,7 +37,11 @@ class SlowControlView : View("My View") {
ArrayList<Plottable>().apply { ArrayList<Plottable>().apply {
loader.format.columns.filter { it.name != "timestamp" }.forEach { loader.format.columns.filter { it.name != "timestamp" }.forEach {
val adapter = XYAdapter("timestamp", it.name); val adapter = XYAdapter("timestamp", it.name);
this += PlottableData.plot("data", adapter, data); this += PlottableData.plot(it.name, adapter, data).configure {
"showLine" to true
"showSymbol" to false
"showErrors" to false
}
} }
} }
} ui { } ui {