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

Strarted work on remote

Browse Source
This commit is contained in:
Alexander Nozik 2018-05-24 21:47:32 +03:00
parent 1447ed5f70
commit 8be357b4ab
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ class BoardController() : Controller(), AutoCloseable {
val storageProperty = SimpleObjectProperty<Storage>(null)
val serverManagerProperty = objectBinding(contextProperty) {
context.opt(ServerManager::class.java).orElse(null)
context.opt(ServerManager::class.java)
}
val devices: ObservableList<Device> = FXCollections.observableArrayList();

2
numass-server/src/main/java/inr/numass/server/ServerRunner.java
View File

@ -29,7 +29,7 @@ public class ServerRunner extends SimpleConfigurable implements AutoCloseable {
public ServerRunner() throws IOException, ParseException {
// Global.instance().getPluginManager().load(StorageManager.class);
Path configFile = context.getOutput().getFile(SERVER_CONFIG_PATH).getPath();
Path configFile = context.getFile(SERVER_CONFIG_PATH).getPath();
if (Files.exists(configFile)) {
context.getLogger().info("Trying to read server configuration from {}", SERVER_CONFIG_PATH);
configure(MetaFileReader.Companion.read(configFile));

2
numass-viewer/build.gradle
View File

@ -12,7 +12,7 @@ if (!hasProperty('mainClass')) {
mainClassName = mainClass
version = "0.5.2 - SNAPSHOT"
version = "0.5.3"
description = "The viewer for numass data"

3
numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt
View File

@ -119,11 +119,12 @@ class SpectrumView : View(title = "Numass spectrum plot", icon = ImageView(dfIco
val plot: DataPlot = frame[name] as DataPlot? ?: DataPlot(name).apply { frame.add(this) }
runGoal("spectrumData[$name]") {
set.points.forEach { it.spectrum.start() }
set.points.map { point ->
val count = point.spectrum.await().countInWindow(loChannel.toShort(), upChannel.toShort());
val seconds = point.length.toMillis() / 1000.0;
runLater {
container.progress = progress.incrementAndGet().toDouble() / totalProgress
container.progress = progress.incrementAndGet().toDouble() / totalProgress
}
Adapters.buildXYDataPoint(
point.voltage,