forked from NPM/numass-framework
sync UI buttons
This commit is contained in:
parent
9f60c14bd9
commit
b0154ac187
@ -112,6 +112,7 @@ fun EventTarget.deviceStateIndicator(connection: DeviceDisplayFX<*>, state: Stri
|
|||||||
fun Node.deviceStateToggle(connection: DeviceDisplayFX<*>, state: String, title: String = state) {
|
fun Node.deviceStateToggle(connection: DeviceDisplayFX<*>, state: String, title: String = state) {
|
||||||
if (connection.device.stateNames.contains(state)) {
|
if (connection.device.stateNames.contains(state)) {
|
||||||
togglebutton(title) {
|
togglebutton(title) {
|
||||||
|
this.id = title
|
||||||
selectedProperty().addListener { _, oldValue, newValue ->
|
selectedProperty().addListener { _, oldValue, newValue ->
|
||||||
if (oldValue != newValue) {
|
if (oldValue != newValue) {
|
||||||
connection.device.states[state] = newValue
|
connection.device.states[state] = newValue
|
||||||
|
@ -12,7 +12,9 @@ import io.ktor.server.routing.*
|
|||||||
import io.ktor.server.websocket.*
|
import io.ktor.server.websocket.*
|
||||||
import io.ktor.websocket.*
|
import io.ktor.websocket.*
|
||||||
import javafx.application.Application
|
import javafx.application.Application
|
||||||
|
import javafx.scene.control.ToggleButton
|
||||||
import javafx.stage.Stage
|
import javafx.stage.Stage
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import java.nio.file.Paths
|
import java.nio.file.Paths
|
||||||
import java.util.*
|
import java.util.*
|
||||||
@ -29,29 +31,49 @@ class ReadVacSvr : ReadVac() {
|
|||||||
var server : NettyApplicationEngine? = null
|
var server : NettyApplicationEngine? = null
|
||||||
override fun start(stage: Stage) {
|
override fun start(stage: Stage) {
|
||||||
super.start(stage)
|
super.start(stage)
|
||||||
|
val measureButton = stage.scene.lookup("#Measure") as ToggleButton
|
||||||
|
val storeButton = stage.scene.lookup("#Store") as ToggleButton
|
||||||
this.server = embeddedServer(Netty, port = 8000) {
|
this.server = embeddedServer(Netty, port = 8000) {
|
||||||
install(WebSockets)
|
install(WebSockets)
|
||||||
routing {
|
routing {
|
||||||
staticFiles("/", Paths.get(this.javaClass.classLoader.getResource("index.html").toURI()).toFile().parentFile)
|
staticFiles("/", Paths.get(this.javaClass.classLoader.getResource("index.html").toURI()).toFile().parentFile)
|
||||||
val connections = Collections.synchronizedSet<Connection?>(LinkedHashSet())
|
val connections = Collections.synchronizedSet<Connection?>(LinkedHashSet())
|
||||||
|
measureButton.selectedProperty().addListener { _, oldValue, newValue ->
|
||||||
|
if (oldValue != newValue) {
|
||||||
|
connections.forEach {
|
||||||
|
runBlocking {
|
||||||
|
it.session.send("{ \"measurement\": {\"value\": ${newValue}}}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
storeButton.selectedProperty().addListener { _, oldValue, newValue ->
|
||||||
|
if (oldValue != newValue) {
|
||||||
|
connections.forEach {
|
||||||
|
runBlocking {
|
||||||
|
it.session.send("{ \"storing\": {\"value\": ${newValue}}}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
webSocket("/echo") {
|
webSocket("/echo") {
|
||||||
val thisConnection = Connection(this)
|
val thisConnection = Connection(this)
|
||||||
connections += thisConnection
|
connections += thisConnection
|
||||||
try {
|
try {
|
||||||
// Sending device list
|
// Sending device list and initial UI state
|
||||||
val stream = ByteArrayOutputStream()
|
val stream = ByteArrayOutputStream()
|
||||||
JSONMetaWriter.write(stream, this@ReadVacSvr.getDeviceMeta(this@ReadVacSvr.getDeviceConfig()))
|
JSONMetaWriter.write(stream, this@ReadVacSvr.getDeviceMeta(this@ReadVacSvr.getDeviceConfig()))
|
||||||
send("{ \"devices\": $stream }")
|
send("{ \"devices\": $stream, \"storing\": {\"value\": ${storeButton.selectedProperty().get()}}, \"measurement\": {\"value\": ${measureButton.selectedProperty().get()}} }")
|
||||||
|
|
||||||
for (frame in incoming) {
|
for (frame in incoming) {
|
||||||
frame as? Frame.Text ?: continue
|
frame as? Frame.Text ?: continue
|
||||||
val receivedText = frame.readText()
|
val receivedText = frame.readText()
|
||||||
when (receivedText) {
|
when (receivedText) {
|
||||||
"" -> {
|
"measurePressed" -> {
|
||||||
println("button was pressed")
|
measureButton.fire()
|
||||||
connections.forEach {
|
}
|
||||||
it.session.send("{ \"measurement\" : true}")
|
"storePressed" -> {
|
||||||
}
|
storeButton.fire()
|
||||||
}
|
}
|
||||||
"bye" -> close(CloseReason(CloseReason.Codes.NORMAL, "Client said BYE"))
|
"bye" -> close(CloseReason(CloseReason.Codes.NORMAL, "Client said BYE"))
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,18 @@ nuWebSocket.onmessage = (event) => {
|
|||||||
drawCard(device.name, device.color, "---", (device.sensorType == "mks") )
|
drawCard(device.name, device.color, "---", (device.sensorType == "mks") )
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// if (msg.)
|
if (msg.measurement) {
|
||||||
|
if (msg.measurement.value) {
|
||||||
|
document.querySelector("#measure").classList.add("pressedButton")
|
||||||
|
}
|
||||||
|
else document.querySelector("#measure").classList.remove("pressedButton")
|
||||||
|
}
|
||||||
|
if (msg.storing) {
|
||||||
|
if (msg.storing.value) {
|
||||||
|
document.querySelector("#store").classList.add("pressedButton")
|
||||||
|
}
|
||||||
|
else document.querySelector("#store").classList.remove("pressedButton")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
fetch("/api/devices")
|
fetch("/api/devices")
|
||||||
@ -85,14 +96,11 @@ var layout = {
|
|||||||
Plotly.newPlot('plot', data, layout, { responsive: true });
|
Plotly.newPlot('plot', data, layout, { responsive: true });
|
||||||
|
|
||||||
document.querySelector("#measure").addEventListener("click", (e) => {
|
document.querySelector("#measure").addEventListener("click", (e) => {
|
||||||
nuWebSocket.send("pressed")
|
nuWebSocket.send("measurePressed")
|
||||||
console.log("pressed")
|
console.log("measurePressed")
|
||||||
})
|
})
|
||||||
|
|
||||||
let onClick = null
|
document.querySelector("#store").addEventListener("click", (e) => {
|
||||||
let click = () -> { ... onClick("myBotton") }
|
nuWebSocket.send("storePressed")
|
||||||
|
console.log("storePressed")
|
||||||
onClick = (name) => { console.log("Button " + name + " pressed") };
|
})
|
||||||
click() // Button myButton pressed
|
|
||||||
onClick = (name) => { console.log("Button " + name + " pressed!!!") };
|
|
||||||
click() // Button myButton pressed!!!
|
|
@ -12,7 +12,7 @@
|
|||||||
transition: 0.5s;
|
transition: 0.5s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.myButton:active {
|
.pressedButton {
|
||||||
background-color: #008a03;
|
background-color: #008a03;
|
||||||
transition: 0.5s;
|
transition: 0.5s;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user