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

Monitor for IT6800

Browse Source
This commit is contained in:
Alexander Nozik 2018-11-26 21:16:29 +03:00
parent 8e1dfe19b4
commit 669766e816
8 changed files with 126 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-control/gun/build.gradle
View File

@ -19,7 +19,7 @@ apply plugin: 'application'
version = "0.1.0"
if (!hasProperty('mainClass')) {
ext.mainClass = 'inr.numass.control.magnet.fx.MagnetApp'
ext.mainClass = 'inr.numass.control.gun.EGunApplicationkt'
}
mainClassName = mainClass

40
numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGun.kt Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright 2018 Alexander Nozik.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package inr.numass.control.gun
import hep.dataforge.context.Context
import hep.dataforge.context.ContextAware
import hep.dataforge.control.devices.AbstractDevice
import hep.dataforge.control.devices.Device
import hep.dataforge.control.devices.DeviceHub
import hep.dataforge.meta.Meta
import hep.dataforge.meta.Metoid
import hep.dataforge.names.Name
import hep.dataforge.optional
import java.util.*
class EGun(context: Context, meta: Meta) : AbstractDevice(context, meta), DeviceHub, ContextAware, Metoid {
val sources: List<IT6800Device> by lazy {
meta.getMetaList("source").map {IT6800Device(context, it) }
}
override val deviceNames: List<Name> by lazy{ sources.map { Name.of(it.name) }}
override fun optDevice(name: Name): Optional<Device> {
return sources.find { it.name == name.toString() }.optional
}
}

43
numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunApplication.kt Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright 2018 Alexander Nozik.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package inr.numass.control.gun
import hep.dataforge.context.Context
import hep.dataforge.control.devices.Device
import hep.dataforge.control.devices.DeviceFactory
import hep.dataforge.meta.Meta
import hep.dataforge.meta.MetaUtils
import inr.numass.control.NumassControlApplication
import javafx.stage.Stage
class EGunApplication: NumassControlApplication<EGun>() {
override val deviceFactory: DeviceFactory = object :DeviceFactory{
override val type: String = "numass.lambda"
override fun build(context: Context, meta: Meta): Device {
return EGun(context, meta)
}
}
override fun setupStage(stage: Stage, device: EGun) {
stage.title = "Numass gun control"
}
override fun getDeviceMeta(config: Meta): Meta {
return MetaUtils.findNode(config,"device"){it.getString("name") == "numass.gun"}.orElseThrow{RuntimeException("Gun configuration not found")}
}
}

37
numass-control/gun/src/main/kotlin/inr/numass/control/gun/EGunView.kt Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright 2018 Alexander Nozik.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package inr.numass.control.gun
import hep.dataforge.fx.asDoubleProperty
import tornadofx.*
class EGunView(gun: EGun) : View() {
override val root = borderpane {
center {
vbox {
gun.sources.forEach { device ->
hbox {
label(device.name)
slider(range = 0.0..5.0, value = 0){
valueProperty().bindBidirectional(device.currentState.asDoubleProperty())
}
}
}
}
}
}
}

5
numass-control/magnet/src/main/kotlin/inr/numass/control/magnet/LambdaHub.kt
View File

@ -18,7 +18,6 @@ import inr.numass.control.getDisplay
import javafx.scene.Parent
import tornadofx.*
import java.util.*
import java.util.stream.Stream
import kotlin.collections.ArrayList
@StateDef(value = ValueDef(key = "address", type = arrayOf(ValueType.NUMBER), info = "Current active magnet"))
@ -78,8 +77,8 @@ class LambdaHub(context: Context, meta: Meta) : DeviceHub, AbstractDevice(contex
override fun optDevice(name: Name): Optional<Device> =
magnets.stream().filter { it.name == name.unescaped }.map { it as Device }.findFirst()
override val deviceNames: Stream<Name>
get() = magnets.stream().map { Name.ofSingle(it.name) }
override val deviceNames: List<Name>
get() = magnets.map { Name.ofSingle(it.name) }
}
class LambdaHubDisplay : DeviceDisplayFX<LambdaHub>() {

1
numass-control/magnet/src/main/kotlin/inr/numass/control/magnet/LambdaMagnet.kt
View File

@ -17,6 +17,7 @@ package inr.numass.control.magnet
import hep.dataforge.context.Context
import hep.dataforge.control.devices.AbstractDevice
import hep.dataforge.control.devices.notifyError
import hep.dataforge.control.ports.Port
import hep.dataforge.control.ports.PortFactory
import hep.dataforge.description.ValueDef

1
numass-control/magnet/src/main/kotlin/inr/numass/control/magnet/fx/MagnetApp.kt
View File

@ -17,7 +17,6 @@ class MagnetApp: NumassControlApplication<LambdaHub>() {
override fun build(context: Context, meta: Meta): Device {
return LambdaHub(context, meta)
}
}
override fun setupStage(stage: Stage, device: LambdaHub) {

5
numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt
View File

@ -36,7 +36,6 @@ import kotlinx.coroutines.time.delay
import java.time.Duration
import java.time.Instant
import java.util.*
import java.util.stream.Stream
/**
* @author [Alexander Nozik](mailto:altavir@gmail.com)
@ -65,8 +64,8 @@ class VacCollectorDevice(context: Context, meta: Meta, val sensors: Collection<S
override fun optDevice(name: Name): Optional<Device> =
Optional.ofNullable(sensors.find { it.name == name.unescaped })
override val deviceNames: Stream<Name>
get() = sensors.stream().map { Name.ofSingle(it.name) }
override val deviceNames: List<Name>
get() = sensors.map { Name.ofSingle(it.name) }
override fun init() {