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

Fix merge

Browse Source
This commit is contained in:
Alexander Nozik 2020-06-30 22:09:21 +03:00
parent a3536c7a17
commit bbf7f38725
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/api/DeviceListener.kt
View File

@ -6,7 +6,6 @@ import hep.dataforge.meta.MetaItem
* PropertyChangeListener Interface * PropertyChangeListener Interface
* [value] is a new value that property has after a change; null is for invalid state. * [value] is a new value that property has after a change; null is for invalid state.
*/ */
interface PropertyChangeListener {
interface DeviceListener { interface DeviceListener {
fun propertyChanged(propertyName: String, value: MetaItem<*>?) fun propertyChanged(propertyName: String, value: MetaItem<*>?)
//TODO add general message listener method //TODO add general message listener method

4
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/controllers/DeviceMessage.kt
View File

@ -1,11 +1,9 @@
package hep.dataforge.control.controllers package hep.dataforge.control.controllers
import hep.dataforge.control.controlers.DeviceMessage.Companion.PAYLOAD_VALUE_KEY import hep.dataforge.control.controllers.DeviceMessage.Companion.PAYLOAD_VALUE_KEY
import hep.dataforge.meta.* import hep.dataforge.meta.*
import hep.dataforge.names.asName import hep.dataforge.names.asName
import hep.dataforge.names.plus import hep.dataforge.names.plus
import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable
class DeviceMessage : Scheme() { class DeviceMessage : Scheme() {
var id by item() var id by item()

4
dataforge-control-core/src/commonMain/kotlin/hep/dataforge/control/controllers/MessageController.kt
View File

@ -2,9 +2,7 @@ package hep.dataforge.control.controllers
import hep.dataforge.control.api.Device import hep.dataforge.control.api.Device
import hep.dataforge.control.api.DeviceListener import hep.dataforge.control.api.DeviceListener
import hep.dataforge.control.controlers.DeviceMessage.Companion.PROPERTY_CHANGED_ACTION import hep.dataforge.control.controllers.DeviceMessage.Companion.PROPERTY_CHANGED_ACTION
import hep.dataforge.control.api.PropertyChangeListener
import hep.dataforge.control.controllers.DevicePropertyMessage.Companion.PROPERTY_CHANGED_ACTION
import hep.dataforge.io.Envelope import hep.dataforge.io.Envelope
import hep.dataforge.io.Responder import hep.dataforge.io.Responder
import hep.dataforge.io.SimpleEnvelope import hep.dataforge.io.SimpleEnvelope

6
dataforge-control-server/src/main/kotlin/hep/dataforge/control/server/deviceWebServer.kt
View File

@ -3,9 +3,9 @@
package hep.dataforge.control.server package hep.dataforge.control.server
import hep.dataforge.control.api.Device import hep.dataforge.control.api.Device
import hep.dataforge.control.controlers.DeviceMessage import hep.dataforge.control.controllers.DeviceMessage
import hep.dataforge.control.controlers.MessageController import hep.dataforge.control.controllers.MessageController
import hep.dataforge.control.controlers.property import hep.dataforge.control.controllers.property
import hep.dataforge.meta.toJson import hep.dataforge.meta.toJson
import hep.dataforge.meta.toMeta import hep.dataforge.meta.toMeta
import hep.dataforge.meta.toMetaItem import hep.dataforge.meta.toMetaItem

3
dataforge-control-server/src/main/kotlin/hep/dataforge/control/server/envelopes.kt
View File

@ -1,10 +1,9 @@
package hep.dataforge.control.server package hep.dataforge.control.server
import hep.dataforge.control.controlers.DeviceMessage import hep.dataforge.control.controllers.DeviceMessage
import hep.dataforge.io.Envelope import hep.dataforge.io.Envelope
import io.ktor.application.ApplicationCall import io.ktor.application.ApplicationCall
import io.ktor.http.cio.websocket.Frame import io.ktor.http.cio.websocket.Frame
import io.ktor.response.ApplicationResponse
fun Frame.toEnvelope(): Envelope { fun Frame.toEnvelope(): Envelope {
TODO() TODO()