From 150fdb24269028740bdda27a673b397b4532ac86 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 19 Mar 2020 14:15:36 +0300 Subject: [PATCH] package name refactoring --- .../vis/{common => }/AbstractVisualGroup.kt | 12 +++++++++--- .../vis/{common => }/AbstractVisualObject.kt | 4 ++-- .../kotlin/hep/dataforge/vis/{common => }/Colors.kt | 2 +- .../hep/dataforge/vis/{common => }/StyleSheet.kt | 2 +- .../kotlin/hep/dataforge/vis/{common => }/Visual.kt | 5 +++-- .../hep/dataforge/vis/{common => }/VisualGroup.kt | 5 +++-- .../hep/dataforge/vis/{common => }/VisualObject.kt | 4 ++-- .../vis/{common => }/VisualObjectDelegate.kt | 6 +++--- .../hep/dataforge/vis/{common => }/valueWidget.kt | 2 +- .../hep/dataforge/vis/{js => }/editor/bootstrap.kt | 2 +- .../hep/dataforge/vis/{js => }/editor/jsTree.kt | 8 ++++---- .../hep/dataforge/vis/{js => }/editor/jsoneditor.kt | 2 +- .../dataforge/vis/{js => }/editor/propertyEditor.kt | 6 +++--- .../kotlin/hep/dataforge/vis/{fx => }/FXPlugin.kt | 5 +++-- .../vis/{fx => }/editor/ColorValueChooser.kt | 2 +- .../vis/{fx => }/editor/ComboBoxValueChooser.kt | 2 +- .../dataforge/vis/{fx => }/editor/ConfigEditor.kt | 10 +++++++--- .../hep/dataforge/vis/{fx => }/editor/FXMeta.kt | 2 +- .../hep/dataforge/vis/{fx => }/editor/MetaViewer.kt | 13 +++++++++---- .../vis/{fx => }/editor/TextValueChooser.kt | 2 +- .../dataforge/vis/{fx => }/editor/ValueCallback.kt | 2 +- .../dataforge/vis/{fx => }/editor/ValueChooser.kt | 6 +++--- .../vis/{fx => }/editor/ValueChooserBase.kt | 2 +- .../{fx => }/editor/VisualObjectEditorFragment.kt | 6 +++--- .../vis/{fx => }/editor/VisualObjectTreeFragment.kt | 6 +++--- .../dataforge/vis/{fx => }/demo/MetaEditorDemo.kt | 12 +++++++----- .../dataforge/vis/spatial/gdml/GDMLTransformer.kt | 2 +- .../hep/dataforge/vis/spatial/gdml/visualGDML.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Box.kt | 8 ++++---- .../kotlin/hep/dataforge/vis/spatial/Composite.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/ConeSegment.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Convex.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Extruded.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Label3D.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Material3D.kt | 2 +- .../kotlin/hep/dataforge/vis/spatial/PolyLine.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Proxy.kt | 11 ++++++++--- .../kotlin/hep/dataforge/vis/spatial/Sphere.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Tube.kt | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/Visual3D.kt | 4 ++-- .../hep/dataforge/vis/spatial/VisualGroup3D.kt | 8 ++++---- .../hep/dataforge/vis/spatial/VisualObject3D.kt | 2 +- .../vis/spatial/transform/RemoveSingleChild.kt | 6 +++--- .../hep/dataforge/vis/spatial/transform/UnRef.kt | 4 ++-- .../vis/spatial/transform/VisualTreeTransform.kt | 2 +- .../kotlin/hep/dataforge/vis/spatial/GroupTest.kt | 4 ++-- .../hep/dataforge/vis/spatial/PropertyTest.kt | 2 +- .../hep/dataforge/vis/spatial/three/ThreeCanvas.kt | 2 +- .../hep/dataforge/vis/spatial/three/ThreeFactory.kt | 2 +- .../dataforge/vis/spatial/three/ThreeMaterials.kt | 4 ++-- .../hep/dataforge/vis/spatial/three/ThreePlugin.kt | 2 +- .../vis/spatial/three/ThreeVisualObject.kt | 2 +- .../hep/dataforge/vis/spatial/three/outputConfig.kt | 2 +- .../hep/dataforge/vis/spatial/fx/FXMaterials.kt | 2 +- .../hep/dataforge/vis/spatial/fx/FXProxyFactory.kt | 2 +- .../vis/spatial/fx/VisualObjectFXBinding.kt | 2 +- .../dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt | 8 ++++---- .../dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt | 4 ++-- .../kotlin/ru/mipt/npm/muon/monitor/Model.kt | 2 +- .../kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt | 10 +++++----- .../kotlin/hep/dataforge/vis/spatial/demo/demo.kt | 4 ++-- .../hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt | 2 +- .../hep/dataforge/vis/spatial/demo/VariableBox.kt | 4 ++-- .../hep/dataforge/vis/spatial/demo/FXDemoGrid.kt | 2 +- 64 files changed, 151 insertions(+), 126 deletions(-) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/AbstractVisualGroup.kt (92%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/AbstractVisualObject.kt (96%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/Colors.kt (99%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/StyleSheet.kt (98%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/Visual.kt (95%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/VisualGroup.kt (95%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/VisualObject.kt (97%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/VisualObjectDelegate.kt (98%) rename dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/{common => }/valueWidget.kt (93%) rename dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/{js => }/editor/bootstrap.kt (98%) rename dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/{js => }/editor/jsTree.kt (93%) rename dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/{js => }/editor/jsoneditor.kt (99%) rename dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/{js => }/editor/propertyEditor.kt (94%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/FXPlugin.kt (98%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ColorValueChooser.kt (97%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ComboBoxValueChooser.kt (98%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ConfigEditor.kt (96%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/FXMeta.kt (99%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/MetaViewer.kt (91%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/TextValueChooser.kt (98%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ValueCallback.kt (94%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ValueChooser.kt (97%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/ValueChooserBase.kt (98%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/VisualObjectEditorFragment.kt (95%) rename dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/{fx => }/editor/VisualObjectTreeFragment.kt (93%) rename dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/{fx => }/demo/MetaEditorDemo.kt (85%) diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualGroup.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt similarity index 92% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualGroup.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt index a0af25b7..7ae5fb44 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualGroup.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.MetaItem import hep.dataforge.names.Name @@ -11,7 +11,8 @@ import kotlinx.serialization.Transient /** * Abstract implementation of mutable group of [VisualObject] */ -abstract class AbstractVisualGroup : AbstractVisualObject(), MutableVisualGroup { +abstract class AbstractVisualGroup : AbstractVisualObject(), + MutableVisualGroup { //protected abstract val _children: MutableMap @@ -37,7 +38,12 @@ abstract class AbstractVisualGroup : AbstractVisualObject(), MutableVisualGroup * Add listener for children change */ override fun onChildrenChange(owner: Any?, action: (Name, VisualObject?) -> Unit) { - structureChangeListeners.add(StructureChangeListeners(owner, action)) + structureChangeListeners.add( + StructureChangeListeners( + owner, + action + ) + ) } /** diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualObject.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt similarity index 96% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualObject.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt index 3c76a4cc..e13f6253 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualObject.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.common +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 -import hep.dataforge.vis.common.VisualObject.Companion.STYLE_KEY +import hep.dataforge.vis.VisualObject.Companion.STYLE_KEY import kotlinx.serialization.Transient internal data class PropertyListener( diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Colors.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt similarity index 99% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Colors.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt index 5681f572..b91dbcff 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Colors.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaItem diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/StyleSheet.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt similarity index 98% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/StyleSheet.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt index 365fff8e..be82d8c6 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/StyleSheet.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt @@ -1,6 +1,6 @@ @file:UseSerializers(MetaSerializer::class) -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.* import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Visual.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt similarity index 95% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Visual.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt index a469ac63..8aeb32a4 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/Visual.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.context.* import hep.dataforge.meta.Meta @@ -31,7 +31,8 @@ class Visual(meta: Meta) : AbstractPlugin(meta) { override val tag: PluginTag = PluginTag(name = "visual", group = PluginTag.DATAFORGE_GROUP) override val type: KClass = Visual::class - override fun invoke(meta: Meta, context: Context): Visual = Visual(meta) + override fun invoke(meta: Meta, context: Context): Visual = + Visual(meta) const val VISUAL_FACTORY_TYPE = "visual.factory" } diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualGroup.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt similarity index 95% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualGroup.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt index c3f497bd..d077a269 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualGroup.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.names.* import hep.dataforge.provider.Provider @@ -6,7 +6,8 @@ import hep.dataforge.provider.Provider /** * Represents a group of [VisualObject] instances */ -interface VisualGroup : Provider, Iterable, VisualObject { +interface VisualGroup : Provider, Iterable, + VisualObject { /** * A map of top level named children */ diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObject.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt similarity index 97% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObject.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt index 9e4cfd0b..8a67c524 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObject.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.Laminate import hep.dataforge.meta.Meta @@ -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.common.VisualObject.Companion.TYPE +import hep.dataforge.vis.VisualObject.Companion.TYPE import kotlinx.serialization.Transient //private fun Laminate.withTop(meta: Meta): Laminate = Laminate(listOf(meta) + layers) diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegate.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObjectDelegate.kt similarity index 98% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegate.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObjectDelegate.kt index ec16f977..d0798522 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegate.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObjectDelegate.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.* import hep.dataforge.names.Name @@ -105,8 +105,8 @@ fun VisualObject.int(default: Int, name: Name? = null, inherited: Boolean = fals inline fun > VisualObject.enum(default: E, name: Name? = null, inherited: Boolean = false) = - VisualObjectDelegateWrapper(this, name, default, inherited) { - item -> item.string?.let { enumValueOf(it) } + VisualObjectDelegateWrapper(this, name, default, inherited) { item -> + item.string?.let { enumValueOf(it) } } //merge properties diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/valueWidget.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt similarity index 93% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/valueWidget.kt rename to dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt index 8f3ade43..809ad4ed 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/valueWidget.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.common +package hep.dataforge.vis import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ValueDescriptor diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/bootstrap.kt b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/bootstrap.kt similarity index 98% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/bootstrap.kt rename to dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/bootstrap.kt index 171aa86d..f002e29c 100644 --- a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/bootstrap.kt +++ b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/bootstrap.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.js.editor +package hep.dataforge.vis.editor import kotlinx.html.* import kotlinx.html.js.div diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsTree.kt b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsTree.kt similarity index 93% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsTree.kt rename to dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsTree.kt index dde67544..393f1f58 100644 --- a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsTree.kt +++ b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsTree.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.js.editor +package hep.dataforge.vis.editor import hep.dataforge.names.Name import hep.dataforge.names.plus -import hep.dataforge.vis.common.VisualGroup -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.common.isEmpty +import hep.dataforge.vis.VisualGroup +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.isEmpty import kotlinx.html.TagConsumer import kotlinx.html.dom.append import kotlinx.html.js.* diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsoneditor.kt b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsoneditor.kt similarity index 99% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsoneditor.kt rename to dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsoneditor.kt index 8bfaf93a..800396cb 100644 --- a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/jsoneditor.kt +++ b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/jsoneditor.kt @@ -6,7 +6,7 @@ "EXTERNAL_DELEGATION" ) -package hep.dataforge.vis.js.editor +package hep.dataforge.vis.editor import org.w3c.dom.HTMLElement diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/propertyEditor.kt b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/propertyEditor.kt similarity index 94% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/propertyEditor.kt rename to dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/propertyEditor.kt index 19f715a0..3af199cf 100644 --- a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/js/editor/propertyEditor.kt +++ b/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/propertyEditor.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.js.editor +package hep.dataforge.vis.editor import hep.dataforge.js.jsObject import hep.dataforge.meta.DynamicMeta @@ -7,8 +7,8 @@ import hep.dataforge.meta.toJson import hep.dataforge.meta.update import hep.dataforge.names.Name import hep.dataforge.names.isEmpty -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.common.findStyle +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.findStyle import kotlinx.html.dom.append import kotlinx.html.js.* import org.w3c.dom.Element diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/FXPlugin.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/FXPlugin.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt index ffe2ef64..dcd5795c 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/FXPlugin.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.fx +package hep.dataforge.vis import hep.dataforge.context.* import hep.dataforge.meta.EmptyMeta @@ -96,7 +96,8 @@ class FXPlugin(meta: Meta = EmptyMeta) : AbstractPlugin(meta) { companion object : PluginFactory { override val type: KClass = FXPlugin::class override val tag: PluginTag = PluginTag("vis.fx", group = PluginTag.DATAFORGE_GROUP) - override fun invoke(meta: Meta, context: Context): FXPlugin = FXPlugin(meta) + override fun invoke(meta: Meta, context: Context): FXPlugin = + FXPlugin(meta) } } diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ColorValueChooser.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt similarity index 97% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ColorValueChooser.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt index 0dac4f8d..b130dc21 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ColorValueChooser.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.Meta import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ComboBoxValueChooser.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ComboBoxValueChooser.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ComboBoxValueChooser.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ComboBoxValueChooser.kt index a3643099..3b7bdc33 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ComboBoxValueChooser.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.Meta import hep.dataforge.meta.get diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ConfigEditor.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ConfigEditor.kt similarity index 96% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ConfigEditor.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ConfigEditor.kt index c04b0719..0b86456a 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ConfigEditor.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.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.fx.dfIconView +import hep.dataforge.vis.dfIconView import javafx.scene.Node import javafx.scene.control.* import javafx.scene.control.cell.TextFieldTreeTableCell @@ -128,7 +128,11 @@ class ConfigEditor( when (item) { is FXMetaValue -> { text = null - val chooser = ValueChooser.build(Global, item.valueProperty, item.descriptor) { + val chooser = ValueChooser.build( + Global, + item.valueProperty, + item.descriptor + ) { item.set(it) } graphic = chooser.node diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/FXMeta.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt similarity index 99% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/FXMeta.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt index 7a9395ee..10fe2ee3 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/FXMeta.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ItemDescriptor diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/MetaViewer.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt similarity index 91% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/MetaViewer.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt index 1120ebf4..c433aac6 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/MetaViewer.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt @@ -14,18 +14,23 @@ * limitations under the License. */ -package hep.dataforge.vis.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.Meta -import hep.dataforge.vis.fx.dfIconView +import hep.dataforge.vis.dfIconView import javafx.beans.property.SimpleStringProperty import javafx.scene.control.TreeItem import javafx.scene.control.TreeSortMode import javafx.scene.control.TreeTableView import tornadofx.* -class MetaViewer(val rootNode: FXMetaNode<*>, title: String = "Meta viewer") : Fragment(title, dfIconView) { - constructor(meta: Meta, title: String = "Meta viewer"): this(FXMeta.root(meta),title = title) +class MetaViewer(val rootNode: FXMetaNode<*>, title: String = "Meta viewer") : Fragment(title, + dfIconView +) { + constructor(meta: Meta, title: String = "Meta viewer"): this( + FXMeta.root( + meta + ),title = title) override val root = borderpane { center { diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/TextValueChooser.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/TextValueChooser.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/TextValueChooser.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/TextValueChooser.kt index 92e59acf..c1f611fb 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/TextValueChooser.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.Meta import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueCallback.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueCallback.kt similarity index 94% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueCallback.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueCallback.kt index bf7cdb7b..7989eaed 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueCallback.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.values.Value diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooser.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt similarity index 97% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooser.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt index 72128543..596c3b29 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooser.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.context.Context import hep.dataforge.context.Named @@ -15,8 +15,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.common.widget -import hep.dataforge.vis.common.widgetType +import hep.dataforge.vis.widget +import hep.dataforge.vis.widgetType import javafx.beans.property.ObjectProperty import javafx.beans.value.ObservableValue import javafx.scene.Node diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooserBase.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooserBase.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooserBase.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooserBase.kt index dc474cb5..9c415a43 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/ValueChooserBase.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/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.fx.editor +package hep.dataforge.vis.editor import hep.dataforge.meta.descriptors.ValueDescriptor import hep.dataforge.values.Null diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectEditorFragment.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt similarity index 95% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectEditorFragment.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt index 05d9315c..43cdf21f 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectEditorFragment.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.fx.editor +package hep.dataforge.vis.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.common.VisualObject -import hep.dataforge.vis.common.findStyle +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.findStyle import javafx.beans.binding.Binding import javafx.beans.property.SimpleObjectProperty import javafx.scene.Node diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectTreeFragment.kt b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt similarity index 93% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectTreeFragment.kt rename to dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt index 4f27ef87..fad759b9 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/fx/editor/VisualObjectTreeFragment.kt +++ b/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.fx.editor +package hep.dataforge.vis.editor -import hep.dataforge.vis.common.VisualGroup -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualGroup +import hep.dataforge.vis.VisualObject import javafx.beans.property.SimpleObjectProperty import javafx.scene.control.SelectionMode import javafx.scene.control.TreeItem diff --git a/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt b/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt similarity index 85% rename from dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt rename to dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt index 62ca8870..0c4060f1 100644 --- a/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt +++ b/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vis.fx.demo +package hep.dataforge.vis.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.fx.editor.ConfigEditor -import hep.dataforge.vis.fx.editor.FXMeta -import hep.dataforge.vis.fx.editor.MetaViewer +import hep.dataforge.vis.editor.ConfigEditor +import hep.dataforge.vis.editor.FXMeta +import hep.dataforge.vis.editor.MetaViewer import javafx.geometry.Orientation import tornadofx.* @@ -49,7 +49,9 @@ class MetaEditorDemo : View("Meta editor demo") { private val rootNode = FXMeta.root(meta, descriptor) override val root = - splitpane(Orientation.HORIZONTAL, MetaViewer(rootNode).root, ConfigEditor(rootNode).root) + splitpane(Orientation.HORIZONTAL, MetaViewer(rootNode).root, ConfigEditor( + rootNode + ).root) } fun main() { diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt index bf8f81ac..3fdc1946 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt +++ b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt @@ -4,7 +4,7 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaBuilder import hep.dataforge.names.Name import hep.dataforge.names.toName -import hep.dataforge.vis.common.useStyle +import hep.dataforge.vis.useStyle import hep.dataforge.vis.spatial.* import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY import scientifik.gdml.* diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt index 1f72a899..9f3bb093 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt +++ b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt @@ -4,8 +4,8 @@ package hep.dataforge.vis.spatial.gdml import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.plus -import hep.dataforge.vis.common.get -import hep.dataforge.vis.common.set +import hep.dataforge.vis.get +import hep.dataforge.vis.set import hep.dataforge.vis.spatial.* import hep.dataforge.vis.spatial.World.ONE import hep.dataforge.vis.spatial.World.ZERO diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt index 26f35cb5..47610f06 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt @@ -6,10 +6,10 @@ import hep.dataforge.meta.Config import hep.dataforge.meta.Meta import hep.dataforge.meta.float import hep.dataforge.meta.get -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.VisualFactory -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.VisualFactory +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.set import hep.dataforge.vis.spatial.Box.Companion.TYPE_NAME import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt index 46cf3b0e..55c8f227 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt @@ -4,8 +4,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config import hep.dataforge.meta.update -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt index c58f77fd..e4a99c96 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt @@ -3,8 +3,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt index b7751919..9e4adc00 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt @@ -3,8 +3,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt index c713a2bb..c3440daf 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt @@ -2,8 +2,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt index 31a416eb..0a0688d4 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt @@ -3,8 +3,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers 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 0030ce53..98ffe8b5 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 @@ -10,7 +10,7 @@ import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.values.ValueType import hep.dataforge.values.asValue -import hep.dataforge.vis.common.Colors +import hep.dataforge.vis.Colors import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY 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 20cdf0f2..01176f46 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 @@ -6,8 +6,8 @@ import hep.dataforge.meta.Config import hep.dataforge.meta.scheme.number import hep.dataforge.names.asName import hep.dataforge.names.plus -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt index e11bb4ba..0e962b72 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt @@ -10,6 +10,7 @@ import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.asName import hep.dataforge.names.plus +import hep.dataforge.vis.* import hep.dataforge.vis.common.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -24,7 +25,8 @@ import kotlin.collections.set */ @Serializable @SerialName("3d.proxy") -class Proxy private constructor(val templateName: Name) : AbstractVisualObject(), VisualGroup, VisualObject3D { +class Proxy private constructor(val templateName: Name) : AbstractVisualObject(), + VisualGroup, VisualObject3D { constructor(parent: VisualGroup3D, templateName: Name) : this(templateName) { this.parent = parent @@ -44,7 +46,9 @@ class Proxy private constructor(val templateName: Name) : AbstractVisualObject() ?: error("Template with name $templateName not found in $parent") override val styleSheet: StyleSheet - get() = (parent as? VisualGroup)?.styleSheet ?: StyleSheet(this) + get() = (parent as? VisualGroup)?.styleSheet ?: StyleSheet( + this + ) override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? { return if (inherit) { @@ -86,7 +90,8 @@ class Proxy private constructor(val templateName: Name) : AbstractVisualObject() //override fun findAllStyles(): Laminate = Laminate((styles + prototype.styles).mapNotNull { findStyle(it) }) - inner class ProxyChild(val name: Name) : AbstractVisualObject(), VisualGroup { + inner class ProxyChild(val name: Name) : AbstractVisualObject(), + VisualGroup { val prototype: VisualObject get() = prototypeFor(name) diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt index b9e628b7..459d144c 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt @@ -3,8 +3,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt index 4822a560..31514a4a 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt @@ -2,8 +2,8 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers 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 3ee6cc93..22b8ea74 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 @@ -11,8 +11,8 @@ import hep.dataforge.meta.node import hep.dataforge.meta.scheme.configure import hep.dataforge.names.Name import hep.dataforge.names.toName -import hep.dataforge.vis.common.Visual -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.Visual +import hep.dataforge.vis.VisualObject import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.modules.SerializersModule diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt index cc9c23ea..aa804fad 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt @@ -9,10 +9,10 @@ import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.asName import hep.dataforge.names.isEmpty -import hep.dataforge.vis.common.AbstractVisualGroup -import hep.dataforge.vis.common.StyleSheet -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.common.set +import hep.dataforge.vis.AbstractVisualGroup +import hep.dataforge.vis.StyleSheet +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers 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 6e1accd8..f42574d6 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 @@ -8,7 +8,7 @@ import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.output.Renderer import hep.dataforge.values.asValue -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.VisualObject3D.Companion.DETAIL_KEY import hep.dataforge.vis.spatial.VisualObject3D.Companion.IGNORE_KEY import hep.dataforge.vis.spatial.VisualObject3D.Companion.LAYER_KEY diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt index 636b9cc1..309bc873 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt @@ -2,9 +2,9 @@ package hep.dataforge.vis.spatial.transform import hep.dataforge.meta.update import hep.dataforge.names.asName -import hep.dataforge.vis.common.MutableVisualGroup -import hep.dataforge.vis.common.VisualGroup -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.MutableVisualGroup +import hep.dataforge.vis.VisualGroup +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.* internal fun mergeChild(parent: VisualGroup, child: VisualObject): VisualObject { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt index c96be89c..32104b95 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt @@ -2,8 +2,8 @@ package hep.dataforge.vis.spatial.transform import hep.dataforge.names.Name import hep.dataforge.names.asName -import hep.dataforge.vis.common.MutableVisualGroup -import hep.dataforge.vis.common.VisualGroup +import hep.dataforge.vis.MutableVisualGroup +import hep.dataforge.vis.VisualGroup import hep.dataforge.vis.spatial.Proxy import hep.dataforge.vis.spatial.VisualGroup3D import hep.dataforge.vis.spatial.prototypes diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt index 596aad56..88c6fd12 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt @@ -1,6 +1,6 @@ package hep.dataforge.vis.spatial.transform -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject /** * A root class for [VisualObject] tree optimization diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt b/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt index 2608b53a..e5d6153d 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt +++ b/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial -import hep.dataforge.vis.common.Colors -import hep.dataforge.vis.common.get +import hep.dataforge.vis.Colors +import hep.dataforge.vis.get import kotlin.math.PI import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt b/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt index fa15b905..9972b8c2 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt +++ b/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial import hep.dataforge.meta.int import hep.dataforge.meta.set import hep.dataforge.names.asName -import hep.dataforge.vis.common.useStyle +import hep.dataforge.vis.useStyle import kotlin.test.Test import kotlin.test.assertEquals 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 483d48ec..6e3a9603 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 @@ -8,7 +8,7 @@ import hep.dataforge.names.Name import hep.dataforge.names.plus import hep.dataforge.names.toName import hep.dataforge.output.Renderer -import hep.dataforge.vis.common.Colors +import hep.dataforge.vis.Colors import hep.dataforge.vis.spatial.VisualObject3D import hep.dataforge.vis.spatial.specifications.Camera import hep.dataforge.vis.spatial.specifications.Canvas diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt index 6828cd7b..38d1bfb5 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.names.Name import hep.dataforge.names.startsWith import hep.dataforge.provider.Type -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.* import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY import hep.dataforge.vis.spatial.three.ThreeFactory.Companion.TYPE diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt index 786c0efd..4ef25b5a 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt @@ -2,8 +2,8 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.meta.* import hep.dataforge.values.ValueType -import hep.dataforge.vis.common.Colors -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.Colors +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.Material3D import info.laht.threekt.materials.LineBasicMaterial import info.laht.threekt.materials.Material diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt index e5c99efe..6c6aabeb 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.context.* import hep.dataforge.meta.Meta import hep.dataforge.names.* -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.* import info.laht.threekt.core.Object3D import kotlin.collections.set diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt index 16b5b37d..6071b31e 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.meta.Config -import hep.dataforge.vis.common.AbstractVisualObject +import hep.dataforge.vis.AbstractVisualObject import hep.dataforge.vis.spatial.Point3D import hep.dataforge.vis.spatial.Point3DSerializer import hep.dataforge.vis.spatial.VisualObject3D diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt index 70afb07d..d6042d01 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt +++ b/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt @@ -1,7 +1,7 @@ package hep.dataforge.vis.spatial.three import hep.dataforge.js.requireJS -import hep.dataforge.vis.js.editor.accordion +import hep.dataforge.vis.editor.accordion import hep.dataforge.vis.spatial.Visual3D import hep.dataforge.vis.spatial.VisualGroup3D import kotlinx.html.InputType diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt index bdaf52dc..1e78d8d5 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt +++ b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt @@ -5,7 +5,7 @@ import hep.dataforge.meta.double import hep.dataforge.meta.get import hep.dataforge.meta.int import hep.dataforge.values.ValueType -import hep.dataforge.vis.common.Colors +import hep.dataforge.vis.Colors import hep.dataforge.vis.spatial.Material3D import javafx.scene.paint.Color import javafx.scene.paint.Material diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt index 6052afcd..47900222 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt +++ b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt @@ -3,7 +3,7 @@ package hep.dataforge.vis.spatial.fx import hep.dataforge.names.Name import hep.dataforge.names.isEmpty import hep.dataforge.names.toName -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.Proxy import javafx.scene.Group import javafx.scene.Node diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt index faa7b843..2280723f 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt +++ b/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt @@ -4,7 +4,7 @@ import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.startsWith import hep.dataforge.names.toName -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import javafx.application.Platform import javafx.beans.binding.ObjectBinding import tornadofx.* diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt index 6eba931a..c950bdca 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt +++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt @@ -7,10 +7,10 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.withBottom import hep.dataforge.names.Name import hep.dataforge.names.isEmpty -import hep.dataforge.vis.common.VisualGroup -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.js.editor.displayObjectTree -import hep.dataforge.vis.js.editor.displayPropertyEditor +import hep.dataforge.vis.VisualGroup +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.editor.displayObjectTree +import hep.dataforge.vis.editor.displayPropertyEditor import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_WIREFRAME_KEY diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt index ff07ebc6..9de54bc5 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt +++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/demo/GDMLDemoApp.kt @@ -1,8 +1,8 @@ package hep.dataforge.vis.spatial.gdml.demo import hep.dataforge.context.Global -import hep.dataforge.vis.fx.editor.VisualObjectEditorFragment -import hep.dataforge.vis.fx.editor.VisualObjectTreeFragment +import hep.dataforge.vis.editor.VisualObjectEditorFragment +import hep.dataforge.vis.editor.VisualObjectTreeFragment import hep.dataforge.vis.spatial.Material3D import hep.dataforge.vis.spatial.Visual3D import hep.dataforge.vis.spatial.VisualGroup3D diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt index e2d6afb0..b76be164 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt @@ -1,6 +1,6 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vis.common.removeAll +import hep.dataforge.vis.removeAll import hep.dataforge.vis.spatial.* import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt index 54f58f26..19d08623 100644 --- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt +++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt @@ -7,11 +7,11 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.withBottom import hep.dataforge.names.Name import hep.dataforge.names.isEmpty -import hep.dataforge.vis.common.VisualGroup -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.js.editor.card -import hep.dataforge.vis.js.editor.displayObjectTree -import hep.dataforge.vis.js.editor.displayPropertyEditor +import hep.dataforge.vis.VisualGroup +import hep.dataforge.vis.VisualObject +import hep.dataforge.vis.editor.card +import hep.dataforge.vis.editor.displayObjectTree +import hep.dataforge.vis.editor.displayPropertyEditor import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_WIREFRAME_KEY 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 9bc63834..ac716e82 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 @@ -4,8 +4,8 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.scheme.invoke import hep.dataforge.names.toName import hep.dataforge.output.OutputManager -import hep.dataforge.vis.common.Colors -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.Colors +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.* import hep.dataforge.vis.spatial.specifications.Canvas import kotlinx.coroutines.* diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt index 0aee069d..e9f3cb8d 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt @@ -7,7 +7,7 @@ import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.three.ThreeCanvas import hep.dataforge.vis.spatial.three.ThreePlugin import hep.dataforge.vis.spatial.three.output 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 334721a2..4dd23ac5 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 @@ -8,8 +8,8 @@ import hep.dataforge.meta.scheme.setProperty import hep.dataforge.names.plus import hep.dataforge.names.startsWith import hep.dataforge.values.asValue -import hep.dataforge.vis.common.getProperty -import hep.dataforge.vis.common.set +import hep.dataforge.vis.getProperty +import hep.dataforge.vis.set import hep.dataforge.vis.spatial.* import hep.dataforge.vis.spatial.VisualObject3D.Companion.GEOMETRY_KEY import hep.dataforge.vis.spatial.demo.VariableBoxThreeFactory.Z_SIZE_KEY diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt index b608d100..8211f4fd 100644 --- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt +++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt @@ -6,7 +6,7 @@ import hep.dataforge.meta.buildMeta import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer -import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.VisualObject import hep.dataforge.vis.spatial.fx.FX3DPlugin import hep.dataforge.vis.spatial.fx.FXCanvas3D import hep.dataforge.vis.spatial.specifications.Axes as AxesSpec