Fix coalaPlots stepping for device data

Author: altavir

controls-core/src/commonMain/kotlin/space/kscience/controls/time/ClockManager.kt

@@ -85,7 +85,7 @@ public class ClockManager(meta: Meta) : AbstractPlugin(meta) {
     }
 
     /**
-     * Provide a [CoroutineDispatcher] with compressed time based on context dispatcher
+     * Provide a [CoroutineDispatcher] with time management for simulations
      */
     public val simulationDispatcher: CoroutineDispatcher by lazy {
         when (val mode = clockMode) {

controls-visualisation-compose/src/commonMain/kotlin/koalaPlots.kt

@@ -18,10 +18,12 @@ import space.kscience.controls.constructor.units.Numeric
 import space.kscience.controls.constructor.values
 import space.kscience.controls.spec.DevicePropertySpec
 import space.kscience.controls.spec.name
+import space.kscience.controls.time.ClockManager
 import space.kscience.controls.time.ValueWithTime
 import space.kscience.controls.time.clock
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.request
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.double
 import kotlin.time.Clock
@@ -36,21 +38,34 @@ private val defaultMaxPoints get() = 800
 private val defaultMinPoints get() = 400
 private val defaultSampling get() = 1.seconds
 
-private fun <T> Flow<T>.repeatOrSample(clock: Clock, interval: Duration): Flow<ValueWithTime<T>> = flow {
+private fun <T> Flow<T>.repeatOrSample(clockManager: ClockManager, interval: Duration): Flow<ValueWithTime<T>> = flow {
+    val clock = clockManager.clock
+
     coroutineScope {
+
         var current: T? = null
+        var flag: Boolean = false
 
         launch {
             collect {
                 current = it
+                flag = true
             }
         }
 
         while (isActive) {
-            current?.let { emit(ValueWithTime(it, clock.now())) }
-            delay(interval)
+            current?.let {
+                if(!flag) {
+                    emit(ValueWithTime(it, clock.now()))
+                }
+            }
+            flag = false
+            withContext(clockManager.simulationDispatcher) {
+                delay(interval)
+            }
         }
     }
+
 }
 
 
@@ -121,11 +136,13 @@ public fun XYGraphScope<Instant, Double>.PlotDeviceProperty(
     lineStyle: LineStyle = defaultLineStyle,
 ) {
     var points by remember { mutableStateOf<List<ValueWithTime<Double>>>(emptyList()) }
+    val clockManager =
+        remember(device) { device.context.plugins.get<ClockManager>() ?: device.context.request(ClockManager) }
 
     LaunchedEffect(device, propertyName, maxAge, maxPoints, minPoints, sampling) {
         device.propertyMessageFlow(propertyName)
             .map { it.value.extractValue() }
-            .repeatOrSample(device.clock, sampling)
+            .repeatOrSample(clockManager, sampling)
             .collectAndTrim(maxAge, maxPoints, minPoints, device.clock)
             .onEach { points = it }
             .launchIn(this)
@@ -166,14 +183,14 @@ public fun XYGraphScope<Instant, Double>.PlotNumberState(
     lineStyle: LineStyle = defaultLineStyle,
 ): Unit {
     var points by remember { mutableStateOf<List<ValueWithTime<Double>>>(emptyList()) }
-
+    val clockManager = remember(context) { context.plugins.get<ClockManager>() ?: context.request(ClockManager) }
 
     LaunchedEffect(context, state, maxAge, maxPoints, minPoints, sampling) {
         val clock = context.clock
 
         state.subscribe()
             .map { it.toDouble() }
-            .repeatOrSample(clock, sampling)
+            .repeatOrSample(clockManager, sampling)
             .collectAndTrim(maxAge, maxPoints, minPoints, clock)
             .onEach { points = it }
             .launchIn(this)

demo/constructor/src/jvmMain/kotlin/ChainBuffer.kt

@@ -67,6 +67,7 @@ private class ChainBufferModel(
 
     val buffer2 = buffer(cubicMeters, Numeric(10.0)).apply {
         connectProducer(transformer.limited(this, Numeric(2.0)))
+        debugState("Buffer 2", content)
     }
 
     val consumation = MutableDeviceState(Numeric<CubicMeters>(2.0))