From 54c42a6a56911a804a460e54e9eb4507db0deeff Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 10 Apr 2020 19:25:52 +0300 Subject: [PATCH] DF to 0.1.7 --- build.gradle.kts | 6 +-- .../hep/dataforge/vis/AbstractVisualObject.kt | 1 - .../kotlin/hep/dataforge/vis/VisualObject.kt | 6 +-- .../kotlin/hep/dataforge/vis/valueWidget.kt | 9 +--- .../kotlin/hep/dataforge/vis/FXPlugin.kt | 3 +- .../kotlin/hep/dataforge/vis/editor/FXMeta.kt | 8 ++-- .../hep/dataforge/vis/editor/ValueChooser.kt | 3 +- .../vis/spatial/gdml/TestConvertor.kt | 2 +- .../dataforge/vis/spatial/GeometryBuilder.kt | 5 +-- .../hep/dataforge/vis/spatial/Material3D.kt | 41 +++++++++---------- .../hep/dataforge/vis/spatial/PolyLine.kt | 2 +- .../hep/dataforge/vis/spatial/Visual3D.kt | 6 +-- .../dataforge/vis/spatial/VisualObject3D.kt | 18 ++++---- .../vis/spatial/specifications/Axes.kt | 6 +-- .../vis/spatial/specifications/Camera.kt | 8 ++-- .../vis/spatial/specifications/Canvas.kt | 8 ++-- .../vis/spatial/specifications/Controls.kt | 4 +- .../vis/spatial/three/ThreeCanvas.kt | 2 +- .../vis/spatial/gdml/GDMLVisualTest.kt | 2 +- .../vis/spatial/gdml/demo/readFile.kt | 2 +- .../vis/spatial/FileSerializationTest.kt | 2 +- demo/muon-monitor/build.gradle.kts | 1 + .../ru/mipt/npm/muon/monitor/GeometryTest.kt | 3 +- .../hep/dataforge/vis/spatial/demo/demo.kt | 2 +- .../dataforge/vis/spatial/demo/VariableBox.kt | 2 +- 25 files changed, 66 insertions(+), 86 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 82e7bc0c..b7ee4ffd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ import scientifik.fx import scientifik.serialization -val dataforgeVersion by extra("0.1.6-dev") +val dataforgeVersion by extra("0.1.7") plugins { - val toolsVersion = "0.4.0" + val toolsVersion = "0.4.2" id("scientifik.mpp") version toolsVersion apply false id("scientifik.jvm") version toolsVersion apply false id("scientifik.js") version toolsVersion apply false @@ -24,7 +24,7 @@ allprojects { } group = "hep.dataforge" - version = "0.1.2-dev" + version = "0.1.3-dev" } val githubProject by extra("dataforge-vis") diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt index 47d002d5..cadac217 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt @@ -1,7 +1,6 @@ package hep.dataforge.vis import hep.dataforge.meta.* -import hep.dataforge.meta.scheme.setProperty import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.values.Value diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt index ae7abe7f..fc47ff10 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt @@ -1,15 +1,13 @@ package hep.dataforge.vis +import hep.dataforge.meta.Configurable import hep.dataforge.meta.Laminate import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaItem -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.scheme.Configurable import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.toName import hep.dataforge.provider.Type -import hep.dataforge.values.ValueType import hep.dataforge.vis.VisualObject.Companion.TYPE import kotlinx.serialization.Transient @@ -66,7 +64,7 @@ interface VisualObject : Configurable { const val TYPE = "visual" val STYLE_KEY = "@style".asName() - //const val META_KEY = "@meta" + //const val META_KEY = "@meta" //const val TAGS_KEY = "@tags" } diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt index fd0f598d..80e44a35 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt @@ -1,19 +1,14 @@ package hep.dataforge.vis -import hep.dataforge.meta.EmptyMeta -import hep.dataforge.meta.Meta +import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.meta.node -import hep.dataforge.meta.scheme.getProperty -import hep.dataforge.meta.scheme.setProperty -import hep.dataforge.meta.string import hep.dataforge.values.asValue /** * Extension property to access the "widget" key of [ValueDescriptor] */ var ValueDescriptor.widget: Meta - get() = getProperty("widget").node ?: EmptyMeta + get() = getProperty("widget").node ?: Meta.EMPTY set(value) { setProperty("widget", value) } diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt index dcd5795c..ca5a7c24 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt @@ -1,7 +1,6 @@ package hep.dataforge.vis import hep.dataforge.context.* -import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.Meta import hep.dataforge.meta.boolean import javafx.application.Application @@ -20,7 +19,7 @@ import kotlin.reflect.KClass /** * Plugin holding JavaFX application instance and its root stage */ -class FXPlugin(meta: Meta = EmptyMeta) : AbstractPlugin(meta) { +class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) { override val tag: PluginTag get() = Companion.tag private val stages: ObservableSet = FXCollections.observableSet() diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt index 10fe2ee3..e4ed11a8 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt @@ -174,10 +174,10 @@ private fun > M.createEmptyNode(token: NameToken, append: Boo val name = token.asName() val index = (getIndexed(name).keys.mapNotNull { it.toIntOrNull() }.max() ?: -1) + 1 val newName = name.withIndex(index.toString()) - set(newName, EmptyMeta) + set(newName, Meta.EMPTY) get(newName).node!! } else { - this.setNode(token.asName(), EmptyMeta) + this.setNode(token.asName(), Meta.EMPTY) //FIXME possible concurrency bug get(token).node!! } @@ -211,9 +211,9 @@ fun > FXMetaNode.addValue(key: String) { fun > FXMetaNode.addNode(key: String) { val parent = getOrCreateNode() if (descriptor?.multiple == true) { - parent.append(key, EmptyMeta) + parent.append(key, Meta.EMPTY) } else { - parent[key] = EmptyMeta + parent[key] = Meta.EMPTY } } diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt index 7c5a0d1e..56794fcb 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt @@ -7,7 +7,6 @@ package hep.dataforge.vis.editor import hep.dataforge.context.Context import hep.dataforge.context.Named -import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.ValueDescriptor import hep.dataforge.names.toName @@ -66,7 +65,7 @@ interface ValueChooser { @Type("hep.dataforge.vis.fx.valueChooserFactory") interface Factory : Named { - operator fun invoke(meta: Meta = EmptyMeta): ValueChooser + operator fun invoke(meta: Meta = Meta.EMPTY): ValueChooser } companion object { diff --git a/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt b/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt index f9cad99c..bdb48d7e 100644 --- a/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt +++ b/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial.gdml import nl.adaptivity.xmlutil.StAXReader -import org.junit.Test +import org.junit.jupiter.api.Test import scientifik.gdml.GDML import java.io.File import java.net.URL diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt index efc623d9..f189a007 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt @@ -1,6 +1,5 @@ package hep.dataforge.vis.spatial -import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.Meta /** @@ -14,7 +13,7 @@ interface GeometryBuilder { * @param normal optional external normal to the face * @param meta optional additional platform-specific parameters like color or texture index */ - fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D? = null, meta: Meta = EmptyMeta) + fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D? = null, meta: Meta = Meta.EMPTY) fun build(): T } @@ -25,7 +24,7 @@ fun GeometryBuilder<*>.face4( vertex3: Point3D, vertex4: Point3D, normal: Point3D? = null, - meta: Meta = EmptyMeta + meta: Meta = Meta.EMPTY ) { face(vertex1, vertex2, vertex3, normal, meta) face(vertex1, vertex3, vertex4, normal, meta) diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt index 98ffe8b5..5e16fadf 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt @@ -1,11 +1,7 @@ package hep.dataforge.vis.spatial +import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.double -import hep.dataforge.meta.get -import hep.dataforge.meta.node -import hep.dataforge.meta.scheme.* -import hep.dataforge.meta.set import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.values.ValueType @@ -48,23 +44,26 @@ class Material3D : Scheme() { internal val WIREFRAME_KEY = "wireframe".asName() val MATERIAL_WIREFRAME_KEY = MATERIAL_KEY + WIREFRAME_KEY - val descriptor = NodeDescriptor { - defineValue(VisualObject3D.VISIBLE_KEY) { - type(ValueType.BOOLEAN) - default(true) - } - defineNode(MATERIAL_KEY) { - defineValue(COLOR_KEY) { - type(ValueType.STRING, ValueType.NUMBER) - default("#ffffff") - } - defineValue(OPACITY_KEY) { - type(ValueType.NUMBER) - default(1.0) - } - defineValue(WIREFRAME_KEY) { + val descriptor by lazy { + //must be lazy to avoid initialization bug + NodeDescriptor { + defineValue(VisualObject3D.VISIBLE_KEY) { type(ValueType.BOOLEAN) - default(false) + default(true) + } + defineNode(MATERIAL_KEY) { + defineValue(COLOR_KEY) { + type(ValueType.STRING, ValueType.NUMBER) + default("#ffffff") + } + defineValue(OPACITY_KEY) { + type(ValueType.NUMBER) + default(1.0) + } + defineValue(WIREFRAME_KEY) { + type(ValueType.BOOLEAN) + default(false) + } } } } diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt index 01176f46..b9f67f51 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.meta.scheme.number +import hep.dataforge.meta.number import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.vis.AbstractVisualObject diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt index 22b8ea74..26cb67c5 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt @@ -4,11 +4,7 @@ import hep.dataforge.context.AbstractPlugin import hep.dataforge.context.Context import hep.dataforge.context.PluginFactory import hep.dataforge.context.PluginTag -import hep.dataforge.meta.Meta -import hep.dataforge.meta.float -import hep.dataforge.meta.get -import hep.dataforge.meta.node -import hep.dataforge.meta.scheme.configure +import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.toName import hep.dataforge.vis.Visual diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt index 7320cce8..463326f4 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt @@ -4,8 +4,6 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.scheme.node -import hep.dataforge.meta.scheme.setProperty import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.output.Renderer @@ -61,18 +59,20 @@ interface VisualObject3D : VisualObject { val yScale = scale + y val zScale = scale + z - val descriptor = NodeDescriptor { - defineValue(VISIBLE_KEY) { - type(ValueType.BOOLEAN) - default(true) - } + val descriptor by lazy { + NodeDescriptor { + defineValue(VISIBLE_KEY) { + type(ValueType.BOOLEAN) + default(true) + } - defineItem(Material3D.MATERIAL_KEY, Material3D.descriptor) + defineItem(Material3D.MATERIAL_KEY.toString(), Material3D.descriptor) // Material3D.MATERIAL_COLOR_KEY put "#ffffff" // Material3D.MATERIAL_OPACITY_KEY put 1.0 // Material3D.MATERIAL_WIREFRAME_KEY put false + } } } } @@ -86,7 +86,7 @@ var VisualObject3D.layer: Int setProperty(LAYER_KEY, value.asValue()) } -fun Renderer.render(meta: Meta = EmptyMeta, action: VisualGroup3D.() -> Unit) = +fun Renderer.render(meta: Meta = Meta.EMPTY, action: VisualGroup3D.() -> Unit) = render(VisualGroup3D().apply(action), meta) // Common properties diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt index cda776c1..eace3211 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt @@ -1,10 +1,6 @@ package hep.dataforge.vis.spatial.specifications -import hep.dataforge.meta.isEmpty -import hep.dataforge.meta.scheme.Scheme -import hep.dataforge.meta.scheme.SchemeSpec -import hep.dataforge.meta.scheme.boolean -import hep.dataforge.meta.scheme.double +import hep.dataforge.meta.* class Axes : Scheme() { var visible by boolean(!config.isEmpty()) diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt index fc131b4a..0ff4534b 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt @@ -1,9 +1,9 @@ package hep.dataforge.vis.spatial.specifications -import hep.dataforge.meta.scheme.Scheme -import hep.dataforge.meta.scheme.SchemeSpec -import hep.dataforge.meta.scheme.double -import hep.dataforge.meta.scheme.int +import hep.dataforge.meta.Scheme +import hep.dataforge.meta.SchemeSpec +import hep.dataforge.meta.double +import hep.dataforge.meta.int import kotlin.math.PI class Camera : Scheme() { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt index a10b3186..ba762d9a 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt @@ -1,9 +1,9 @@ package hep.dataforge.vis.spatial.specifications -import hep.dataforge.meta.scheme.Scheme -import hep.dataforge.meta.scheme.SchemeSpec -import hep.dataforge.meta.scheme.int -import hep.dataforge.meta.scheme.spec +import hep.dataforge.meta.Scheme +import hep.dataforge.meta.SchemeSpec +import hep.dataforge.meta.int +import hep.dataforge.meta.spec class Canvas : Scheme() { var axes by spec(Axes, Axes.empty()) diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt index 7d142b67..6b7de59c 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial.specifications -import hep.dataforge.meta.scheme.Scheme -import hep.dataforge.meta.scheme.SchemeSpec +import hep.dataforge.meta.Scheme +import hep.dataforge.meta.SchemeSpec class Controls : Scheme() { diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt index 4de96ab5..71227c19 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt @@ -2,7 +2,7 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.context.Context import hep.dataforge.meta.Meta -import hep.dataforge.meta.scheme.getProperty +import hep.dataforge.meta.getProperty import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.names.plus diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vis/spatial/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vis/spatial/gdml/GDMLVisualTest.kt index cab81846..5b6b1231 100644 --- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vis/spatial/gdml/GDMLVisualTest.kt +++ b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vis/spatial/gdml/GDMLVisualTest.kt @@ -1,6 +1,6 @@ package hep.dataforge.vis.spatial.gdml -import hep.dataforge.meta.scheme.setProperty +import hep.dataforge.meta.setProperty import hep.dataforge.meta.string import hep.dataforge.names.toName import hep.dataforge.values.asValue diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/readFile.kt index c89b1857..cfac3a21 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/readFile.kt +++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/readFile.kt @@ -1,6 +1,6 @@ package hep.dataforge.vis.spatial.gdml.demo -import hep.dataforge.meta.scheme.setProperty +import hep.dataforge.meta.setProperty import hep.dataforge.values.asValue import hep.dataforge.vis.spatial.Material3D import hep.dataforge.vis.spatial.Visual3D diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt index 273c25ba..b0a7ae7f 100644 --- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt +++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial import hep.dataforge.names.asName -import org.junit.Test +import org.junit.jupiter.api.Test import kotlin.test.Ignore class FileSerializationTest { diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts index 55f913ce..c5692be4 100644 --- a/demo/muon-monitor/build.gradle.kts +++ b/demo/muon-monitor/build.gradle.kts @@ -46,6 +46,7 @@ kotlin { implementation(npm("abort-controller")) implementation(npm("bufferutil")) implementation(npm("utf-8-validate")) + implementation(npm("fs")) // implementation(npm("jquery")) // implementation(npm("popper.js")) // implementation(npm("react-is")) diff --git a/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt b/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt index 7c718e23..6e1ec106 100644 --- a/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt +++ b/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt @@ -1,7 +1,6 @@ package ru.mipt.npm.muon.monitor -import org.junit.Test -import kotlin.test.assertTrue +import kotlin.test.* class GeometryTest { diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt index ac716e82..836e6c2e 100644 --- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt +++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial.demo import hep.dataforge.meta.Meta -import hep.dataforge.meta.scheme.invoke +import hep.dataforge.meta.invoke import hep.dataforge.names.toName import hep.dataforge.output.OutputManager import hep.dataforge.vis.Colors diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt index 4dd23ac5..b18ca2aa 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt @@ -4,7 +4,7 @@ package hep.dataforge.vis.spatial.demo import hep.dataforge.meta.int import hep.dataforge.meta.number -import hep.dataforge.meta.scheme.setProperty +import hep.dataforge.meta.setProperty import hep.dataforge.names.plus import hep.dataforge.names.startsWith import hep.dataforge.values.asValue