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

bringing numass up to date

Browse Source
This commit is contained in:
Alexander Nozik 2017-04-21 08:00:49 +03:00
parent 05faaf1696
commit b7b9e09d40
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
numass-viewer/build.gradle
View File

@ -20,8 +20,12 @@ dependencies {
compile 'com.jcraft:jsch:0.1.54' compile 'com.jcraft:jsch:0.1.54'
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"
// https://mvnrepository.com/artifact/org.controlsfx/controlsfx
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.12'
} }
//shadowJar { //shadowJar {

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

@ -50,6 +50,7 @@ class NumassLoaderView : View() {
lateinit var main: MainView lateinit var main: MainView
var data: NumassData? = null var data: NumassData? = null
val spectrumData = PlottableData("spectrum")
private val detectorPlotPane: AnchorPane by fxid(); private val detectorPlotPane: AnchorPane by fxid();
private val tabPane: TabPane by fxid(); private val tabPane: TabPane by fxid();
@ -175,7 +176,6 @@ class NumassLoaderView : View() {
getWorkManager().startWork("viewer.numass.hv") { callback: Work -> getWorkManager().startWork("viewer.numass.hv") { callback: Work ->
val t = hvData.get() val t = hvData.get()
Platform.runLater { Platform.runLater {
// hvPlot.plot.clear()
val set = PlottableGroup<TimePlottable>() val set = PlottableGroup<TimePlottable>()
for (dp in t) { for (dp in t) {
val block = dp.getString("block", "default") val block = dp.getString("block", "default")
@ -216,7 +216,6 @@ class NumassLoaderView : View() {
} }
private fun setupSpectrumPane(points: List<NumassPoint>) { private fun setupSpectrumPane(points: List<NumassPoint>) {
val spectrumData = PlottableData("spectrum")
spectrumPlot.plot.add(spectrumData) spectrumPlot.plot.add(spectrumData)
val lowChannel = channelSlider.lowValue.toInt() val lowChannel = channelSlider.lowValue.toInt()