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

Dev #8

Merged
altavir merged 78 commits from dev into master 2023-03-04 16:47:55 +03:00
Conversation 0 Commits 78 Files Changed 137 +7 -1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b56436983 - Show all commits

4
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/controllers/DeviceManager.kt
View File

@ -1,5 +1,6 @@
package ru.mipt.npm.controls.controllers package ru.mipt.npm.controls.controllers
import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.Device import ru.mipt.npm.controls.api.Device
import ru.mipt.npm.controls.api.DeviceHub import ru.mipt.npm.controls.api.DeviceHub
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
@ -38,6 +39,9 @@ public class DeviceManager : AbstractPlugin(), DeviceHub {
public fun <D : Device> DeviceManager.install(name: String, factory: Factory<D>, meta: Meta = Meta.EMPTY): D { public fun <D : Device> DeviceManager.install(name: String, factory: Factory<D>, meta: Meta = Meta.EMPTY): D {
val device = factory(meta, context) val device = factory(meta, context)
registerDevice(NameToken(name), device) registerDevice(NameToken(name), device)
device.launch {
device.open()
}
return device return device
} }

4
demo/src/main/kotlin/ru/mipt/npm/controls/demo/DemoDevice.kt
View File

@ -34,6 +34,9 @@ class DemoDevice(context: Context, meta: Meta) : DeviceBySpec<DemoDevice>(DemoDe
companion object : DeviceSpec<DemoDevice>(), Factory<DemoDevice> { companion object : DeviceSpec<DemoDevice>(), Factory<DemoDevice> {
override fun invoke(meta: Meta, context: Context): DemoDevice = DemoDevice(context, meta)
// register virtual properties based on actual object state // register virtual properties based on actual object state
val timeScale by property(MetaConverter.double, DemoDevice::timeScaleState) { val timeScale by property(MetaConverter.double, DemoDevice::timeScaleState) {
metaDescriptor { metaDescriptor {
@ -77,6 +80,5 @@ class DemoDevice(context: Context, meta: Meta) : DeviceBySpec<DemoDevice>(DemoDe
null null
} }
override fun invoke(meta: Meta, context: Context): DemoDevice = DemoDevice(context, meta)
} }
} }