kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Some method renaming, fixes #3

Browse Source
This commit is contained in:
Peter Klimai 2020-06-11 19:34:21 +03:00
parent d6c58a9c7e
commit b23152ff79
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/api/Device.kt
View File

@ -36,7 +36,7 @@ interface Device: Closeable {
/** /**
* Remove all listeners belonging to the specified owner * Remove all listeners belonging to the specified owner
*/ */
fun removeListener(owner: Any?) fun removeListeners(owner: Any?)
/** /**
* Get the value of the property or throw error if property in not defined. * Get the value of the property or throw error if property in not defined.

2
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/api/DeviceHub.kt
View File

@ -18,6 +18,6 @@ suspend fun DeviceHub.setProperty(deviceName: String, propertyName: String, valu
.setProperty(propertyName, value) .setProperty(propertyName, value)
} }
suspend fun DeviceHub.request(deviceName: String, command: String, argument: MetaItem<*>?): MetaItem<*>? = suspend fun DeviceHub.call(deviceName: String, command: String, argument: MetaItem<*>?): MetaItem<*>? =
(getDevice(deviceName) ?: error("Device with name $deviceName not found in the hub")) (getDevice(deviceName) ?: error("Device with name $deviceName not found in the hub"))
.call(command, argument) .call(command, argument)

2
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/base/DeviceBase.kt
View File

@ -19,7 +19,7 @@ abstract class DeviceBase : Device {
listeners.add(owner to listener) listeners.add(owner to listener)
} }
override fun removeListener(owner: Any?) { override fun removeListeners(owner: Any?) {
listeners.removeAll { it.first == owner } listeners.removeAll { it.first == owner }
} }

2
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/controllers/PropertyFlow.kt
View File

@ -23,6 +23,6 @@ suspend fun Device.flowValues(): Flow<Pair<String, MetaItem<*>>> = callbackFlow
} }
registerListener(listener) registerListener(listener)
awaitClose { awaitClose {
removeListener(listener) removeListeners(listener)
} }
} }