Fixing works
This commit is contained in:
parent
5e4ddcdfd5
commit
28f1503190
@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) {
|
||||
}
|
||||
mainClassName = mainClass
|
||||
|
||||
version = "0.3.8"
|
||||
version = "0.4.0"
|
||||
|
||||
description = "The viewer for numass data"
|
||||
|
||||
@ -19,13 +19,8 @@ dependencies {
|
||||
compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc')
|
||||
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-reflect:1.1.1"
|
||||
compile "no.tornado:tornadofx:1.7.1"
|
||||
}
|
||||
|
||||
//shadowJar {
|
||||
// baseName = 'numass-viewer'
|
||||
// classifier = null
|
||||
// version = null
|
||||
//}
|
@ -180,7 +180,8 @@ class NumassLoaderView : View() {
|
||||
for (dp in t) {
|
||||
val block = dp.getString("block", "default")
|
||||
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"))
|
||||
}
|
||||
@ -216,8 +217,8 @@ class NumassLoaderView : View() {
|
||||
}
|
||||
|
||||
private fun setupSpectrumPane(points: List<NumassPoint>) {
|
||||
val spectrumData = PlottableData("spectrum")
|
||||
spectrumPlot.plot.add(spectrumData)
|
||||
val spectrumData = spectrumPlot.plot.opt("spectrum").orElseGet{PlottableData("spectrum")} as PlottableData
|
||||
spectrumPlot.plot.add(spectrumData) //does nothing if it is the same plottable
|
||||
|
||||
val lowChannel = channelSlider.lowValue.toInt()
|
||||
val highChannel = channelSlider.highValue.toInt()
|
||||
|
Loading…
Reference in New Issue
Block a user