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

Compare commits

base: NPM:9a1e9dc996c039892f6a49dbfcf1e8851f31c027
Branches Tags
NPM:master
NPM:fix/PKT8-connection
NPM:dev
..
compare: NPM:8e45062957461a4eed28c1e9a5661a027f678c91
Branches Tags
NPM:fix/PKT8-connection
NPM:master
NPM:dev

No commits in common. "9a1e9dc996c039892f6a49dbfcf1e8851f31c027" and "8e45062957461a4eed28c1e9a5661a027f678c91" have entirely different histories.
9a1e9dc996 ... 8e45062957

3 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
numass-control/src/main/kotlin/inr/numass/control/DeviceDisplayFX.kt
View File

@ -78,13 +78,13 @@ abstract class DeviceDisplayFX<D : Device> : Component(), Connection {
protected abstract fun buildView(device: D): UIComponent?; protected abstract fun buildView(device: D): UIComponent?;
fun valueStateProperty(stateName: String): ObjectProperty<Value> { fun valueStateProperty(stateName: String): ObjectProperty<Value> {
val state: ValueState = device.states.filterIsInstance<ValueState>().find { it.name == stateName } val state: ValueState = device.states.filterIsInstance(ValueState::class.java).find { it.name == stateName }
?: throw NameNotFoundException("State with name $stateName not found") ?: throw NameNotFoundException("State with name $stateName not found")
return state.asProperty() return state.asProperty()
} }
fun booleanStateProperty(stateName: String): BooleanProperty { fun booleanStateProperty(stateName: String): BooleanProperty {
val state: ValueState = device.states.filterIsInstance<ValueState>().find { it.name == stateName } val state: ValueState = device.states.filterIsInstance(ValueState::class.java).find { it.name == stateName }
?: throw NameNotFoundException("State with name $stateName not found") ?: throw NameNotFoundException("State with name $stateName not found")
return state.asBooleanProperty() return state.asBooleanProperty()
} }

10
numass-control/src/main/kotlin/inr/numass/control/FXExtensions.kt
View File

@ -112,17 +112,15 @@ fun EventTarget.deviceStateIndicator(connection: DeviceDisplayFX<*>, state: Stri
fun Node.deviceStateToggle(connection: DeviceDisplayFX<*>, state: String, title: String = state) { fun Node.deviceStateToggle(connection: DeviceDisplayFX<*>, state: String, title: String = state) {
if (connection.device.stateNames.contains(state)) { if (connection.device.stateNames.contains(state)) {
togglebutton(title) { togglebutton(title) {
isSelected = false
selectedProperty().addListener { _, oldValue, newValue -> selectedProperty().addListener { _, oldValue, newValue ->
if (oldValue != newValue) { if (oldValue != newValue) {
connection.device.states[state] = newValue connection.device.states[state] = newValue
} }
} }
connection.valueStateProperty(state).apply { connection.valueStateProperty(state).onChange {
isSelected = value?.boolean ?: false runLater {
onChange { isSelected = it?.boolean ?: false
runLater {
isSelected = it?.boolean ?: false
}
} }
} }
} }

4
numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt
View File

@ -47,10 +47,6 @@ class VacCollectorDevice(context: Context, meta: Meta, val sensors: Collection<S
private val helper = StorageHelper(this, this::buildLoader) private val helper = StorageHelper(this, this::buildLoader)
init {
states["storing"] = true
}
private val collector = object : DeviceListener { private val collector = object : DeviceListener {
val averagingDuration: Duration = Duration.parse(meta.getString("averagingDuration", "PT30S")) val averagingDuration: Duration = Duration.parse(meta.getString("averagingDuration", "PT30S"))