bringing numass up to date
This commit is contained in:
parent
05faaf1696
commit
b7b9e09d40
@ -20,8 +20,12 @@ dependencies {
|
||||
compile 'com.jcraft:jsch:0.1.54'
|
||||
|
||||
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"
|
||||
// https://mvnrepository.com/artifact/org.controlsfx/controlsfx
|
||||
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.12'
|
||||
|
||||
|
||||
}
|
||||
|
||||
//shadowJar {
|
||||
|
@ -50,6 +50,7 @@ class NumassLoaderView : View() {
|
||||
lateinit var main: MainView
|
||||
|
||||
var data: NumassData? = null
|
||||
val spectrumData = PlottableData("spectrum")
|
||||
|
||||
private val detectorPlotPane: AnchorPane by fxid();
|
||||
private val tabPane: TabPane by fxid();
|
||||
@ -175,7 +176,6 @@ class NumassLoaderView : View() {
|
||||
getWorkManager().startWork("viewer.numass.hv") { callback: Work ->
|
||||
val t = hvData.get()
|
||||
Platform.runLater {
|
||||
// hvPlot.plot.clear()
|
||||
val set = PlottableGroup<TimePlottable>()
|
||||
for (dp in t) {
|
||||
val block = dp.getString("block", "default")
|
||||
@ -216,7 +216,6 @@ class NumassLoaderView : View() {
|
||||
}
|
||||
|
||||
private fun setupSpectrumPane(points: List<NumassPoint>) {
|
||||
val spectrumData = PlottableData("spectrum")
|
||||
spectrumPlot.plot.add(spectrumData)
|
||||
|
||||
val lowChannel = channelSlider.lowValue.toInt()
|
||||
|
Loading…
Reference in New Issue
Block a user