diff --git a/numass-control/gun/build.gradle b/numass-control/gun/build.gradle index adb7e3e8..a9547a84 100644 --- a/numass-control/gun/build.gradle +++ b/numass-control/gun/build.gradle @@ -14,7 +14,14 @@ * limitations under the License. */ -apply plugin: 'application' +plugins { + id 'application' + id 'org.openjfx.javafxplugin' version '0.0.5' +} + +javafx { + modules = [ 'javafx.controls' ] +} version = "0.1.0" diff --git a/numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunView.kt b/numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunView.kt index c6e743e5..3be29210 100644 --- a/numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunView.kt +++ b/numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunView.kt @@ -47,7 +47,9 @@ class EGunView(val gun: EGun) : View() { vbox { gun.sources.forEach { source -> hbox { - label(source.name) + label(source.name){ + minWidth = 100.0 + } separator(Orientation.VERTICAL) indicator { @@ -60,6 +62,7 @@ class EGunView(val gun: EGun) : View() { textfield { } + separator(Orientation.VERTICAL) label("V: ") label(voltageProperty) diff --git a/numass-control/gun/src/main/kotlin/inr/numass/control/gun/IT6800Device.kt b/numass-control/gun/src/main/kotlin/inr/numass/control/gun/IT6800Device.kt index 552f092e..8041756e 100644 --- a/numass-control/gun/src/main/kotlin/inr/numass/control/gun/IT6800Device.kt +++ b/numass-control/gun/src/main/kotlin/inr/numass/control/gun/IT6800Device.kt @@ -34,7 +34,9 @@ import kotlin.experimental.and class IT6800Device(context: Context, meta: Meta) : AbstractDevice(context, meta) { - private val portHelper = PortHelper(this) + private val portHelper = PortHelper(this).apply { + debug = true + } private var monitorJob: Job? = null