Package name refactoring

README.md

@@ -8,10 +8,10 @@
 * [Features](#features)
 * [About DataForge](#about-dataforge)
 * [Modules contained in this repository](#modules-contained-in-this-repository)
-  * [dataforge-vis-common](#dataforge-vis-common)
+  * [visionforge-common](#visionforge-common)
-  * [dataforge-vis-spatial](#dataforge-vis-spatial)
+  * [visionforge-spatial](#visionforge-spatial)
-  * [dataforge-vis-spatial-gdml](#dataforge-vis-spatial-gdml)
+  * [visionforge-spatial-gdml](#visionforge-spatial-gdml)
-  * [dataforge-vis-jsroot](#dataforge-vis-jsroot)
+  * [visionforge-jsroot](#visionforge-jsroot)
 * [Visualization for External Systems](#visualization-for-external-systems)  
 * [Demonstrations](#demonstrations)
   * [Simple Example - Spatial Showcase](#simple-example---spatial-showcase)
@@ -56,19 +56,19 @@ To learn more about DataForge, please consult the following URLs:
 
 ## Modules contained in this repository
 
-### dataforge-vis-common 
+### visionforge-common
 
 Contains a general hierarchy of classes and interfaces useful for visualization. 
 This module is not specific to 3D-visualization.
 
-The `dataforge-vis-common` module also includes configuration editors for JS (in `jsMain`) and JVM (in `jvmMain`).
+The `visionforge-common` module also includes configuration editors for JS (in `jsMain`) and JVM (in `jvmMain`).
 
 **Class diagram:**
 
 ![](doc/resources/class-diag-common.png)
 
 
-### dataforge-vis-spatial
+### visionforge-spatial
 
 Includes common classes and serializers for 3D visualization, Three.js and JavaFX implementations.
 
@@ -91,12 +91,12 @@ level. Styles are applied to child (descendant) objects using `styles: List<Stri
 in `VisualObject`. 
 
 
-### dataforge-vis-spatial-gdml
+### visionforge-spatial-gdml
 
 GDML bindings for 3D visualization (to be moved to gdml project).
 
 
-### dataforge-vis-jsroot
+### visionforge-jsroot
 
 Some JSROOT bindings. 
 
@@ -105,15 +105,15 @@ Note: Currently, this part is experimental and put here for completeness. This m
 
 ## Visualization for External Systems 
 
-The `dataforge-vis` framework can be used to visualize geometry and events from external,
+The `visionforge` framework can be used to visualize geometry and events from external,
 non-Kotlin based systems, such as ROOT. This will require a plugin to convert data model
-of the external system to that of `dataforge-vis`. Performing such integration is a work 
+of the external system to that of `visionforge`. Performing such integration is a work
 currently in progress.
  
 
 ## Demonstrations
 
-The `demo` module contains several example projects (demonstrations) of using the `dataforge-vis` framework.
+The `demo` module contains several example projects (demonstrations) of using the `visionforge` framework.
 They are briefly described in this section, for more details please consult the corresponding per-project
 README file.
 

build.gradle.kts

@@ -22,12 +22,12 @@ allprojects {
     version = "0.1.4"
 }
 
-val githubProject by extra("dataforge-vis")
+val githubProject by extra("visionforge")
 val bintrayRepo by extra("dataforge")
 val fxVersion by extra("14")
 
 subprojects {
-    if(name.startsWith("dataforge")) {
+    if(name.startsWith("visionforge")) {
         apply(plugin = "scientifik.publish")
     }
     useSerialization()

dataforge-vis-jsroot/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 val kotlinVersion: String by rootProject.extra
 
 dependencies {
-    implementation(project(":dataforge-vis-spatial-js"))
+    implementation(project(":visionforge-spatial-js"))
     testCompile(kotlin("test-js"))
 }
 

dataforge-vis-jsroot/src/main/web/index.html

@@ -6,7 +6,7 @@
     <title>Three js demo for particle physics</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
           integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script type="text/javascript" src="dataforge-vis-spatial-gdml-0.1.0-dev.js"></script>
+    <script type="text/javascript" src="visionforge-spatial-gdml-0.1.0-dev.js"></script>
 </head>
 <body class="application">
 <div class="container" id="drop_zone" data-toggle="tooltip" data-placement="right"

demo/gdml/build.gradle.kts

@@ -23,8 +23,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(project(":dataforge-vis-spatial"))
+                implementation(project(":visionforge-spatial"))
-                implementation(project(":dataforge-vis-spatial-gdml"))
+                implementation(project(":visionforge-gdml"))
             }
         }
         jsMain{

demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/cubes.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import scientifik.gdml.*
 

demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/spatial/gdml/GDMLVisualTest.kt

@@ -1,11 +1,11 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
 import hep.dataforge.meta.setItem
 import hep.dataforge.meta.string
 import hep.dataforge.names.toName
 import hep.dataforge.values.asValue
-import hep.dataforge.vis.spatial.Material3D
+import hep.dataforge.vision.spatial.Material3D
-import hep.dataforge.vis.spatial.gdml.demo.cubes
+import hep.dataforge.vision.spatial.gdml.demo.cubes
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLAppComponent.kt

@@ -1,23 +1,23 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import hep.dataforge.context.Context
 import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
-import hep.dataforge.vis.VisualGroup
+import hep.dataforge.vision.VisualGroup
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.bootstrap.*
+import hep.dataforge.vision.bootstrap.*
-import hep.dataforge.vis.react.component
+import hep.dataforge.vision.react.component
-import hep.dataforge.vis.react.configEditor
+import hep.dataforge.vision.react.configEditor
-import hep.dataforge.vis.react.flexColumn
+import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vis.react.state
+import hep.dataforge.vision.react.state
-import hep.dataforge.vis.spatial.VisualGroup3D
+import hep.dataforge.vision.spatial.VisualGroup3D
-import hep.dataforge.vis.spatial.VisualObject3D
+import hep.dataforge.vision.spatial.VisualObject3D
-import hep.dataforge.vis.spatial.gdml.toVisual
+import hep.dataforge.vision.spatial.gdml.toVisual
-import hep.dataforge.vis.spatial.specifications.Camera
+import hep.dataforge.vision.spatial.specifications.Camera
-import hep.dataforge.vis.spatial.specifications.Canvas
+import hep.dataforge.vision.spatial.specifications.Canvas3DOptions
-import hep.dataforge.vis.spatial.three.ThreeCanvas
+import hep.dataforge.vision.spatial.three.ThreeCanvas
-import hep.dataforge.vis.spatial.three.ThreeCanvasComponent
+import hep.dataforge.vision.spatial.three.ThreeCanvasComponent
-import hep.dataforge.vis.spatial.three.canvasControls
+import hep.dataforge.vision.spatial.three.canvasControls
 import kotlinx.css.FlexBasis
 import kotlinx.css.Overflow
 import kotlinx.css.flex
@@ -39,7 +39,7 @@ interface GDMLAppProps : RProps {
     var selected: Name?
 }
 
-private val canvasConfig = Canvas {
+private val canvasConfig = Canvas3DOptions {
     camera = Camera {
         distance = 2100.0
         latitude = PI / 6

demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt

@@ -1,12 +1,12 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY
+import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY
-import hep.dataforge.vis.spatial.gdml.GDMLTransformer
+import hep.dataforge.vision.spatial.gdml.GDMLTransformer
-import hep.dataforge.vis.spatial.gdml.LUnit
+import hep.dataforge.vision.spatial.gdml.LUnit
-import hep.dataforge.vis.spatial.gdml.toVisual
+import hep.dataforge.vision.spatial.gdml.toVisual
 import kotlinx.css.*
 import react.child
 import react.dom.render

demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/fileDrop.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import drop.FileDrop
 import kotlinx.css.*

demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import hep.dataforge.context.Global
-import hep.dataforge.vis.editor.VisualObjectEditorFragment
+import hep.dataforge.vision.editor.VisualObjectEditorFragment
-import hep.dataforge.vis.editor.VisualObjectTreeFragment
+import hep.dataforge.vision.editor.VisualObjectTreeFragment
-import hep.dataforge.vis.spatial.Material3D
+import hep.dataforge.vision.spatial.Material3D
-import hep.dataforge.vis.spatial.Visual3D
+import hep.dataforge.vision.spatial.Visual3D
-import hep.dataforge.vis.spatial.fx.FX3DPlugin
+import hep.dataforge.vision.spatial.fx.FX3DPlugin
-import hep.dataforge.vis.spatial.fx.FXCanvas3D
+import hep.dataforge.vision.spatial.fx.FXCanvas3D
-import hep.dataforge.vis.spatial.gdml.toVisual
+import hep.dataforge.vision.spatial.gdml.toVisual
 import javafx.geometry.Orientation
 import javafx.scene.Parent
 import javafx.stage.FileChooser

demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/readFile.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
 import hep.dataforge.meta.setItem
 import hep.dataforge.values.asValue
-import hep.dataforge.vis.spatial.Material3D
+import hep.dataforge.vision.spatial.Material3D
-import hep.dataforge.vis.spatial.Visual3D
+import hep.dataforge.vision.spatial.Visual3D
-import hep.dataforge.vis.spatial.VisualGroup3D
+import hep.dataforge.vision.spatial.VisualGroup3D
-import hep.dataforge.vis.spatial.gdml.LUnit
+import hep.dataforge.vision.spatial.gdml.LUnit
-import hep.dataforge.vis.spatial.gdml.readFile
+import hep.dataforge.vision.spatial.gdml.readFile
-import hep.dataforge.vis.spatial.gdml.toVisual
+import hep.dataforge.vision.spatial.gdml.toVisual
 import scientifik.gdml.GDML
 import java.io.File
 import java.util.zip.GZIPInputStream

demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/saveToJson.kt

@@ -1,9 +1,9 @@
-package hep.dataforge.vis.spatial.gdml.demo
+package hep.dataforge.vision.spatial.gdml.demo
 
-import hep.dataforge.vis.spatial.gdml.LUnit
+import hep.dataforge.vision.spatial.gdml.LUnit
-import hep.dataforge.vis.spatial.gdml.readFile
+import hep.dataforge.vision.spatial.gdml.readFile
-import hep.dataforge.vis.spatial.gdml.toVisual
+import hep.dataforge.vision.spatial.gdml.toVisual
-import hep.dataforge.vis.spatial.stringify
+import hep.dataforge.vision.spatial.stringify
 import scientifik.gdml.GDML
 import java.io.File
 import java.nio.file.Paths
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
     val outputFileName = args.getOrNull(1)?:inputFileName.replace(".gdml",".json")
 
     val gdml = GDML.readFile(Paths.get(inputFileName))
-        //GDML.readFile(Paths.get("D:\\Work\\Projects\\dataforge-vis\\dataforge-vis-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
+        //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
 
     val visual = gdml.toVisual {
         lUnit = LUnit.CM

demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.names.asName
 import org.junit.jupiter.api.Test

demo/muon-monitor/README.md

@@ -1,7 +1,7 @@
 
 ### Muon Monitor Visualization
 
-This directory contains a full-stack application example built with `dataforge-vis`.
+This directory contains a full-stack application example built with `visionforge`.
 It is visualizing the 
 [Muon Monitor](http://npm.mipt.ru/projects/physics.html#mounMonitor) experiment set-up,
 including experiment's geometry and events (particle tracks).

demo/muon-monitor/build.gradle.kts

@@ -43,7 +43,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(project(":dataforge-vis-spatial"))
+                implementation(project(":visionforge-spatial"))
             }
         }
         jvmMain {

demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt

@@ -1,8 +1,8 @@
 @file:UseSerializers(Point3DSerializer::class)
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vis.spatial.Point3D
+import hep.dataforge.vision.spatial.Point3D
-import hep.dataforge.vis.spatial.Point3DSerializer
+import hep.dataforge.vision.spatial.Point3DSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 

demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt

@@ -1,7 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vis.removeAll
+import hep.dataforge.vision.removeAll
-import hep.dataforge.vis.spatial.*
+import hep.dataforge.vision.spatial.*
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.UPPER_LAYER_Z
@@ -16,7 +16,7 @@ class Model {
             position = Point3D(pixel.center.x, pixel.center.y, pixel.center.z)
             box(pixel.xSize, pixel.ySize, pixel.zSize)
             label(pixel.name) {
-                z = - Monitor.PIXEL_Z_SIZE / 2 - 5
+                z = -Monitor.PIXEL_Z_SIZE / 2 - 5
                 rotationY = PI
             }
         }
@@ -74,7 +74,7 @@ class Model {
             highlight(it)
         }
         event.track?.let {
-            tracks.polyline(*it.toTypedArray(), name = "track[${event.id}]"){
+            tracks.polyline(*it.toTypedArray(), name = "track[${event.id}]") {
                 thickness = 4
             }
         }

demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt

@@ -1,7 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vis.spatial.Point3D
+import hep.dataforge.vision.spatial.Point3D
-import hep.dataforge.vis.spatial.plus
+import hep.dataforge.vision.spatial.plus
 import ru.mipt.npm.muon.monitor.Monitor.PIXEL_XY_SIZE
 import ru.mipt.npm.muon.monitor.Monitor.PIXEL_Z_SIZE
 

demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt

@@ -4,17 +4,17 @@ import hep.dataforge.context.Context
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.bootstrap.card
+import hep.dataforge.vision.bootstrap.card
-import hep.dataforge.vis.bootstrap.objectTree
+import hep.dataforge.vision.bootstrap.objectTree
-import hep.dataforge.vis.react.component
+import hep.dataforge.vision.react.component
-import hep.dataforge.vis.react.configEditor
+import hep.dataforge.vision.react.configEditor
-import hep.dataforge.vis.react.state
+import hep.dataforge.vision.react.state
-import hep.dataforge.vis.spatial.specifications.Camera
+import hep.dataforge.vision.spatial.specifications.Camera
-import hep.dataforge.vis.spatial.specifications.Canvas
+import hep.dataforge.vision.spatial.specifications.Canvas3DOptions
-import hep.dataforge.vis.spatial.three.ThreeCanvas
+import hep.dataforge.vision.spatial.three.ThreeCanvas
-import hep.dataforge.vis.spatial.three.ThreeCanvasComponent
+import hep.dataforge.vision.spatial.three.ThreeCanvasComponent
-import hep.dataforge.vis.spatial.three.canvasControls
+import hep.dataforge.vision.spatial.three.canvasControls
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
@@ -31,7 +31,7 @@ interface MMAppProps : RProps {
     var selected: Name?
 }
 
-private val canvasConfig = Canvas {
+private val canvasConfig = Canvas3DOptions {
     camera = Camera {
         distance = 2100.0
         latitude = PI / 6

demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt

@@ -3,7 +3,7 @@ package ru.mipt.npm.muon.monitor
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.vis.spatial.Visual3D
+import hep.dataforge.vision.spatial.Visual3D
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer

demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt

@@ -1,7 +1,7 @@
 package ru.mipt.npm.muon.monitor.server
 
 
-import hep.dataforge.vis.spatial.Visual3D
+import hep.dataforge.vision.spatial.Visual3D
 import io.ktor.application.Application
 import io.ktor.application.call
 import io.ktor.application.install

demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt

@@ -1,6 +1,6 @@
 package ru.mipt.npm.muon.monitor.sim
 
-import hep.dataforge.vis.spatial.Point3D
+import hep.dataforge.vision.spatial.Point3D
 import org.apache.commons.math3.geometry.euclidean.threed.Line
 import org.apache.commons.math3.geometry.euclidean.threed.Plane
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D

demo/spatial-showcase/build.gradle.kts

@@ -1,4 +1,6 @@
-import scientifik.*
+import scientifik.DependencyConfiguration
+import scientifik.FXModule
+import scientifik.useFx
 
 plugins {
     id("scientifik.mpp")
@@ -17,8 +19,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":dataforge-vis-spatial"))
+                api(project(":visionforge-spatial"))
-                api(project(":dataforge-vis-spatial-gdml"))
+                api(project(":visionforge-gdml"))
             }
         }
     }

demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.invoke
 import hep.dataforge.names.toName
 import hep.dataforge.output.OutputManager
-import hep.dataforge.vis.Colors
+import hep.dataforge.vision.Colors
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.spatial.*
+import hep.dataforge.vision.spatial.*
-import hep.dataforge.vis.spatial.specifications.Canvas
+import hep.dataforge.vision.spatial.specifications.Canvas3DOptions
 import kotlinx.coroutines.*
 import kotlin.math.PI
 import kotlin.math.cos
@@ -20,10 +20,10 @@ fun OutputManager.demo(name: String, title: String = name, block: VisualGroup3D.
         "title" put title
     }
     val output = get(VisualObject::class, name.toName(), meta = meta)
-    output.render(action = block)
+    output.render (action = block)
 }
 
-val canvasOptions = Canvas {
+val canvasOptions = Canvas3DOptions {
     minSize = 500
     axes {
         size = 500.0

demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication

demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.meta.Meta
@@ -7,10 +7,10 @@ import hep.dataforge.meta.string
 import hep.dataforge.names.Name
 import hep.dataforge.output.OutputManager
 import hep.dataforge.output.Renderer
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.spatial.three.ThreeCanvas
+import hep.dataforge.vision.spatial.three.ThreeCanvas
-import hep.dataforge.vis.spatial.three.ThreePlugin
+import hep.dataforge.vision.spatial.three.ThreePlugin
-import hep.dataforge.vis.spatial.three.output
+import hep.dataforge.vision.spatial.three.output
 import kotlinx.html.dom.append
 import kotlinx.html.dom.create
 import kotlinx.html.h2

demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt

@@ -1,6 +1,6 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
 import hep.dataforge.meta.int
 import hep.dataforge.meta.number
@@ -8,13 +8,13 @@ import hep.dataforge.meta.setItem
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
-import hep.dataforge.vis.getProperty
+import hep.dataforge.vision.getProperty
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
-import hep.dataforge.vis.spatial.*
+import hep.dataforge.vision.spatial.*
-import hep.dataforge.vis.spatial.VisualObject3D.Companion.GEOMETRY_KEY
+import hep.dataforge.vision.spatial.VisualObject3D.Companion.GEOMETRY_KEY
-import hep.dataforge.vis.spatial.demo.VariableBoxThreeFactory.Z_SIZE_KEY
+import hep.dataforge.vision.spatial.demo.VariableBoxThreeFactory.Z_SIZE_KEY
-import hep.dataforge.vis.spatial.three.*
+import hep.dataforge.vision.spatial.three.*
-import hep.dataforge.vis.spatial.three.ThreeMaterials.getMaterial
+import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry

demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt

@@ -1,6 +1,6 @@
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
-import hep.dataforge.vis.spatial.gdml.gdml
+import hep.dataforge.vision.spatial.gdml.gdml
 import javafx.stage.Stage
 import tornadofx.*
 import java.nio.file.Paths

demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt

@@ -1,16 +1,13 @@
-package hep.dataforge.vis.spatial.demo
+package hep.dataforge.vision.spatial.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.meta.Meta
-import hep.dataforge.meta.buildMeta
 import hep.dataforge.names.Name
 import hep.dataforge.output.OutputManager
 import hep.dataforge.output.Renderer
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.spatial.fx.FX3DPlugin
+import hep.dataforge.vision.spatial.fx.FX3DPlugin
-import hep.dataforge.vis.spatial.fx.FXCanvas3D
+import hep.dataforge.vision.spatial.fx.FXCanvas3D
-import hep.dataforge.vis.spatial.specifications.Axes as AxesSpec
-import hep.dataforge.vis.spatial.specifications.Canvas as CanvasSpec
 import javafx.collections.FXCollections
 import javafx.scene.Parent
 import javafx.scene.control.Tab

playground/build.gradle.kts

@@ -19,8 +19,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":dataforge-vis-spatial"))
+                api(project(":visionforge-spatial"))
-                api(project(":dataforge-vis-spatial-gdml"))
+                api(project(":visionforge-gdml"))
                 api(project(":ui:bootstrap"))
             }
         }

playground/src/jsMain/kotlin/PlayGroundApp.kt

@@ -2,14 +2,14 @@ import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
 import hep.dataforge.names.Name
-import hep.dataforge.vis.bootstrap.objectTree
+import hep.dataforge.vision.bootstrap.objectTree
-import hep.dataforge.vis.bootstrap.visualPropertyEditor
+import hep.dataforge.vision.bootstrap.visualPropertyEditor
-import hep.dataforge.vis.spatial.Point3D
+import hep.dataforge.vision.spatial.Point3D
-import hep.dataforge.vis.spatial.VisualGroup3D
+import hep.dataforge.vision.spatial.VisualGroup3D
-import hep.dataforge.vis.spatial.box
+import hep.dataforge.vision.spatial.box
-import hep.dataforge.vis.spatial.group
+import hep.dataforge.vision.spatial.group
-import hep.dataforge.vis.spatial.three.ThreePlugin
+import hep.dataforge.vision.spatial.three.ThreePlugin
-import hep.dataforge.vis.spatial.three.threeCanvas
+import hep.dataforge.vision.spatial.three.threeCanvas
 import org.w3c.dom.HTMLElement
 import react.dom.div
 import react.dom.render

settings.gradle.kts

@@ -32,7 +32,7 @@ pluginManagement {
 
 //enableFeaturePreview("GRADLE_METADATA")
 
-rootProject.name = "dataforge-vis"
+rootProject.name = "visionforge"
 
 include(
     ":ui",
@@ -40,9 +40,9 @@ include(
     ":ui:ring",
     ":ui:material",
     ":ui:bootstrap",
-    ":dataforge-vis-common",
+    ":visionforge-common",
-    ":dataforge-vis-spatial",
+    ":visionforge-spatial",
-    ":dataforge-vis-spatial-gdml",
+    ":visionforge-gdml",
     ":demo:spatial-showcase",
     ":demo:gdml",
     ":demo:muon-monitor",

ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.bootstrap
+package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaItem

ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.bootstrap
+package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
-import hep.dataforge.vis.VisualGroup
+import hep.dataforge.vision.VisualGroup
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.isEmpty
+import hep.dataforge.vision.isEmpty
-import hep.dataforge.vis.react.RFBuilder
+import hep.dataforge.vision.react.RFBuilder
-import hep.dataforge.vis.react.component
+import hep.dataforge.vision.react.component
 import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.Element

ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.bootstrap
+package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken

ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt

@@ -1,11 +1,11 @@
-package hep.dataforge.vis.bootstrap
+package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.react.configEditor
+import hep.dataforge.vision.react.configEditor
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.li

ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt

@@ -1,9 +1,4 @@
-package hep.dataforge.vis.material
+package hep.dataforge.vision.material
-
-import react.Component
-import react.RClass
-import react.RProps
-import react.RState
 
 //@JsModule("@material-ui/icons/ExpandMore")
 //external class ExpandMoreIcon : Component<RProps, RState>{

ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt

@@ -1,7 +1,7 @@
-package hep.dataforge.vis.material
+package hep.dataforge.vision.material
 
-import hep.dataforge.vis.react.component
+import hep.dataforge.vision.react.component
-import hep.dataforge.vis.react.state
+import hep.dataforge.vision.react.state
 import kotlinx.html.DIV
 import materialui.components.card.card
 import materialui.components.cardcontent.cardContent
@@ -16,7 +16,6 @@ import materialui.components.grid.enums.GridDirection
 import materialui.components.grid.enums.GridStyle
 import materialui.components.grid.grid
 import materialui.components.paper.paper
-import materialui.components.typography.typographyH3
 import materialui.components.typography.typographyH5
 import react.RBuilder
 import react.RProps

ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.material
+package hep.dataforge.vision.material
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
-import hep.dataforge.vis.VisualGroup
+import hep.dataforge.vision.VisualGroup
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.isEmpty
+import hep.dataforge.vision.isEmpty
-import hep.dataforge.vis.react.component
+import hep.dataforge.vision.react.component
-import hep.dataforge.vis.react.state
+import hep.dataforge.vision.react.state
 import kotlinx.html.UL
 import materialui.lab.components.treeItem.treeItem
 import materialui.lab.components.treeView.SingleSelectTreeViewElementBuilder

ui/react/build.gradle.kts

@@ -10,7 +10,7 @@ kotlin {
 
 
 dependencies{
-    api(project(":dataforge-vis-common"))
+    api(project(":visionforge-common"))
 
     //api("org.jetbrains:kotlin-react:16.13.1-pre.104-kotlin-1.3.72")
     api("org.jetbrains:kotlin-react-dom:16.13.1-pre.104-kotlin-1.3.72")

ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import kotlinx.css.*
 import kotlinx.css.properties.deg

ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.*

ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import kotlinx.css.Display
 import kotlinx.css.FlexDirection

ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import react.*
 import kotlin.properties.ReadWriteProperty

ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import styled.StyleSheet
 

ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt

@@ -1,11 +1,11 @@
-package hep.dataforge.vis.react
+package hep.dataforge.vision.react
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.ValueDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.values.*
-import hep.dataforge.vis.Colors
+import hep.dataforge.vision.Colors
-import hep.dataforge.vis.widgetType
+import hep.dataforge.vision.widgetType
 import kotlinx.css.Align
 import kotlinx.css.alignSelf
 import kotlinx.html.InputType

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualGroup.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.names.Name

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualObject.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
@@ -6,7 +6,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.Value
 import hep.dataforge.values.ValueType
-import hep.dataforge.vis.VisualObject.Companion.STYLE_KEY
+import hep.dataforge.vision.VisualObject.Companion.STYLE_KEY
 import kotlinx.serialization.Transient
 
 internal data class PropertyListener(

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaItem

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisualGroup.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.Config
 import hep.dataforge.names.NameToken

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt

@@ -1,6 +1,6 @@
 @file:UseSerializers(MetaSerializer::class)
 
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Visual.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualGroup.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.names.*
 import hep.dataforge.provider.Provider

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualObject.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.Configurable
 import hep.dataforge.meta.Laminate
@@ -8,7 +8,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
-import hep.dataforge.vis.VisualObject.Companion.TYPE
+import hep.dataforge.vision.VisualObject.Companion.TYPE
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
 

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/misc.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.meta.Laminate
 import hep.dataforge.meta.MetaItem

visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt

@@ -1,11 +1,12 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.meta.descriptors.attributes
 import hep.dataforge.meta.descriptors.setAttribute
+import hep.dataforge.meta.get
+import hep.dataforge.meta.node
+import hep.dataforge.meta.string
 import hep.dataforge.names.toName
-import hep.dataforge.values.asValue
 
 /**
  * Extension property to access the "widget" key of [ValueDescriptor]

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis
+package hep.dataforge.vision
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.get

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView
@@ -11,7 +11,7 @@ import hep.dataforge.context.Global
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.NameToken
-import hep.dataforge.vis.dfIconView
+import hep.dataforge.vision.dfIconView
 import javafx.scene.Node
 import javafx.scene.control.*
 import javafx.scene.control.cell.TextFieldTreeTableCell

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.ItemDescriptor

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt

@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.vis.dfIconView
+import hep.dataforge.vision.dfIconView
 import javafx.beans.property.SimpleStringProperty
 import javafx.scene.control.TreeItem
 import javafx.scene.control.TreeSortMode

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.values.Value
 

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.Named
@@ -14,8 +14,8 @@ import hep.dataforge.provider.Type
 import hep.dataforge.provider.provideByType
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
-import hep.dataforge.vis.widget
+import hep.dataforge.vision.widget
-import hep.dataforge.vis.widgetType
+import hep.dataforge.vision.widgetType
 import javafx.beans.property.ObjectProperty
 import javafx.beans.value.ObservableValue
 import javafx.scene.Node

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.descriptors.ValueDescriptor
 import hep.dataforge.values.Null

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt

@@ -1,11 +1,11 @@
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.update
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
-import hep.dataforge.vis.findStyle
+import hep.dataforge.vision.findStyle
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node

visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt

@@ -1,7 +1,7 @@
-package hep.dataforge.vis.editor
+package hep.dataforge.vision.editor
 
-import hep.dataforge.vis.VisualGroup
+import hep.dataforge.vision.VisualGroup
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.control.SelectionMode
 import javafx.scene.control.TreeItem

visionforge-common/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt

@@ -1,12 +1,12 @@
-package hep.dataforge.vis.demo
+package hep.dataforge.vision.demo
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.asConfig
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.values.ValueType
-import hep.dataforge.vis.editor.ConfigEditor
+import hep.dataforge.vision.editor.ConfigEditor
-import hep.dataforge.vis.editor.FXMeta
+import hep.dataforge.vision.editor.FXMeta
-import hep.dataforge.vis.editor.MetaViewer
+import hep.dataforge.vision.editor.MetaViewer
 import javafx.geometry.Orientation
 import tornadofx.*
 

visionforge-gdml/build.gradle.kts

@@ -6,7 +6,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":dataforge-vis-spatial"))
+                api(project(":visionforge-spatial"))
                 api("scientifik:gdml:0.1.8")
             }
         }

visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt

@@ -1,13 +1,13 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
-import hep.dataforge.vis.spatial.*
+import hep.dataforge.vision.spatial.*
-import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY
+import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_COLOR_KEY
-import hep.dataforge.vis.useStyle
+import hep.dataforge.vision.useStyle
 import scientifik.gdml.*
 import kotlin.random.Random
 

visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
 import scientifik.gdml.AUnit
 import scientifik.gdml.GDMLPosition

visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDML.kt

@@ -1,14 +1,14 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import hep.dataforge.vis.get
+import hep.dataforge.vision.get
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
-import hep.dataforge.vis.spatial.*
+import hep.dataforge.vision.spatial.*
-import hep.dataforge.vis.spatial.World.ONE
+import hep.dataforge.vision.spatial.World.ONE
-import hep.dataforge.vis.spatial.World.ZERO
+import hep.dataforge.vision.spatial.World.ZERO
 import scientifik.gdml.*
 import kotlin.math.cos
 import kotlin.math.sin

visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt

@@ -1,6 +1,6 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
-import hep.dataforge.vis.spatial.VisualGroup3D
+import hep.dataforge.vision.spatial.VisualGroup3D
 import nl.adaptivity.xmlutil.StAXReader
 import scientifik.gdml.GDML
 import java.nio.file.Files

visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt

@@ -1,6 +1,6 @@
-package hep.dataforge.vis.spatial.gdml
+package hep.dataforge.vision.spatial.gdml
 
-import hep.dataforge.vis.spatial.stringify
+import hep.dataforge.vision.spatial.stringify
 import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
 import scientifik.gdml.GDML

visionforge-spatial/build.gradle.kts

@@ -1,4 +1,4 @@
-import scientifik.*
+import scientifik.useSerialization
 
 plugins {
     id("scientifik.mpp")
@@ -14,7 +14,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":dataforge-vis-common"))
+                api(project(":visionforge-common"))
             }
         }
         jvmMain {

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt

@@ -1,13 +1,13 @@
 @file:UseSerializers(Point3DSerializer::class)
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.context.Context
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.float
 import hep.dataforge.meta.get
-import hep.dataforge.vis.*
+import hep.dataforge.vision.*
-import hep.dataforge.vis.spatial.Box.Companion.TYPE_NAME
+import hep.dataforge.vision.spatial.Box.Companion.TYPE_NAME
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt

@@ -1,11 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
-import hep.dataforge.vis.*
+import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt

@@ -1,11 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt

@@ -1,11 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt

@@ -1,10 +1,10 @@
 @file:UseSerializers(Point2DSerializer::class, Point3DSerializer::class)
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Meta
 

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt

@@ -1,11 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
@@ -7,11 +7,11 @@ import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
-import hep.dataforge.vis.Colors
+import hep.dataforge.vision.Colors
-import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY
+import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_COLOR_KEY
-import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY
+import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_KEY
-import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY
+import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY
-import hep.dataforge.vis.widgetType
+import hep.dataforge.vision.widgetType
 
 class Material3D : Scheme() {
 

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt

@@ -1,14 +1,14 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.number
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt

@@ -1,6 +1,6 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.Laminate
@@ -8,13 +8,11 @@ import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.get
 import hep.dataforge.names.*
-import hep.dataforge.vis.*
+import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.UseSerializers
-import kotlin.collections.component1
-import kotlin.collections.component2
 import kotlin.collections.set
 
 /**
@@ -200,6 +198,6 @@ fun VisualGroup3D.proxyGroup(
     templateName: Name = name.toName(),
     block: MutableVisualGroup.() -> Unit
 ): Proxy {
-    val group = VisualGroup3D().apply(block)
+    val group = VisualGroup3D().apply (block)
     return proxy(name, group, templateName)
 }

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt

@@ -1,11 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
 
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt

@@ -1,10 +1,11 @@
 @file:UseSerializers(Point3DSerializer::class)
-package hep.dataforge.vis.spatial
+
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.meta.Config
-import hep.dataforge.vis.AbstractVisualObject
+import hep.dataforge.vision.AbstractVisualObject
-import hep.dataforge.vis.MutableVisualGroup
+import hep.dataforge.vision.MutableVisualGroup
-import hep.dataforge.vis.set
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -53,8 +54,8 @@ class Tube(
         geometryBuilder.apply {
 
             //creating shape in x-y plane with z = 0
-            val bottomOuterPoints = shape(radius, -height/2)
+            val bottomOuterPoints = shape(radius, -height / 2)
-            val upperOuterPoints = shape(radius, height/2)
+            val upperOuterPoints = shape(radius, height / 2)
             //outer face
             (1 until segments).forEach {
                 face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], upperOuterPoints[it], upperOuterPoints[it - 1])
@@ -78,8 +79,8 @@ class Tube(
                     face4(zeroTop, zeroBottom, bottomOuterPoints.last(), upperOuterPoints.last())
                 }
             } else {
-                val bottomInnerPoints = shape(innerRadius, -height/2)
+                val bottomInnerPoints = shape(innerRadius, -height / 2)
-                val upperInnerPoints = shape(innerRadius, height/2)
+                val upperInnerPoints = shape(innerRadius, height / 2)
                 //outer face
                 (1 until segments).forEach {
                     // inner surface

visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Visual3D.kt

@@ -1,4 +1,4 @@
-package hep.dataforge.vis.spatial
+package hep.dataforge.vision.spatial
 
 import hep.dataforge.context.AbstractPlugin
 import hep.dataforge.context.Context
@@ -7,9 +7,9 @@ import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
-import hep.dataforge.vis.SimpleVisualGroup
+import hep.dataforge.vision.SimpleVisualGroup
-import hep.dataforge.vis.Visual
+import hep.dataforge.vision.Visual
-import hep.dataforge.vis.VisualObject
+import hep.dataforge.vision.VisualObject
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration