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

Fixed numass k-task

Browse Source
This commit is contained in:
Alexander Nozik 2017-10-22 13:42:50 +03:00
parent 6da107c49a
commit 6b4dbfd23f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
numass-main/src/main/kotlin/inr/numass/NumassUtils.kt
View File

@ -181,8 +181,8 @@ fun addSetMarkers(frame: JFreeChartFrame, sets: Collection<NumassSet>) {
sets.stream().forEach { sets.stream().forEach {
val start = it.startTime; val start = it.startTime;
val stop = it.meta.optValue("end_time").map { it.timeValue() } val stop = it.meta.optValue("end_time").map { it.timeValue() }
.orElse(start.plusSeconds(3600)) .orElse(start.plusSeconds(300))
.minusSeconds(30) .minusSeconds(60)
val marker = IntervalMarker(start.toEpochMilli().toDouble(), stop.toEpochMilli().toDouble(), paint) val marker = IntervalMarker(start.toEpochMilli().toDouble(), stop.toEpochMilli().toDouble(), paint)
marker.label = it.name marker.label = it.name
marker.labelFont = Font("Verdana", Font.BOLD, 20); marker.labelFont = Font("Verdana", Font.BOLD, 20);

6
numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
View File

@ -17,7 +17,7 @@ import inr.numass.data.analyzers.SmartAnalyzer
import inr.numass.data.api.NumassSet import inr.numass.data.api.NumassSet
val selectDataTask = task("select") { val selectDataTask = task("select") {
model { model { meta ->
data("*") data("*")
configure(meta.getMetaOrEmpty("data")) configure(meta.getMetaOrEmpty("data"))
} }
@ -27,9 +27,9 @@ val selectDataTask = task("select") {
} }
val monitorTableTask = task("monitor") { val monitorTableTask = task("monitor") {
model { model { meta ->
configure(meta.getMetaOrEmpty("analyzer"))
dependsOn("select", meta) dependsOn("select", meta)
configure(meta.getMetaOrEmpty("analyzer"))
} }
join<NumassSet, Table> { join<NumassSet, Table> {
result { data -> result { data ->