NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed fragment window closing behavior

Browse Source
This commit is contained in:
Alexander Nozik 2017-11-14 22:21:51 +03:00
parent 1f5b7ea58a
commit d77051b54f
6 changed files with 79 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
numass-control/control-room/src/main/kotlin/inr/numass/control/BoardController.kt
View File

@ -3,13 +3,16 @@ package inr.numass.control
import hep.dataforge.context.Context
import hep.dataforge.context.Global
import hep.dataforge.control.DeviceManager
import hep.dataforge.control.devices.Device
import hep.dataforge.kodex.useMeta
import hep.dataforge.kodex.useMetaList
import hep.dataforge.meta.Meta
import hep.dataforge.server.ServerManager
import hep.dataforge.storage.commons.StorageConnection
import hep.dataforge.storage.commons.StorageManager
import inr.numass.client.ClientUtils
import javafx.beans.binding.ListBinding
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.property.SimpleStringProperty
import javafx.collections.FXCollections
import javafx.collections.ObservableList
import tornadofx.*
@ -23,22 +26,16 @@ class BoardController() : Controller(), AutoCloseable {
val contextProperty = SimpleObjectProperty<Context>(Global.instance())
var context: Context by contextProperty
val metaProperty = SimpleObjectProperty<Meta>(Meta.empty())
var meta: Meta by metaProperty
// val metaProperty = SimpleObjectProperty<Meta>(Meta.empty())
// var meta: Meta by metaProperty
val storageManagerProperty = nonNullObjectBinding(contextProperty) {
context.pluginManager.getOrLoad(StorageManager::class.java)
}
val numassRunProperty = SimpleStringProperty("")
var numassRun: String by numassRunProperty
private set
val storageProperty = nonNullObjectBinding(storageManagerProperty , metaProperty) {
val storageMeta = meta.getMeta("storage").builder
.putValue("readOnly", false)
.putValue("monitor", true)
val storageProperty = nonNullObjectBinding(contextProperty, numassRunProperty) {
val rootStorage = context.pluginManager.getOrLoad(StorageManager::class.java).defaultStorage
context.logger.info("Creating storage for server with meta {}", storageMeta)
val rootStorage = value.buildStorage(storageMeta);
val numassRun = ClientUtils.getRunName(meta)
if (!numassRun.isEmpty()) {
context.logger.info("Run information found. Selecting run {}", numassRun)
rootStorage.buildShelf(numassRun, Meta.empty());
@ -48,7 +45,7 @@ class BoardController() : Controller(), AutoCloseable {
}.apply {
onChange {
val connection = StorageConnection(value)
devices.map { it.device }.forEach { device ->
devices.forEach { device ->
device.forEachConnection(StorageConnection::class.java) { device.disconnect(it) }//removing all ald storage connections
device.connect(connection)
}
@ -59,45 +56,61 @@ class BoardController() : Controller(), AutoCloseable {
context.optFeature(ServerManager::class.java).orElse(null)
}
val devices: ObservableList<Device> = FXCollections.observableArrayList();
val deviceManagerProperty = objectBinding(contextProperty) {
context.optFeature(DeviceManager::class.java).orElse(null)
}.apply {
onChange {
value?.let {
devices.setAll(it.devices.toList());
}
}
}
val devices: ObservableList<DeviceDisplay<*>> = object : ListBinding<DeviceDisplay<*>>() {
init {
bind(deviceManagerProperty)
}
override fun computeValue(): ObservableList<DeviceDisplay<*>> {
val manager = deviceManagerProperty.value
return if (manager == null) {
FXCollections.emptyObservableList();
} else {
manager.deviceNames()
.filter { it.length == 1 } // select top level devices
.map { manager.optDevice(it) }
.filter { it.isPresent }
.map { it.get().getDisplay() }
.toList().observable()
}
}
}
// val deviceViews: ObservableList<DeviceDisplay<*>> = object : ListBinding<DeviceDisplay<*>>() {
// init {
// bind(devices)
// }
//
// override fun computeValue(): ObservableList<DeviceDisplay<*>> {
// val manager = deviceManagerProperty.value
// return if (manager == null) {
// FXCollections.emptyObservableList();
// } else {
// manager.deviceNames()
// .filter { it.length == 1 } // select top level devices
// .map { manager.optDevice(it) }
// .filter { it.isPresent }
// .map { it.get().getDisplay() }
// .toList().observable()
// }
// }
// }
fun configure(meta: Meta) {
val context = Context.build("NUMASS", Global.instance(), meta.getMeta("context", meta));
Context.build("NUMASS", Global.instance(), meta.getMeta("context", meta)).apply {
meta.useMeta("storage") {
pluginManager.getOrLoad(StorageManager::class.java).configure(it);
}
fun load(app: App) {
runAsync {
getConfig(app).ifPresent {
configure(it)
meta.useMetaList("device") {
it.forEach {
pluginManager.getOrLoad(DeviceManager::class.java).buildDevice(it)
}
}
meta.useMeta("numass") {
numassRun = ClientUtils.getRunName(it)
}
}.also {
runLater {
context = it
}
}
}
override fun close() {
context.close()
//Global.terminate()
}
// val devices: ObservableList<DeviceDisplay<*>> = FXCollections.observableArrayList<DeviceDisplay<*>>();
//

15
numass-control/control-room/src/main/kotlin/inr/numass/control/BoardView.kt
View File

@ -79,13 +79,22 @@ class BoardView : View("Numass control board", ImageView(dfIcon)) {
vgrow = Priority.ALWAYS;
vbox {
prefHeight = 40.0
bindChildren(controller.devices) { connection ->
controller.devices.onChange { change ->
children.setAll(change.list.map {
titledpane(
title = "Device: " + connection.device.name,
title = "Device: " + it.name,
collapsible = true,
node = connection.getBoardView()
node = it.getDisplay().getBoardView()
)
})
}
// bindChildren(controller.devices) { device ->
// titledpane(
// title = "Device: " + device.name,
// collapsible = true,
// node = device.getDisplay().getBoardView()
// )
// }
}
}
}

5
numass-control/control-room/src/main/kotlin/inr/numass/control/ServerApp.kt
View File

@ -11,7 +11,10 @@ class ServerApp : App(BoardView::class) {
override fun start(stage: Stage) {
controller.load(this)
getConfig(this@ServerApp).ifPresent {
controller.configure(it)
}
super.start(stage)
}

2
numass-control/control-room/src/main/resources/config/server.xml → numass-control/control-room/src/main/resources/config/control.xml
View File

@ -3,7 +3,7 @@
<server port="8337"/>
<storage path="D:/temp/test"/>
<numass run="serverTest"/>
<device type="numass:pkt8" port = "virtual" abuf = "120">
<device type="numass.pkt8" port="virtual" abuf="120">
<!--<connection ip="192.168.111.137" port="4001"/>-->
<channel designation="a" name="a-channel" r0="1000" transformationType="hyperbolic" coefs="[1.0,1.0]"
color="black"/>

2
numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8Device.kt
View File

@ -309,7 +309,7 @@ class PKT8Device(context: Context, meta: Meta) : PortSensor<PKT8Result>(context,
try {
logger.info("Starting measurement")
handler.holdBy(this)
send("s")
handler.send(this,"s")
afterStart()
} catch (ex: ControlException) {
portError("Failed to start measurement", ex)

8
numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8Display.kt
View File

@ -177,10 +177,10 @@ class PKT8Display : DeviceDisplay<PKT8Device>(), MeasurementListener {
.filter { channel -> !plottables.has(channel.name) }
.forEachOrdered { channel ->
//frame config from device configuration
val plottable = TimePlot(channel.name)
plottable.configure(channel.meta())
plottables.add(plottable)
plotFrame.add(plottable)
val plot = TimePlot(channel.name)
plot.configure(channel.meta())
plottables.add(plot)
plotFrame.add(plot)
}
if (device.meta().hasMeta("plotConfig")) {
plottables.configure(device.meta().getMeta("plotConfig"))