From 78ff8d4f6e814eef9b7d429b0bf7f69e5a65efc6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 15 Nov 2021 22:22:04 +0300
Subject: [PATCH] Add trigger for tqdc reader

---
 .../kotlin/inr/numass/data/NumassDataUtils.kt |  9 ++++-----
 .../numass/data/storage/NumassDataLoader.kt   |  9 ++++-----
 .../main/kotlin/inr/numass/viewer/MainView.kt | 19 ++++++-------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/numass-core/src/main/kotlin/inr/numass/data/NumassDataUtils.kt b/numass-core/src/main/kotlin/inr/numass/data/NumassDataUtils.kt
index 4dda21f..30870fb 100644
--- a/numass-core/src/main/kotlin/inr/numass/data/NumassDataUtils.kt
+++ b/numass-core/src/main/kotlin/inr/numass/data/NumassDataUtils.kt
@@ -81,13 +81,12 @@ object NumassDataUtils {
         return SpectrumAdapter("Uset", "CR", "CRerr", "Time")
     }
 
-    fun read(envelope: Envelope): NumassPoint {
-        return if (envelope.dataType?.startsWith("numass.point.classic") ?: envelope.meta.hasValue("split")) {
-            ClassicNumassPoint(envelope)
-        } else {
+    fun read(envelope: Envelope): NumassPoint =
+        if (envelope.meta.hasMeta("dpp_params") || envelope.meta.hasMeta("tqdc")) {
             ProtoNumassPoint.fromEnvelope(envelope)
+        } else {
+            ClassicNumassPoint(envelope)
         }
-    }
 }
 
 suspend fun NumassBlock.transformChain(transform: (NumassEvent, NumassEvent) -> OrphanNumassEvent?): NumassBlock {
diff --git a/numass-core/src/main/kotlin/inr/numass/data/storage/NumassDataLoader.kt b/numass-core/src/main/kotlin/inr/numass/data/storage/NumassDataLoader.kt
index e6a4c6d..cc2f035 100644
--- a/numass-core/src/main/kotlin/inr/numass/data/storage/NumassDataLoader.kt
+++ b/numass-core/src/main/kotlin/inr/numass/data/storage/NumassDataLoader.kt
@@ -35,7 +35,6 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Instant
 import kotlin.reflect.KClass
-import kotlin.streams.toList
 
 
 /**
@@ -47,7 +46,7 @@ class NumassDataLoader(
     override val context: Context,
     override val parent: StorageElement?,
     override val name: String,
-    override val path: Path
+    override val path: Path,
 ) : Loader<NumassPoint>, NumassSet, Provider, FileStorageElement {
 
     override val type: KClass<NumassPoint> = NumassPoint::class
@@ -97,7 +96,7 @@ class NumassDataLoader(
 
 
     override val startTime: Instant
-        get() = meta.optValue("start_time").map<Instant> { it.time }.orElseGet { super.startTime }
+        get() = meta.optValue("start_time").map { it.time }.orElseGet { super.startTime }
 
     override fun close() {
         //do nothing
@@ -187,8 +186,8 @@ class NumassDataLoader(
 }
 
 
-fun Context.readNumassSet(path:Path):NumassDataLoader{
-    return NumassDataLoader(this,null,path.fileName.toString(),path)
+fun Context.readNumassSet(path: Path): NumassDataLoader {
+    return NumassDataLoader(this, null, path.fileName.toString(), path)
 }
 
 
diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
index fa88c13..4c2197f 100644
--- a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
+++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
@@ -165,7 +165,7 @@ class MainView : View(title = "Numass viewer", icon = dfIconView) {
                 //build storage
                 app.context.launch {
                     val storageElement = NumassDirectory.INSTANCE.read(app.context, path) as Storage
-                    withContext(Dispatchers.JavaFx){
+                    withContext(Dispatchers.JavaFx) {
                         contentView = storageView
                         storageView.storageProperty.set(storageElement)
                     }
@@ -187,19 +187,12 @@ class MainView : View(title = "Numass viewer", icon = dfIconView) {
             }
 
             envelope?.let {
-                if (it.meta.hasMeta("external_meta")) {
-                    //try to read as point
-                    val point = NumassDataUtils.read(it)
-                    runLater {
-                        contentView = AmplitudeView().apply {
-                            set(path.fileName.toString(), point)
-                        }
+                //try to read as point
+                val point = NumassDataUtils.read(it)
+                runLater {
+                    contentView = AmplitudeView().apply {
+                        set(path.fileName.toString(), point)
                     }
-                } else {
-                    alert(
-                        type = Alert.AlertType.ERROR,
-                        header = "Unknown envelope content: $path"
-                    ).show()
                 }
             }
         }