From aa25ca56743a1b29e318bc6a6033e5adc630e01f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 18 Nov 2019 17:04:27 +0300
Subject: [PATCH] JDK update new vacuum controller

---
 .../control/readvac/VacCollectorDevice.kt     |  6 ++---
 .../control/readvac/VacCollectorDisplay.kt    | 22 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt
index 6d3acd5f..b8c271ec 100644
--- a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt
+++ b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDevice.kt
@@ -47,7 +47,7 @@ class VacCollectorDevice(context: Context, meta: Meta, val sensors: Collection<S
 
     private val helper = StorageHelper(this, this::buildLoader)
 
-    private val collector = object : DeviceListener, Connection {
+    private val collector = object : DeviceListener {
         val averagingDuration: Duration = Duration.parse(meta.getString("averagingDuration", "PT30S"))
 
         private val collector = RegularPointCollector(averagingDuration) {
@@ -56,7 +56,7 @@ class VacCollectorDevice(context: Context, meta: Meta, val sensors: Collection<S
 
         override fun notifyStateChanged(device: Device, name: String, state: Any) {
             if (name == MEASUREMENT_RESULT_STATE) {
-                collector.put(device.name, (state as Meta).getValue("value"))
+                collector.put(device.name, (state as Meta).getValue(RESULT_VALUE))
             }
         }
     }
@@ -70,11 +70,11 @@ class VacCollectorDevice(context: Context, meta: Meta, val sensors: Collection<S
 
 
     override fun init() {
-        super.init()
         for (s in sensors) {
             s.init()
             s.connect(collector, Roles.DEVICE_LISTENER_ROLE)
         }
+        super.init()
     }
 
     override val type: String
diff --git a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDisplay.kt b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDisplay.kt
index 62ba7ff7..f7680724 100644
--- a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDisplay.kt
+++ b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorDisplay.kt
@@ -5,13 +5,13 @@
  */
 package inr.numass.control.readvac
 
-import hep.dataforge.connections.Connection
 import hep.dataforge.control.connections.Roles
+import hep.dataforge.control.devices.Device
+import hep.dataforge.control.devices.DeviceListener
 import hep.dataforge.control.devices.Sensor
-import hep.dataforge.control.measurements.Measurement
-import hep.dataforge.control.measurements.MeasurementListener
 import hep.dataforge.fx.bindWindow
 import hep.dataforge.fx.fragments.LogFragment
+import hep.dataforge.meta.Meta
 import hep.dataforge.plots.PlotGroup
 import hep.dataforge.plots.data.TimePlot
 import hep.dataforge.values.Value
@@ -24,7 +24,6 @@ import javafx.geometry.Orientation
 import javafx.scene.control.ScrollPane
 import javafx.scene.layout.Priority
 import tornadofx.*
-import java.time.Instant
 
 /**
  * A view controller for Vac collector
@@ -35,16 +34,13 @@ class VacCollectorDisplay : DeviceDisplayFX<VacCollectorDevice>() {
 
     private val table = FXCollections.observableHashMap<String, Double>()
 
-    private val sensorConnection = object : MeasurementListener, Connection {
-        override fun onMeasurementResult(measurement: Measurement<*>, result: Any, time: Instant?) {
-            if (result is Double) {
-                table[measurement.device.name] = result;
+    private val sensorConnection = object : DeviceListener {
+
+        override fun notifyStateChanged(device: Device, name: String, state: Any) {
+            if (name == Sensor.MEASUREMENT_RESULT_STATE) {
+                table[device.name] = (state as Meta).getDouble(Sensor.RESULT_VALUE)
             }
         }
-
-        override fun onMeasurementFailed(measurement: Measurement<*>?, exception: Throwable?) {
-
-        }
     }
 
     private val viewList = FXCollections.observableArrayList<VacDisplay>();
@@ -58,7 +54,7 @@ class VacCollectorDisplay : DeviceDisplayFX<VacCollectorDevice>() {
         device.sensors.forEach { sensor ->
             val view = VacDisplay()
             sensor.connect(view, Roles.VIEW_ROLE, Roles.DEVICE_LISTENER_ROLE)
-            sensor.connect(sensorConnection, Roles.MEASUREMENT_LISTENER_ROLE);
+            sensor.connect(sensorConnection, Roles.DEVICE_LISTENER_ROLE)
             viewList.add(view)
         }
     }