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

Add proper deviceName to in-memory property history

Browse Source
This commit is contained in:
Alexander Nozik 2024-03-06 18:55:11 +03:00
parent 2946f23a4b
commit 4835376c0d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
controls-core/src/commonMain/kotlin/space/kscience/controls/misc/PropertyHistory.kt
View File

@ -10,6 +10,7 @@ import space.kscience.controls.api.PropertyChangedMessage
import space.kscience.controls.spec.DevicePropertySpec import space.kscience.controls.spec.DevicePropertySpec
import space.kscience.controls.spec.name import space.kscience.controls.spec.name
import space.kscience.dataforge.meta.MetaConverter import space.kscience.dataforge.meta.MetaConverter
import space.kscience.dataforge.names.Name
/** /**
* An interface for device property history. * An interface for device property history.
@ -34,6 +35,7 @@ public interface PropertyHistory<T> {
public class CollectedPropertyHistory<T>( public class CollectedPropertyHistory<T>(
public val scope: CoroutineScope, public val scope: CoroutineScope,
eventFlow: Flow<DeviceMessage>, eventFlow: Flow<DeviceMessage>,
public val deviceName: Name,
public val propertyName: String, public val propertyName: String,
public val converter: MetaConverter<T>, public val converter: MetaConverter<T>,
maxSize: Int = 1000, maxSize: Int = 1000,
@ -41,7 +43,7 @@ public class CollectedPropertyHistory<T>(
private val store: SharedFlow<ValueWithTime<T>> = eventFlow private val store: SharedFlow<ValueWithTime<T>> = eventFlow
.filterIsInstance<PropertyChangedMessage>() .filterIsInstance<PropertyChangedMessage>()
.filter { it.property == propertyName } .filter { it.sourceDevice == deviceName && it.property == propertyName }
.map { ValueWithTime(converter.read(it.value), it.time) } .map { ValueWithTime(converter.read(it.value), it.time) }
.shareIn(scope, started = SharingStarted.Eagerly, replay = maxSize) .shareIn(scope, started = SharingStarted.Eagerly, replay = maxSize)
@ -54,13 +56,15 @@ public class CollectedPropertyHistory<T>(
*/ */
public fun <T> Device.collectPropertyHistory( public fun <T> Device.collectPropertyHistory(
scope: CoroutineScope = this, scope: CoroutineScope = this,
deviceName: Name,
propertyName: String, propertyName: String,
converter: MetaConverter<T>, converter: MetaConverter<T>,
maxSize: Int = 1000, maxSize: Int = 1000,
): PropertyHistory<T> = CollectedPropertyHistory(scope, messageFlow, propertyName, converter, maxSize) ): PropertyHistory<T> = CollectedPropertyHistory(scope, messageFlow, deviceName, propertyName, converter, maxSize)
public fun <D : Device, T> D.collectPropertyHistory( public fun <D : Device, T> D.collectPropertyHistory(
scope: CoroutineScope = this, scope: CoroutineScope = this,
deviceName: Name,
spec: DevicePropertySpec<D, T>, spec: DevicePropertySpec<D, T>,
maxSize: Int = 1000, maxSize: Int = 1000,
): PropertyHistory<T> = collectPropertyHistory(scope, spec.name, spec.converter, maxSize) ): PropertyHistory<T> = collectPropertyHistory(scope, deviceName, spec.name, spec.converter, maxSize)