diff --git a/numass-core/src/main/kotlin/inr/numass/data/storage/NumassStorage.kt b/numass-core/src/main/kotlin/inr/numass/data/storage/NumassStorage.kt index bb257f10..e6eb8b80 100644 --- a/numass-core/src/main/kotlin/inr/numass/data/storage/NumassStorage.kt +++ b/numass-core/src/main/kotlin/inr/numass/data/storage/NumassStorage.kt @@ -49,11 +49,11 @@ class NumassStorage : FileStorage { val description: String get() = meta.getString("description", "") - private constructor(parent: FileStorage, config: Meta, shelf: String) : super(parent, config, shelf) { - refresh() - } + private constructor(parent: FileStorage, config: Meta, shelf: String) : super(parent, config, shelf) - constructor(context: Context, config: Meta, path: Path) : super(context, config, path) { + constructor(context: Context, config: Meta, path: Path) : super(context, config, path) + + init { refresh() } diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt index b156f7b9..5d8f873e 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt @@ -149,7 +149,7 @@ class AmplitudeView : View(title = "Numass amplitude spectrum plot", icon = Imag spectrum.withBinning(binning), adapter ) - group.set(plot) + group.add(plot) } group } diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt index 003d7a1e..f99610ea 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/SlowControlView.kt @@ -14,6 +14,7 @@ import hep.dataforge.storage.api.ValueIndex import hep.dataforge.tables.Adapters import hep.dataforge.tables.ListTable import hep.dataforge.tables.Table +import hep.dataforge.toList import hep.dataforge.values.Values import javafx.collections.FXCollections import javafx.collections.MapChangeListener @@ -59,7 +60,7 @@ class SlowControlView : View(title = "Numass slow control view", icon = ImageVie "showSymbol" to false "showErrors" to false } - group.set(plot) + group.add(plot) } group } ui { @@ -80,7 +81,7 @@ class SlowControlView : View(title = "Numass slow control view", icon = ImageVie loader.index } try { - return ListTable(loader.format, index.query(query)) + return ListTable(loader.format, index.query(query).toList()) } catch (e: Exception) { throw RuntimeException(e) } diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/StorageView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/StorageView.kt index 4d7762a8..1710e07e 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/StorageView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/StorageView.kt @@ -62,7 +62,7 @@ class StorageView(val storage: Storage) : View(title = "Numass storage", icon = } is TableLoader -> { if (selected) { - scView.set(id, content) + scView[id] = content } else { scView.remove(id) }