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

Fixing works

Browse Source
This commit is contained in:
Alexander Nozik 2017-04-17 23:00:10 +03:00
parent 5e4ddcdfd5
commit 28f1503190
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
numass-viewer/build.gradle
View File

@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) {
} }
mainClassName = mainClass mainClassName = mainClass
version = "0.3.8" version = "0.4.0"
description = "The viewer for numass data" description = "The viewer for numass data"
@ -19,13 +19,8 @@ dependencies {
compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc') compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc')
compile 'com.jcraft:jsch:0.1.54' compile 'com.jcraft:jsch:0.1.54'
compile 'org.controlsfx:controlsfx:8.40.12'
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.1" compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.1"
//compile "org.jetbrains.kotlin:kotlin-reflect:1.1.1"
compile "no.tornado:tornadofx:1.7.1" compile "no.tornado:tornadofx:1.7.1"
} }
//shadowJar {
// baseName = 'numass-viewer'
// classifier = null
// version = null
//}

7
numass-viewer/src/main/kotlin/inr/numass/viewer/NumassLoaderView.kt
View File

@ -180,7 +180,8 @@ class NumassLoaderView : View() {
for (dp in t) { for (dp in t) {
val block = dp.getString("block", "default") val block = dp.getString("block", "default")
if (!set.has(block)) { if (!set.has(block)) {
set.add(TimePlottable(block))
set.add(hvPlot.plot.opt(block).orElseGet{TimePlottable(block)} as TimePlottable)
} }
set.get(block).put(dp.getValue("timestamp").timeValue(), dp.getValue("value")) set.get(block).put(dp.getValue("timestamp").timeValue(), dp.getValue("value"))
} }
@ -216,8 +217,8 @@ class NumassLoaderView : View() {
} }
private fun setupSpectrumPane(points: List<NumassPoint>) { private fun setupSpectrumPane(points: List<NumassPoint>) {
val spectrumData = PlottableData("spectrum") val spectrumData = spectrumPlot.plot.opt("spectrum").orElseGet{PlottableData("spectrum")} as PlottableData
spectrumPlot.plot.add(spectrumData) spectrumPlot.plot.add(spectrumData) //does nothing if it is the same plottable
val lowChannel = channelSlider.lowValue.toInt() val lowChannel = channelSlider.lowValue.toInt()
val highChannel = channelSlider.highValue.toInt() val highChannel = channelSlider.highValue.toInt()