From 7febb4452a4b010567e31494ac71d076e692f457 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 7 Mar 2021 16:19:43 +0300 Subject: [PATCH] Grand package change --- build.gradle.kts | 12 ++++-- demo/gdml/build.gradle.kts | 4 +- .../visionforge}/gdml/GDMLVisualTest.kt | 14 +++---- .../gdml/demo/GDMLAppComponent.kt | 28 ++++++------- .../visionforge}/gdml/demo/GdmlJsDemoApp.kt | 16 +++---- .../visionforge}/gdml/demo/fileDrop.kt | 2 +- .../visionforge}/gdml/demo/GdmlFxDemoApp.kt | 24 +++++------ .../visionforge}/gdml/demo/readFile.kt | 10 ++--- .../visionforge}/gdml/demo/saveToJson.kt | 6 +-- .../solid/FileSerializationTest.kt | 4 +- demo/jupyter-playground/build.gradle.kts | 2 +- .../VisionForgePlayGroundForJupyter.kt | 42 +++++++++---------- .../kotlin/ru/mipt/npm/muon/monitor/Event.kt | 2 +- .../kotlin/ru/mipt/npm/muon/monitor/Model.kt | 4 +- .../ru/mipt/npm/muon/monitor/Monitor.kt | 4 +- .../mipt/npm/muon/monitor/MMAppComponent.kt | 34 +++++++-------- .../ru/mipt/npm/muon/monitor/MMDemoApp.kt | 8 ++-- .../mipt/npm/muon/monitor/server/MMServer.kt | 8 ++-- .../ru/mipt/npm/muon/monitor/sim/line.kt | 2 +- .../src/jsMain/kotlin/playgroundMain.kt | 8 ++-- .../src/jvmMain/kotlin/gdmlCubes.kt | 18 ++++---- .../playground/src/jvmMain/kotlin/gdmlIaxo.kt | 16 +++---- .../src/jvmMain/kotlin/generateSchema.kt | 6 +-- .../src/jvmMain/kotlin/plotlyVision.kt | 18 ++++---- .../src/jvmMain/kotlin/randomSpheres.kt | 14 +++---- .../src/jvmMain/kotlin/serverExtensions.kt | 22 +++++----- .../src/jvmMain/kotlin/simpleCube.kt | 18 ++++---- .../main/kotlin/ru/mipt/npm/sat/geometry.kt | 10 ++--- .../main/kotlin/ru/mipt/npm/sat/satServer.kt | 10 ++--- demo/solid-showcase/build.gradle.kts | 2 +- .../kscience/visionforge}/solid/demo/demo.kt | 18 ++++---- .../visionforge}/solid/demo/ThreeDemoApp.kt | 10 ++--- .../visionforge}/solid/demo/ThreeDemoGrid.kt | 20 ++++----- .../visionforge}/solid/demo/VariableBox.kt | 25 +++++------ .../visionforge}/solid/demo/FXDemoApp.kt | 2 +- .../visionforge}/solid/demo/FXDemoGrid.kt | 16 +++---- .../visionforge}/solid/demo/MetaEditorDemo.kt | 16 +++---- settings.gradle.kts | 4 +- .../visionforge}/bootstrap/bootstrap.kt | 2 +- .../visionforge}/bootstrap/outputConfig.kt | 10 ++--- .../visionforge}/bootstrap/reactBootstrap.kt | 8 ++-- .../visionforge}/bootstrap/tabComponent.kt | 4 +- .../visionforge}/bootstrap/threeControls.kt | 14 +++---- .../bootstrap/visionPropertyEditor.kt | 12 +++--- .../hep/dataforge/vision/material/icons.kt | 2 +- .../hep/dataforge/vision/material/misc.kt | 6 +-- .../dataforge/vision/material/objectTree.kt | 18 ++++---- .../kscience/visionforge}/react/MetaViewer.kt | 26 ++++++------ .../kscience/visionforge}/react/ObjectTree.kt | 16 +++---- .../visionforge}/react/PropertyEditor.kt | 21 ++++++---- .../react/ThreeCanvasComponent.kt | 14 +++---- .../kscience/visionforge}/react/TreeStyles.kt | 2 +- .../kscience/visionforge}/react/layout.kt | 2 +- .../visionforge}/react/valueChooser.kt | 14 +++---- visionforge-core/build.gradle.kts | 2 +- .../hep/dataforge/vision/VisionLayout.kt | 8 ---- .../kscience/visionforge}/Colors.kt | 10 ++--- .../kscience/visionforge}/StyleReference.kt | 8 ++-- .../kscience/visionforge}/StyleSheet.kt | 12 +++--- .../kscience/visionforge}/Vision.kt | 20 ++++----- .../kscience/visionforge}/VisionBase.kt | 24 +++++------ .../kscience/visionforge}/VisionChange.kt | 12 +++--- .../kscience/visionforge}/VisionForge.kt | 8 ++-- .../kscience/visionforge}/VisionGroup.kt | 6 +-- .../kscience/visionforge}/VisionGroupBase.kt | 4 +- .../kscience/visionforge/VisionLayout.kt | 8 ++++ .../kscience/visionforge}/VisionManager.kt | 15 ++++--- .../visionforge}/VisionPropertyContainer.kt | 6 +-- .../visionforge}/html/HtmlVisionFragment.kt | 6 +-- .../kscience/visionforge}/html/Page.kt | 12 +++--- .../visionforge}/html/VisionTagConsumer.kt | 20 ++++----- .../visionforge}/html/staticHtmlRender.kt | 10 ++--- .../kscience/visionforge}/misc.kt | 6 +-- .../kscience/visionforge}/visionDescriptor.kt | 18 ++++---- .../visionforge}/visitor/StatisticsVisitor.kt | 8 ++-- .../visionforge}/visitor/VisionVisitor.kt | 10 ++--- .../kscience/visionforge}/html/HtmlTagTest.kt | 12 +++--- .../kscience/visionforge}/Application.kt | 2 +- .../kscience/visionforge}/VisionClient.kt | 18 ++++---- .../kscience/visionforge}/elementOutput.kt | 6 +-- .../kscience/visionforge}/visionForgeJs.kt | 6 +-- .../kscience/visionforge}/html/headers.kt | 6 +-- .../kscience/visionforge}/html/htmlExport.kt | 10 ++--- .../kscience/visionforge}/visionForgeJvm.kt | 8 ++-- .../visionforge}/visitor/countDistinct.kt | 2 +- .../kscience/visionforge}/FXPlugin.kt | 10 ++--- .../visionforge}/editor/ColorValueChooser.kt | 16 +++---- .../editor/ComboBoxValueChooser.kt | 18 ++++---- .../visionforge}/editor/ConfigEditor.kt | 12 +++--- .../kscience/visionforge}/editor/FXMeta.kt | 16 +++---- .../visionforge}/editor/MetaViewer.kt | 8 ++-- .../visionforge}/editor/TextValueChooser.kt | 10 ++--- .../visionforge}/editor/ValueCallback.kt | 4 +- .../visionforge}/editor/ValueChooser.kt | 26 ++++++------ .../visionforge}/editor/ValueChooserBase.kt | 8 ++-- .../editor/VisualObjectEditorFragment.kt | 11 +++-- .../editor/VisualObjectTreeFragment.kt | 6 +-- .../kscience/visionforge}/solid/FX3DPlugin.kt | 16 +++---- .../kscience/visionforge}/solid/FXCanvas3D.kt | 8 ++-- .../visionforge}/solid/FXCompositeFactory.kt | 4 +- .../visionforge}/solid/FXConvexFactory.kt | 2 +- .../visionforge}/solid/FXMaterials.kt | 12 +++--- .../visionforge}/solid/FXReferenceFactory.kt | 8 ++-- .../visionforge}/solid/FXShapeFactory.kt | 4 +- .../visionforge}/solid/OrbitControls.kt | 4 +- .../solid/VisualObjectFXBinding.kt | 16 +++---- .../visionforge}/gdml/GdmlOptimizer.kt | 12 +++--- .../visionforge}/gdml/GdmlShowcase.kt | 2 +- .../visionforge}/gdml/GdmlTransformer.kt | 26 ++++++------ .../src/commonTest/kotlin/TestCubes.kt | 16 +++---- .../kscience/visionforge}/gdml/gdmlJs.kt | 2 +- .../kscience/visionforge}/gdml/gdmlJVM.kt | 4 +- .../visionforge}/gdml/TestConvertor.kt | 6 +-- .../visionforge}/gdml/bmanStatistics.kt | 8 ++-- visionforge-plotly/build.gradle.kts | 4 +- .../dataforge/vision/plotly/VisionOfPlotly.kt | 19 --------- .../visionforge}/plotly/PlotlyPlugin.kt | 14 +++---- .../visionforge/plotly/VisionOfPlotly.kt | 19 +++++++++ .../kscience/visionforge}/plotly/plotlyJs.kt | 26 ++++++------ .../visionforge}/plotly/plotlyHeaders.kt | 12 +++--- .../kscience/visionforge}/plotly/plotlyJvm.kt | 14 +++---- .../visionforge}/three/server/VisionServer.kt | 39 ++++++++++------- .../vision/solid/specifications/Controls.kt | 9 ---- .../vision/solid/specifications/Light.kt | 8 ---- .../kscience/visionforge}/solid/Box.kt | 8 ++-- .../visionforge}/solid/ColorAccessor.kt | 20 ++++----- .../kscience/visionforge}/solid/Composite.kt | 8 ++-- .../visionforge}/solid/ConeSegment.kt | 6 +-- .../kscience/visionforge}/solid/Convex.kt | 6 +-- .../kscience/visionforge}/solid/Extruded.kt | 8 ++-- .../visionforge}/solid/GeometryBuilder.kt | 4 +- .../kscience/visionforge}/solid/PolyLine.kt | 18 ++++---- .../kscience/visionforge}/solid/Solid.kt | 30 ++++++------- .../kscience/visionforge}/solid/SolidBase.kt | 16 +++---- .../kscience/visionforge}/solid/SolidGroup.kt | 12 +++--- .../kscience/visionforge}/solid/SolidLabel.kt | 8 ++-- .../visionforge}/solid/SolidMaterial.kt | 26 ++++++------ .../visionforge}/solid/SolidReference.kt | 14 +++---- .../kscience/visionforge}/solid/Solids.kt | 16 +++---- .../kscience/visionforge}/solid/Sphere.kt | 8 ++-- .../visionforge}/solid/SphereLayer.kt | 8 ++-- .../kscience/visionforge}/solid/Tube.kt | 8 ++-- .../kscience/visionforge}/solid/geometry.kt | 10 ++--- .../visionforge}/solid/specifications/Axes.kt | 10 ++--- .../solid/specifications/Camera.kt | 10 ++--- .../solid/specifications/Canvas3DOptions.kt | 6 +-- .../solid/specifications/Controls.kt | 9 ++++ .../visionforge/solid/specifications/Light.kt | 8 ++++ .../solid/transform/RemoveSingleChild.kt | 10 ++--- .../visionforge}/solid/transform/UnRef.kt | 16 +++---- .../solid/transform/VisualTreeTransform.kt | 4 +- .../visionforge}/solid/CompositeTest.kt | 3 +- .../kscience/visionforge}/solid/ConvexTest.kt | 12 +++--- .../kscience/visionforge}/solid/GroupTest.kt | 6 +-- .../visionforge}/solid/PropertyTest.kt | 8 ++-- .../visionforge}/solid/SerializationTest.kt | 12 +++--- .../visionforge}/solid/SolidPluginTest.kt | 8 ++-- .../visionforge}/solid/SolidReferenceTest.kt | 10 ++--- .../visionforge}/solid/VisionUpdateTest.kt | 12 +++--- .../solid/three/MeshThreeFactory.kt | 22 +++++----- .../solid/three/ThreeBoxFactory.kt | 6 +-- .../visionforge}/solid/three/ThreeCanvas.kt | 27 ++++++------ .../solid/three/ThreeCanvasLabelFactory.kt | 8 ++-- .../solid/three/ThreeCompositeFactory.kt | 7 ++-- .../solid/three/ThreeConvexFactory.kt | 4 +- .../solid/three/ThreeCylinderFactory.kt | 6 +-- .../visionforge}/solid/three/ThreeFactory.kt | 18 ++++---- .../solid/three/ThreeGeometryBuilder.kt | 12 +++--- .../solid/three/ThreeLabelFactory.kt | 9 ++-- .../solid/three/ThreeLineFactory.kt | 14 +++---- .../solid/three/ThreeMaterials.kt | 20 ++++----- .../visionforge}/solid/three/ThreePlugin.kt | 16 +++---- .../solid/three/ThreeReferenceFactory.kt | 16 +++---- .../solid/three/ThreeSphereFactory.kt | 6 +-- .../visionforge}/solid/three/ThreeVision.kt | 4 +- .../kscience/visionforge}/solid/three/csg.kt | 0 .../visionforge}/solid/three/three.kt | 12 +++--- .../dataforge/vision/three/server/jsMain.kt | 11 ----- .../visionforge/three/server/jsMain.kt | 11 +++++ .../three/server/serverExtensions.kt | 16 +++---- 180 files changed, 1029 insertions(+), 1006 deletions(-) rename demo/gdml/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GDMLVisualTest.kt (67%) rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GDMLAppComponent.kt (81%) rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GdmlJsDemoApp.kt (66%) rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/fileDrop.kt (93%) rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GdmlFxDemoApp.kt (76%) rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/readFile.kt (81%) rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/saveToJson.kt (86%) rename demo/gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FileSerializationTest.kt (80%) rename demo/solid-showcase/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/demo.kt (91%) rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/ThreeDemoApp.kt (84%) rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/ThreeDemoGrid.kt (81%) rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/VariableBox.kt (84%) rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/FXDemoApp.kt (87%) rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/FXDemoGrid.kt (65%) rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/MetaEditorDemo.kt (74%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/bootstrap.kt (99%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/outputConfig.kt (93%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/reactBootstrap.kt (96%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/tabComponent.kt (95%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/threeControls.kt (85%) rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/visionPropertyEditor.kt (80%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/MetaViewer.kt (87%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/ObjectTree.kt (90%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/PropertyEditor.kt (92%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/ThreeCanvasComponent.kt (81%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/TreeStyles.kt (98%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/layout.kt (94%) rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/valueChooser.kt (94%) delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Colors.kt (97%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/StyleReference.kt (84%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/StyleSheet.kt (92%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Vision.kt (89%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionBase.kt (87%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionChange.kt (94%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionForge.kt (55%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionGroup.kt (93%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionGroupBase.kt (98%) create mode 100644 visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionManager.kt (89%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionPropertyContainer.kt (77%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/HtmlVisionFragment.kt (71%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/Page.kt (70%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/VisionTagConsumer.kt (88%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/staticHtmlRender.kt (88%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/misc.kt (84%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionDescriptor.kt (79%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/StatisticsVisitor.kt (85%) rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/VisionVisitor.kt (87%) rename visionforge-core/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/HtmlTagTest.kt (83%) rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Application.kt (98%) rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionClient.kt (92%) rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/elementOutput.kt (87%) rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionForgeJs.kt (91%) rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/headers.kt (97%) rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/htmlExport.kt (89%) rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionForgeJvm.kt (68%) rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/countDistinct.kt (88%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/FXPlugin.kt (93%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ColorValueChooser.kt (77%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ComboBoxValueChooser.kt (81%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ConfigEditor.kt (96%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/FXMeta.kt (94%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/MetaViewer.kt (92%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/TextValueChooser.kt (93%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueCallback.kt (86%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueChooser.kt (85%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueChooserBase.kt (89%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/VisualObjectEditorFragment.kt (87%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/VisualObjectTreeFragment.kt (93%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FX3DPlugin.kt (92%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXCanvas3D.kt (91%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXCompositeFactory.kt (95%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXConvexFactory.kt (92%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXMaterials.kt (88%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXReferenceFactory.kt (90%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXShapeFactory.kt (95%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/OrbitControls.kt (97%) rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/VisualObjectFXBinding.kt (86%) rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlOptimizer.kt (90%) rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlShowcase.kt (98%) rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlTransformer.kt (95%) rename visionforge-gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/gdmlJs.kt (79%) rename visionforge-gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/gdmlJVM.kt (83%) rename visionforge-gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/TestConvertor.kt (90%) rename visionforge-gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/bmanStatistics.kt (84%) delete mode 100644 visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt rename visionforge-plotly/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/PlotlyPlugin.kt (63%) create mode 100644 visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt rename visionforge-plotly/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyJs.kt (70%) rename visionforge-plotly/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyHeaders.kt (65%) rename visionforge-plotly/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyJvm.kt (65%) rename visionforge-server/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/three/server/VisionServer.kt (88%) delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Box.kt (86%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ColorAccessor.kt (67%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Composite.kt (89%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ConeSegment.kt (94%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Convex.kt (82%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Extruded.kt (93%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/GeometryBuilder.kt (94%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/PolyLine.kt (62%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Solid.kt (88%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidBase.kt (71%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidGroup.kt (93%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidLabel.kt (70%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidMaterial.kt (82%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidReference.kt (95%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Solids.kt (86%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Sphere.kt (90%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SphereLayer.kt (93%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Tube.kt (95%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/geometry.kt (84%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Axes.kt (59%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Camera.kt (78%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Canvas3DOptions.kt (86%) create mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt create mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/RemoveSingleChild.kt (88%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/UnRef.kt (78%) rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/VisualTreeTransform.kt (89%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/CompositeTest.kt (89%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ConvexTest.kt (76%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/GroupTest.kt (91%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/PropertyTest.kt (92%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SerializationTest.kt (83%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidPluginTest.kt (78%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidReferenceTest.kt (80%) rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/VisionUpdateTest.kt (89%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/MeshThreeFactory.kt (89%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeBoxFactory.kt (72%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCanvas.kt (91%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCanvasLabelFactory.kt (88%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCompositeFactory.kt (86%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeConvexFactory.kt (77%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCylinderFactory.kt (88%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeFactory.kt (79%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeGeometryBuilder.kt (84%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeLabelFactory.kt (78%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeLineFactory.kt (75%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeMaterials.kt (93%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreePlugin.kt (95%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeReferenceFactory.kt (82%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeSphereFactory.kt (85%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeVision.kt (69%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/csg.kt (100%) rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/three.kt (88%) delete mode 100644 visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt create mode 100644 visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt rename visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/three/server/serverExtensions.kt (62%) diff --git a/build.gradle.kts b/build.gradle.kts index 47055ee3..12a8077e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin("jupyter.api") apply false } -val dataforgeVersion by extra("0.3.0") +val dataforgeVersion by extra("0.4.0-dev-2") val ktorVersion by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion) val htmlVersion by extra(ru.mipt.npm.gradle.KScienceVersions.htmlVersion) val kotlinWrappersVersion by extra("pre.148-kotlin-1.4.30") @@ -22,7 +22,7 @@ allprojects { } group = "hep.dataforge" - version = "0.2.0-dev-6" + version = "0.2.0-dev-7" } val githubProject by extra("visionforge") @@ -30,10 +30,16 @@ val bintrayRepo by extra("dataforge") subprojects { if (name.startsWith("visionforge")) { - plugins.apply("ru.mipt.npm.gradle.publish") + plugins.apply("maven-publish") } } +ksciencePublish{ + github("visionforge") + space() + sonatype() +} + apiValidation { validationDisabled = true ignoredPackages.add("info.laht.threekt") diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts index 1246edad..e4fef51e 100644 --- a/demo/gdml/build.gradle.kts +++ b/demo/gdml/build.gradle.kts @@ -39,11 +39,11 @@ kotlin { } application { - mainClass.set("hep.dataforge.vision.gdml.demo.GdmlFxDemoAppKt") + mainClass.set("space.kscience.visionforge.gdml.demo.GdmlFxDemoAppKt") } val convertGdmlToJson by tasks.creating(JavaExec::class) { group = "application" classpath = sourceSets["main"].runtimeClasspath - main = "hep.dataforge.vis.spatial.gdml.demo.SaveToJsonKt" + main = "space.kscience.dataforge.vis.spatial.gdml.demo.SaveToJsonKt" } \ No newline at end of file diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt similarity index 67% rename from demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt rename to demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt index 728c592c..c0587c2e 100644 --- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt +++ b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.meta.string -import hep.dataforge.names.toName -import hep.dataforge.values.asValue -import hep.dataforge.vision.gdml.GdmlShowcase.cubes -import hep.dataforge.vision.setProperty -import hep.dataforge.vision.solid.SolidMaterial +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.values.asValue +import space.kscience.visionforge.gdml.GdmlShowcase.cubes +import space.kscience.visionforge.setProperty +import space.kscience.visionforge.solid.SolidMaterial import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt similarity index 81% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt index 13d68ab2..9d60eaf4 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt +++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt @@ -1,18 +1,5 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo -import hep.dataforge.context.Context -import hep.dataforge.names.Name -import hep.dataforge.vision.Vision -import hep.dataforge.vision.bootstrap.gridRow -import hep.dataforge.vision.bootstrap.nameCrumbs -import hep.dataforge.vision.bootstrap.threeControls -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.react.ThreeCanvasComponent -import hep.dataforge.vision.react.flexColumn -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.Solids -import hep.dataforge.vision.solid.specifications.Canvas3DOptions -import hep.dataforge.vision.solid.three.ThreeCanvas import kotlinx.browser.window import kotlinx.css.* import org.w3c.files.FileReader @@ -22,8 +9,21 @@ import react.child import react.dom.h1 import react.functionalComponent import react.useState +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.names.Name import space.kscience.gdml.Gdml import space.kscience.gdml.decodeFromString +import space.kscience.visionforge.Vision +import space.kscience.visionforge.bootstrap.gridRow +import space.kscience.visionforge.bootstrap.nameCrumbs +import space.kscience.visionforge.bootstrap.threeControls +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.react.ThreeCanvasComponent +import space.kscience.visionforge.react.flexColumn +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.Solids +import space.kscience.visionforge.solid.specifications.Canvas3DOptions +import space.kscience.visionforge.solid.three.ThreeCanvas import styled.css import styled.styledDiv diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt similarity index 66% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt index 93c5e0bf..31f4645b 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt +++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo -import hep.dataforge.context.Global -import hep.dataforge.vision.Application -import hep.dataforge.vision.bootstrap.useBootstrap -import hep.dataforge.vision.gdml.GdmlShowcase -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.solid.three.ThreePlugin -import hep.dataforge.vision.startApplication import kotlinx.browser.document import react.child import react.dom.render +import space.kscience.dataforge.context.Global +import space.kscience.visionforge.Application +import space.kscience.visionforge.bootstrap.useBootstrap +import space.kscience.visionforge.gdml.GdmlShowcase +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.solid.three.ThreePlugin +import space.kscience.visionforge.startApplication private class GDMLDemoApp : Application { diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt similarity index 93% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt index 4bf47c85..dcd7b4eb 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt +++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo import drop.FileDrop import kotlinx.css.* diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt similarity index 76% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt index a4a75780..544d8a7f 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt +++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt @@ -1,19 +1,19 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo -import hep.dataforge.context.Global -import hep.dataforge.vision.VisionManager -import hep.dataforge.vision.describedProperties -import hep.dataforge.vision.editor.VisualObjectEditorFragment -import hep.dataforge.vision.editor.VisualObjectTreeFragment -import hep.dataforge.vision.gdml.GdmlShowcase.cubes -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.solid.FX3DPlugin -import hep.dataforge.vision.solid.FXCanvas3D -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.SolidMaterial import javafx.geometry.Orientation import javafx.scene.Parent import javafx.stage.FileChooser +import space.kscience.dataforge.context.Global +import space.kscience.visionforge.VisionManager +import space.kscience.visionforge.describedProperties +import space.kscience.visionforge.editor.VisualObjectEditorFragment +import space.kscience.visionforge.editor.VisualObjectTreeFragment +import space.kscience.visionforge.gdml.GdmlShowcase.cubes +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.solid.FX3DPlugin +import space.kscience.visionforge.solid.FXCanvas3D +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.SolidMaterial import tornadofx.* class GDMLDemoApp : App(GDMLView::class) diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt similarity index 81% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt index 2f8ec999..933fac3c 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt +++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionManager -import hep.dataforge.vision.gdml.toVision +import space.kscience.dataforge.misc.DFExperimental import space.kscience.gdml.Gdml import space.kscience.gdml.decodeFromFile +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionManager +import space.kscience.visionforge.gdml.toVision import java.io.File import java.util.zip.GZIPInputStream import java.util.zip.ZipInputStream diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt similarity index 86% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt index 09568da2..9e4c04b1 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt +++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.gdml.demo +package space.kscience.visionforge.gdml.demo -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.solid.Solids import space.kscience.gdml.Gdml import space.kscience.gdml.LUnit import space.kscience.gdml.decodeFromFile +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.solid.Solids import java.io.File import java.nio.file.Paths diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt similarity index 80% rename from demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt rename to demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt index 1d3c686e..cd45a97b 100644 --- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt +++ b/demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.names.asName import org.junit.jupiter.api.Test +import space.kscience.dataforge.names.asName import kotlin.test.Ignore class FileSerializationTest { diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts index 3f4206af..e467f49b 100644 --- a/demo/jupyter-playground/build.gradle.kts +++ b/demo/jupyter-playground/build.gradle.kts @@ -32,7 +32,7 @@ tasks.withType { } tasks.processJupyterApiResources { - libraryProducers = listOf("hep.dataforge.playground.VisionForgePlayGroundForJupyter") + libraryProducers = listOf("space.kscience.dataforge.playground.VisionForgePlayGroundForJupyter") } tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources") \ No newline at end of file diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt index f9ddea35..58304bd2 100644 --- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt +++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt @@ -1,28 +1,28 @@ -package hep.dataforge.playground +package space.kscience.dataforge.playground -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.html.HtmlVisionFragment -import hep.dataforge.vision.html.Page -import hep.dataforge.vision.html.embedVisionFragment -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.plotly.toVision -import hep.dataforge.vision.plotly.usePlotly -import hep.dataforge.vision.plugins -import hep.dataforge.vision.solid.Solids -import hep.dataforge.vision.visionManager import kotlinx.html.div import kotlinx.html.id import kotlinx.html.script import kotlinx.html.stream.createHTML import kotlinx.html.unsafe -import kscience.plotly.Plot import org.jetbrains.kotlinx.jupyter.api.HTML import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary import org.jetbrains.kotlinx.jupyter.api.libraries.* +import space.kscience.dataforge.misc.DFExperimental import space.kscience.gdml.Gdml +import space.kscience.plotly.Plot +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.html.HtmlVisionFragment +import space.kscience.visionforge.html.Page +import space.kscience.visionforge.html.embedVisionFragment +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.plotly.toVision +import space.kscience.visionforge.plotly.usePlotly +import space.kscience.visionforge.plugins +import space.kscience.visionforge.solid.Solids +import space.kscience.visionforge.visionManager @JupyterLibrary @DFExperimental @@ -57,12 +57,12 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() { import( "space.kscience.gdml.*", - "kscience.plotly.*", - "kscience.plotly.models.*", + "space.kscience.plotly.*", + "space.kscience.plotly.models.*", "kotlinx.html.*", - "hep.dataforge.vision.solid.*", - "hep.dataforge.vision.html.Page", - "hep.dataforge.vision.html.page" + "space.kscience.visionforge.solid.*", + "space.kscience.visionforge.html.Page", + "space.kscience.visionforge.html.page" ) import() @@ -90,7 +90,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() { HTML(produceHtmlVisionString(fragment)) } - render { fragment -> + render { fragment -> HTML(createHTML().apply(fragment.visit).finalize()) } diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt index 3d64e67a..b47c2b66 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt @@ -1,7 +1,7 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vision.solid.Point3D import kotlinx.serialization.Serializable +import space.kscience.visionforge.solid.Point3D typealias Track = List 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 b4b883fc..43f13028 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,10 +1,10 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vision.removeAll -import hep.dataforge.vision.solid.* 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 +import space.kscience.visionforge.removeAll +import space.kscience.visionforge.solid.* import kotlin.math.PI class Model { diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt index e526c131..e87a2abc 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt @@ -1,9 +1,9 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vision.solid.Point3D -import hep.dataforge.vision.solid.plus import ru.mipt.npm.muon.monitor.Monitor.PIXEL_XY_SIZE import ru.mipt.npm.muon.monitor.Monitor.PIXEL_Z_SIZE +import space.kscience.visionforge.solid.Point3D +import space.kscience.visionforge.solid.plus /** * A single pixel diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt index 7e146287..8eb251ad 100644 --- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt +++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt @@ -1,21 +1,5 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.context.Context -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.isEmpty -import hep.dataforge.names.length -import hep.dataforge.vision.Vision -import hep.dataforge.vision.bootstrap.canvasControls -import hep.dataforge.vision.bootstrap.card -import hep.dataforge.vision.bootstrap.gridRow -import hep.dataforge.vision.bootstrap.visionPropertyEditor -import hep.dataforge.vision.react.ThreeCanvasComponent -import hep.dataforge.vision.react.flexColumn -import hep.dataforge.vision.react.objectTree -import hep.dataforge.vision.solid.specifications.Camera -import hep.dataforge.vision.solid.specifications.Canvas3DOptions -import hep.dataforge.vision.solid.three.ThreeCanvas import io.ktor.client.HttpClient import io.ktor.client.request.get import kotlinx.coroutines.GlobalScope @@ -27,6 +11,22 @@ import react.child import react.dom.* import react.functionalComponent import react.useState +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.isEmpty +import space.kscience.dataforge.names.length +import space.kscience.visionforge.Vision +import space.kscience.visionforge.bootstrap.canvasControls +import space.kscience.visionforge.bootstrap.card +import space.kscience.visionforge.bootstrap.gridRow +import space.kscience.visionforge.bootstrap.visionPropertyEditor +import space.kscience.visionforge.react.ThreeCanvasComponent +import space.kscience.visionforge.react.flexColumn +import space.kscience.visionforge.react.objectTree +import space.kscience.visionforge.solid.specifications.Camera +import space.kscience.visionforge.solid.specifications.Canvas3DOptions +import space.kscience.visionforge.solid.three.ThreeCanvas import styled.css import styled.styledDiv import kotlin.math.PI @@ -154,7 +154,7 @@ val MMApp = functionalComponent("Muon monitor") { props -> +"World" attrs { onClickFunction = { - selected = hep.dataforge.names.Name.EMPTY + selected = space.kscience.dataforge.names.Name.EMPTY } } } 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 0ec1c8a3..1047047d 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 @@ -1,15 +1,15 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.context.Global -import hep.dataforge.vision.Application -import hep.dataforge.vision.bootstrap.useBootstrap -import hep.dataforge.vision.startApplication import io.ktor.client.HttpClient import io.ktor.client.features.json.JsonFeature import io.ktor.client.features.json.serializer.KotlinxSerializer import kotlinx.browser.document import react.child import react.dom.render +import space.kscience.dataforge.context.Global +import space.kscience.visionforge.Application +import space.kscience.visionforge.bootstrap.useBootstrap +import space.kscience.visionforge.startApplication private class MMDemoApp : Application { diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt index 0b66e091..aa9dbbb2 100644 --- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt +++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt @@ -1,10 +1,10 @@ package ru.mipt.npm.muon.monitor.server -import hep.dataforge.context.Context -import hep.dataforge.context.Global -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.solid.Solids +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.solid.Solids import io.ktor.application.Application import io.ktor.application.call import io.ktor.application.install diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt index afa017d1..ca82dc87 100644 --- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt +++ b/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.vision.solid.Point3D +import space.kscience.visionforge.solid.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 diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt index 6f397312..a49fb3b2 100644 --- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt +++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt @@ -1,8 +1,8 @@ -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.plotly.usePlotly -import hep.dataforge.vision.solid.three.useThreeJs import kotlinx.browser.window +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.plotly.usePlotly +import space.kscience.visionforge.solid.three.useThreeJs @DFExperimental fun main(): Unit = VisionForge.run{ diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt index a486511b..823a8f19 100644 --- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt +++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.gdml.GdmlShowcase.cubes -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.invoke -import hep.dataforge.vision.solid.Solids +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.gdml.GdmlShowcase.cubes +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.invoke +import space.kscience.visionforge.solid.Solids @DFExperimental fun main() = VisionForge(Solids) { diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt index 416e83d1..9ab231e6 100644 --- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt +++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.gdml.toVision -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.invoke -import hep.dataforge.vision.solid.Solids +import space.kscience.dataforge.misc.DFExperimental import space.kscience.gdml.Gdml import space.kscience.gdml.LUnit import space.kscience.gdml.decodeFromStream +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.gdml.toVision +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.invoke +import space.kscience.visionforge.solid.Solids @DFExperimental fun main() = VisionForge(Solids) { diff --git a/demo/playground/src/jvmMain/kotlin/generateSchema.kt b/demo/playground/src/jvmMain/kotlin/generateSchema.kt index 1b48dbc8..75c6f9cd 100644 --- a/demo/playground/src/jvmMain/kotlin/generateSchema.kt +++ b/demo/playground/src/jvmMain/kotlin/generateSchema.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples import com.github.ricky12awesome.jss.encodeToSchema -import hep.dataforge.vision.solid.SolidGroup -import hep.dataforge.vision.solid.Solids import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json +import space.kscience.visionforge.solid.SolidGroup +import space.kscience.visionforge.solid.Solids @ExperimentalSerializationApi fun main() { diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt index 0341e73f..7da3d09b 100644 --- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt +++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.invoke -import hep.dataforge.vision.plotly.PlotlyPlugin -import hep.dataforge.vision.plotly.plotly -import kscience.plotly.scatter +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.plotly.scatter +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.invoke +import space.kscience.visionforge.plotly.PlotlyPlugin +import space.kscience.visionforge.plotly.plotly @DFExperimental fun main() = VisionForge(PlotlyPlugin) { diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt index 9526d318..04027052 100644 --- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt +++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.invoke -import hep.dataforge.vision.solid.* import kotlinx.html.h1 +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.invoke +import space.kscience.visionforge.solid.* import java.nio.file.Paths import kotlin.random.Random diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt index d5bfc0b4..285a14a2 100644 --- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt +++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.html.HtmlVisionFragment -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.page -import hep.dataforge.vision.html.scriptHeader -import hep.dataforge.vision.makeFile -import hep.dataforge.vision.three.server.VisionServer -import hep.dataforge.vision.three.server.useScript +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.html.HtmlVisionFragment +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.page +import space.kscience.visionforge.html.scriptHeader +import space.kscience.visionforge.makeFile +import space.kscience.visionforge.three.server.VisionServer +import space.kscience.visionforge.three.server.useScript import java.awt.Desktop import java.nio.file.Path diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt index 519738d7..3a90cfb8 100644 --- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt +++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.examples +package space.kscience.visionforge.examples -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.invoke -import hep.dataforge.vision.solid.Solids -import hep.dataforge.vision.solid.box -import hep.dataforge.vision.solid.solid +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.invoke +import space.kscience.visionforge.solid.Solids +import space.kscience.visionforge.solid.box +import space.kscience.visionforge.solid.solid @DFExperimental fun main() = VisionForge(Solids) { diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt index 76ac5391..c747f89b 100644 --- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt +++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt @@ -1,10 +1,10 @@ package ru.mipt.npm.sat -import hep.dataforge.meta.set -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.style -import hep.dataforge.vision.useStyle +import space.kscience.dataforge.meta.set +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.style +import space.kscience.visionforge.useStyle import kotlin.math.PI @DFExperimental diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt index 242d29d5..6651cc13 100644 --- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt +++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt @@ -1,17 +1,17 @@ package ru.mipt.npm.sat -import hep.dataforge.context.Global -import hep.dataforge.names.toName -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.three.server.* -import hep.dataforge.vision.visionManager import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.html.div import kotlinx.html.h1 +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.three.server.* +import space.kscience.visionforge.visionManager import kotlin.random.Random fun main() { diff --git a/demo/solid-showcase/build.gradle.kts b/demo/solid-showcase/build.gradle.kts index 6cdec7f0..a4b38e82 100644 --- a/demo/solid-showcase/build.gradle.kts +++ b/demo/solid-showcase/build.gradle.kts @@ -44,5 +44,5 @@ kotlin { } application { - mainClassName = "hep.dataforge.vision.solid.demo.FXDemoAppKt" + mainClassName = "space.kscience.visionforge.solid.demo.FXDemoAppKt" } \ No newline at end of file diff --git a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt similarity index 91% rename from demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt rename to demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt index 6ede2c08..c5cf2a56 100644 --- a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt +++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo -import hep.dataforge.meta.Meta -import hep.dataforge.meta.invoke -import hep.dataforge.names.toName -import hep.dataforge.vision.Colors -import hep.dataforge.vision.VisionLayout -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.solid.specifications.Canvas3DOptions -import hep.dataforge.vision.visible import kotlinx.coroutines.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.invoke +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Colors +import space.kscience.visionforge.VisionLayout +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.solid.specifications.Canvas3DOptions +import space.kscience.visionforge.visible import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt similarity index 84% rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt index 8a2bcdd0..c5d2c2cf 100644 --- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt +++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo -import hep.dataforge.vision.Application -import hep.dataforge.vision.solid.x -import hep.dataforge.vision.solid.y -import hep.dataforge.vision.startApplication import kotlinx.browser.document import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +import space.kscience.visionforge.Application +import space.kscience.visionforge.solid.x +import space.kscience.visionforge.solid.y +import space.kscience.visionforge.startApplication import kotlin.random.Random private class ThreeDemoApp : Application { diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt similarity index 81% rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt index 92d63d16..65dd35db 100644 --- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt +++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt @@ -1,14 +1,5 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo -import hep.dataforge.context.Global -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.string -import hep.dataforge.names.Name -import hep.dataforge.vision.VisionLayout -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.three.ThreeCanvas -import hep.dataforge.vision.solid.three.ThreePlugin import kotlinx.browser.document import kotlinx.dom.clear import kotlinx.html.dom.append @@ -18,6 +9,15 @@ import kotlinx.html.style import org.w3c.dom.Element import org.w3c.dom.HTMLDivElement import org.w3c.dom.HTMLElement +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.Name +import space.kscience.visionforge.VisionLayout +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.three.ThreeCanvas +import space.kscience.visionforge.solid.three.ThreePlugin class ThreeDemoGrid(element: Element) : VisionLayout { private lateinit var navigationElement: HTMLElement diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt similarity index 84% rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt index e90cc845..b6f0fd5c 100644 --- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt +++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt @@ -1,20 +1,21 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo -import hep.dataforge.meta.* -import hep.dataforge.names.plus -import hep.dataforge.names.startsWith -import hep.dataforge.values.asValue -import hep.dataforge.vision.getProperty -import hep.dataforge.vision.onPropertyChange -import hep.dataforge.vision.set -import hep.dataforge.vision.setProperty -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY -import hep.dataforge.vision.solid.three.* import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.BoxBufferGeometry import info.laht.threekt.objects.Mesh +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.meta.number +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.startsWith +import space.kscience.dataforge.values.asValue +import space.kscience.visionforge.getProperty +import space.kscience.visionforge.onPropertyChange +import space.kscience.visionforge.set +import space.kscience.visionforge.setProperty +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.solid.Solid.Companion.GEOMETRY_KEY +import space.kscience.visionforge.solid.three.* import kotlin.math.max internal fun SolidGroup.varBox( diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt similarity index 87% rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt index 0491941c..1ed557ea 100644 --- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt +++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo import javafx.stage.Stage import tornadofx.* diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt similarity index 65% rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt index 62b9cc20..fdcaca2e 100644 --- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt +++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid.demo +package space.kscience.visionforge.solid.demo -import hep.dataforge.context.Global -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.vision.VisionLayout -import hep.dataforge.vision.solid.FX3DPlugin -import hep.dataforge.vision.solid.FXCanvas3D -import hep.dataforge.vision.solid.Solid import javafx.collections.FXCollections import javafx.scene.Parent import javafx.scene.control.Tab +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.visionforge.VisionLayout +import space.kscience.visionforge.solid.FX3DPlugin +import space.kscience.visionforge.solid.FXCanvas3D +import space.kscience.visionforge.solid.Solid import tornadofx.* class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout { diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt similarity index 74% rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt index 888812a4..fc231c38 100644 --- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt +++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.demo +package space.kscience.visionforge.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.vision.editor.ConfigEditor -import hep.dataforge.vision.editor.FXMeta -import hep.dataforge.vision.editor.MetaViewer import javafx.geometry.Orientation +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.asConfig +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.values.ValueType +import space.kscience.visionforge.editor.ConfigEditor +import space.kscience.visionforge.editor.FXMeta +import space.kscience.visionforge.editor.MetaViewer import tornadofx.* diff --git a/settings.gradle.kts b/settings.gradle.kts index 817e2525..b85d49a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { - val kotlinVersion = "1.4.30" - val toolsVersion = "0.8.3" + val kotlinVersion = "1.4.31" + val toolsVersion = "0.9.0" repositories { maven("https://repo.kotlin.link") diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt similarity index 99% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt index aa9ac5e1..2f924ecc 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap public fun useBootstrap(){ kotlinext.js.require("bootstrap/dist/css/bootstrap.min.css") diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt similarity index 93% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt index 69585627..604eaec1 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt @@ -1,9 +1,5 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap -import hep.dataforge.vision.react.flexColumn -import hep.dataforge.vision.react.flexRow -import hep.dataforge.vision.solid.SolidGroup -import hep.dataforge.vision.solid.three.ThreeCanvas import kotlinx.css.* import kotlinx.css.properties.border import kotlinx.html.InputType @@ -18,6 +14,10 @@ import react.dom.button import react.dom.h3 import react.dom.input import react.dom.label +import space.kscience.visionforge.react.flexColumn +import space.kscience.visionforge.react.flexRow +import space.kscience.visionforge.solid.SolidGroup +import space.kscience.visionforge.solid.three.ThreeCanvas import styled.css import styled.styledDiv diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt similarity index 96% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt index d17dcac3..dca591fe 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt @@ -1,8 +1,5 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.length import kotlinx.html.ButtonType import kotlinx.html.DIV import kotlinx.html.id @@ -10,6 +7,9 @@ import kotlinx.html.js.onClickFunction import react.RBuilder import react.ReactElement import react.dom.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.length import styled.StyledDOMBuilder import styled.css import styled.styledDiv diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt similarity index 95% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt index fa61d3d4..1f29be59 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt @@ -1,6 +1,5 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap -import hep.dataforge.vision.react.flexColumn import kotlinx.html.DIV import kotlinx.html.classes import kotlinx.html.js.onClickFunction @@ -8,6 +7,7 @@ import react.* import react.dom.button import react.dom.li import react.dom.ul +import space.kscience.visionforge.react.flexColumn import styled.StyledDOMBuilder import styled.styledDiv diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt similarity index 85% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt index 33b94244..a0af57aa 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap -import hep.dataforge.names.Name -import hep.dataforge.names.isEmpty -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.react.objectTree -import hep.dataforge.vision.solid.three.ThreeCanvas import kotlinx.css.* import kotlinx.css.properties.border import react.* import react.dom.h2 +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.isEmpty +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionGroup +import space.kscience.visionforge.react.objectTree +import space.kscience.visionforge.solid.three.ThreeCanvas import styled.css import styled.styledDiv diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt similarity index 80% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt index 8156c412..7f28473e 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt +++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.bootstrap +package space.kscience.visionforge.bootstrap -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.vision.* -import hep.dataforge.vision.react.metaViewer -import hep.dataforge.vision.react.propertyEditor - import hep.dataforge.vision.solid.SolidReference import org.w3c.dom.Element import react.RBuilder import react.dom.render +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.visionforge.* +import space.kscience.visionforge.react.metaViewer +import space.kscience.visionforge.react.propertyEditor +import space.kscience.visionforge.solid.SolidReference public fun RBuilder.visionPropertyEditor( vision: Vision, diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt index eae580ab..1ad3f280 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.material +package space.kscience.visionforge.material //@JsModule("@material-ui/icons/ExpandMore") //external class ExpandMoreIcon : Component{ diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt index 72dcaf4a..a093c043 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.material +package space.kscience.visionforge.material -import hep.dataforge.vision.react.component -import hep.dataforge.vision.react.state +import space.kscience.visionforge.react.component +import space.kscience.visionforge.react.state import kotlinx.html.DIV import materialui.components.card.card import materialui.components.cardcontent.cardContent diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt index 22d56684..d90d2904 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.material +package space.kscience.visionforge.material -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.names.toName -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.isEmpty -import hep.dataforge.vision.react.component -import hep.dataforge.vision.react.state +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionGroup +import space.kscience.visionforge.isEmpty +import space.kscience.visionforge.react.component +import space.kscience.visionforge.react.state import kotlinx.html.UL import materialui.lab.components.treeItem.treeItem import materialui.lab.components.treeView.SingleSelectTreeViewElementBuilder diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt similarity index 87% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt index 14cb4bc1..106ebd8b 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt @@ -1,21 +1,21 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaItemNode -import hep.dataforge.meta.MetaItemValue -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.defaultItem -import hep.dataforge.meta.descriptors.get -import hep.dataforge.meta.get -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.lastOrNull -import hep.dataforge.names.plus import kotlinx.html.js.onClickFunction import org.w3c.dom.events.Event import react.* import react.dom.a +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaItemNode +import space.kscience.dataforge.meta.MetaItemValue +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.defaultItem +import space.kscience.dataforge.meta.descriptors.get +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.lastOrNull +import space.kscience.dataforge.names.plus import styled.* public external interface MetaViewerProps : RProps { diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt similarity index 90% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt index 5faab7ba..d4d295c1 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react -import hep.dataforge.names.Name -import hep.dataforge.names.lastOrNull -import hep.dataforge.names.plus -import hep.dataforge.names.startsWith -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.isEmpty import kotlinx.html.js.onClickFunction import org.w3c.dom.events.Event import react.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.lastOrNull +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.startsWith +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionGroup +import space.kscience.visionforge.isEmpty import styled.* public external interface ObjectTreeProps : RProps { diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt similarity index 92% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt index dbee8a29..050378a3 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt @@ -1,13 +1,5 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.* -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.lastOrNull -import hep.dataforge.names.plus -import hep.dataforge.values.Value -import hep.dataforge.vision.hidden import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.GlobalScope @@ -22,6 +14,17 @@ import org.w3c.dom.Element import org.w3c.dom.events.Event import react.* import react.dom.render +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.meta.descriptors.get +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.lastOrNull +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.values.Value +import space.kscience.visionforge.hidden import styled.* public external interface PropertyEditorProps : RProps { diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt similarity index 81% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt index 877ce5bc..8a3758c8 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt @@ -1,16 +1,16 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react -import hep.dataforge.context.Context -import hep.dataforge.names.Name -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.specifications.Canvas3DOptions -import hep.dataforge.vision.solid.three.ThreeCanvas -import hep.dataforge.vision.solid.three.ThreePlugin import kotlinx.css.Display import kotlinx.css.display import org.w3c.dom.Element import org.w3c.dom.HTMLElement import react.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.names.Name +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.specifications.Canvas3DOptions +import space.kscience.visionforge.solid.three.ThreeCanvas +import space.kscience.visionforge.solid.three.ThreePlugin import styled.css import styled.styledDiv diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt similarity index 98% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt index 16602699..654c31eb 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react import kotlinx.css.* import kotlinx.css.properties.* diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt similarity index 94% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt index cdafb527..2f35bb24 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react import kotlinx.css.Display import kotlinx.css.FlexDirection diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt similarity index 94% rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt index 6c043e19..feab99d8 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt +++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt @@ -1,11 +1,5 @@ -package hep.dataforge.vision.react +package space.kscience.visionforge.react -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.names.Name -import hep.dataforge.values.* -import hep.dataforge.vision.Colors -import hep.dataforge.vision.widgetType import kotlinx.html.InputType import kotlinx.html.js.onChangeFunction import kotlinx.html.js.onKeyDownFunction @@ -14,6 +8,12 @@ import org.w3c.dom.HTMLSelectElement import org.w3c.dom.events.Event import react.* import react.dom.option +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.values.* +import space.kscience.visionforge.Colors +import space.kscience.visionforge.widgetType import styled.styledInput import styled.styledSelect diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts index 05e9d619..d33d733d 100644 --- a/visionforge-core/build.gradle.kts +++ b/visionforge-core/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { sourceSets { commonMain { dependencies { - api("hep.dataforge:dataforge-context:$dataforgeVersion") + api("space.kscience:dataforge-context:$dataforgeVersion") api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion") api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion") } diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt deleted file mode 100644 index ae86a0c8..00000000 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt +++ /dev/null @@ -1,8 +0,0 @@ -package hep.dataforge.vision - -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name - -public interface VisionLayout { - public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY) -} \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt similarity index 97% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt index c69e69fa..3f228272 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.values.ValueType -import hep.dataforge.values.int -import hep.dataforge.values.string +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.int +import space.kscience.dataforge.values.string import kotlin.math.max /** diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt similarity index 84% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt index 045f7879..e25315aa 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.misc.DFExperimental import kotlin.properties.ReadOnlyProperty /** diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt similarity index 92% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt index e5f30854..cdfe2a07 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.asName -import hep.dataforge.names.plus +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus /** * A container for styles diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt similarity index 89% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt index 7314b6c2..9ca20f6b 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt @@ -1,18 +1,18 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.Described -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.get -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.toName -import hep.dataforge.vision.Vision.Companion.TYPE import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.Described +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.get +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Vision.Companion.TYPE /** * A root type for display hierarchy diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt similarity index 87% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt index f083e2c1..8b15493f 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt @@ -1,16 +1,5 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.defaultItem -import hep.dataforge.meta.descriptors.get -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.values.Null -import hep.dataforge.values.ValueType -import hep.dataforge.vision.Vision.Companion.STYLE_KEY import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.flow.Flow @@ -19,6 +8,17 @@ import kotlinx.coroutines.launch import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.defaultItem +import space.kscience.dataforge.meta.descriptors.get +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.ValueType +import space.kscience.visionforge.Vision.Companion.STYLE_KEY import kotlin.jvm.Synchronized internal data class PropertyListener( diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt similarity index 94% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt index 9943b6aa..25e0dc8e 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt @@ -1,16 +1,16 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.values.Null import kotlinx.coroutines.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.values.Null import kotlin.jvm.Synchronized import kotlin.time.Duration diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt similarity index 55% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt index 54332115..90158f9e 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.Context -import hep.dataforge.context.PluginManager -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.PluginManager +import space.kscience.dataforge.misc.DFExperimental public expect object VisionForge diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt similarity index 93% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt index de33a779..fa22d072 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.names.* -import hep.dataforge.provider.Provider import kotlinx.coroutines.flow.Flow +import space.kscience.dataforge.names.* +import space.kscience.dataforge.provider.Provider public interface VisionContainer { public operator fun get(name: Name): V? diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt similarity index 98% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt index 3525ac88..f7f703ab 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.names.* import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.launch import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient +import space.kscience.dataforge.names.* /** diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt new file mode 100644 index 00000000..1a0fddfc --- /dev/null +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt @@ -0,0 +1,8 @@ +package space.kscience.visionforge + +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name + +public interface VisionLayout { + public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY) +} \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt similarity index 89% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt index 210906f1..65f16961 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt @@ -1,16 +1,19 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.* -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.names.Name -import hep.dataforge.names.toName import kotlinx.serialization.PolymorphicSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass +import space.kscience.dataforge.context.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.node +import space.kscience.dataforge.meta.toJson +import space.kscience.dataforge.meta.toMetaItem +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.reflect.KClass public class VisionManager(meta: Meta) : AbstractPlugin(meta) { diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt similarity index 77% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt index a8b3ecad..68567ee3 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.MetaItem -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.MetaItem +import space.kscience.dataforge.names.Name /** * Property containers are used to create a symmetric behaviors for vision properties and style builders diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt similarity index 71% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt index 4de488c8..b57db4a5 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge import kotlinx.html.FlowContent import kotlinx.html.TagConsumer +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge public typealias HtmlFragment = TagConsumer<*>.() -> Unit diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt similarity index 70% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt index f66d38be..ac1642b8 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.context.Context -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.context -import hep.dataforge.vision.visionManager import kotlinx.html.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.context +import space.kscience.visionforge.visionManager public data class Page( public val context: Context, diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt similarity index 88% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt index c1c26818..1ceaee36 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.MetaSerializer -import hep.dataforge.meta.isEmpty -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionManager import kotlinx.html.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.MetaSerializer +import space.kscience.dataforge.meta.isEmpty +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionManager import kotlin.collections.set diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt similarity index 88% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt index ebe63603..e246572e 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionManager import kotlinx.html.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionManager public fun TagConsumer<*>.embedVisionFragment( diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt similarity index 84% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt index b4c3c326..8e51e537 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.values.asValue +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.values.asValue @DslMarker public annotation class VisionBuilder diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt similarity index 79% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt index 59001d15..e058c3c6 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.meta.descriptors.attributes -import hep.dataforge.names.Name -import hep.dataforge.values.ValueType -import hep.dataforge.values.asValue +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.meta.descriptors.attributes +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.asValue private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited" private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles" diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt similarity index 85% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt index e4a027c9..0a60c3c0 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.visitor +package space.kscience.visionforge.visitor -import hep.dataforge.names.Name -import hep.dataforge.names.length -import hep.dataforge.vision.Vision import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.length +import space.kscience.visionforge.Vision import kotlin.reflect.KClass diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt similarity index 87% rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt index 4b6e480e..0533dc4e 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt +++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.visitor +package space.kscience.visionforge.visitor -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionGroup import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionGroup public interface VisionVisitor { /** diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt similarity index 83% rename from visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt rename to visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt index ae19ab16..bbbd6c8b 100644 --- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt +++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.meta.set -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionBase -import hep.dataforge.vision.configure -import hep.dataforge.vision.meta import kotlinx.html.* import kotlinx.html.stream.createHTML +import space.kscience.dataforge.meta.set +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionBase +import space.kscience.visionforge.configure +import space.kscience.visionforge.meta import kotlin.test.Test @DFExperimental diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt similarity index 98% rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt index 78f6acc8..f9ba8e46 100644 --- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision +package space.kscience.visionforge import kotlinx.browser.document import kotlinx.dom.hasClass diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt similarity index 92% rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt index 2933f01d..85c3c9de 100644 --- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt @@ -1,13 +1,5 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.* -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaSerializer -import hep.dataforge.vision.html.VisionTagConsumer -import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE -import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE -import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE -import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE import kotlinx.browser.document import kotlinx.browser.window import org.w3c.dom.Element @@ -15,6 +7,14 @@ import org.w3c.dom.WebSocket import org.w3c.dom.asList import org.w3c.dom.get import org.w3c.dom.url.URL +import space.kscience.dataforge.context.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaSerializer +import space.kscience.visionforge.html.VisionTagConsumer +import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE +import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE +import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE +import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE import kotlin.collections.set import kotlin.reflect.KClass diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt similarity index 87% rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt index 809f60ef..555e4627 100644 --- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.meta.Meta -import hep.dataforge.misc.Type import org.w3c.dom.Element +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.Type @Type(ElementVisionRenderer.TYPE) public interface ElementVisionRenderer { diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt similarity index 91% rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt index a1f40a4d..fbcca4ec 100644 --- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt +++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.Context -import hep.dataforge.misc.DFExperimental import kotlinx.browser.document import kotlinx.browser.window +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.misc.DFExperimental @JsExport @DFExperimental diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt similarity index 97% rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt index ac9f7127..6bf8be49 100644 --- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt +++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.html +package space.kscience.visionforge.html -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionManager import kotlinx.html.link import kotlinx.html.script import kotlinx.html.unsafe +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionManager import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardOpenOption diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt similarity index 89% rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt index 70fe0bab..63f405c3 100644 --- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt +++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt @@ -1,11 +1,9 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.Context -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.html.HtmlFragment -import hep.dataforge.vision.html.HtmlVisionFragment -import hep.dataforge.vision.html.Page import kotlinx.html.stream.createHTML +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.html.HtmlFragment +import space.kscience.visionforge.html.Page import java.awt.Desktop import java.nio.file.Files import java.nio.file.Path diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt similarity index 68% rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt index be2533cc..6d2802b7 100644 --- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt +++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.Context -import hep.dataforge.context.PluginFactory -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.misc.DFExperimental public actual object VisionForge diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt similarity index 88% rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt index 716f888e..9c3286fe 100644 --- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt +++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.visitor +package space.kscience.visionforge.visitor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt similarity index 93% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt index 11176bf6..5e7994ef 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt @@ -1,8 +1,5 @@ -package hep.dataforge.vision +package space.kscience.visionforge -import hep.dataforge.context.* -import hep.dataforge.meta.Meta -import hep.dataforge.meta.boolean import javafx.application.Application import javafx.application.Platform import javafx.collections.FXCollections @@ -12,6 +9,9 @@ import javafx.scene.Scene import javafx.scene.image.Image import javafx.scene.image.ImageView import javafx.stage.Stage +import space.kscience.dataforge.context.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.boolean import tornadofx.* import kotlin.concurrent.thread import kotlin.reflect.KClass @@ -46,7 +46,7 @@ public class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) { if (FX.getApplication(FX.defaultScope) == null) { if (consoleMode) { thread(name = "${context.name} FX application thread") { - context.logger.debug("Starting FX application surrogate") + context.logger.debug{"Starting FX application surrogate"} launch() } diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt similarity index 77% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt index 3fb053e5..442c299f 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.Null -import hep.dataforge.values.Value -import hep.dataforge.values.asValue -import hep.dataforge.values.string import javafx.scene.control.ColorPicker import javafx.scene.paint.Color import org.slf4j.LoggerFactory +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.asValue +import space.kscience.dataforge.values.string import tornadofx.* /** diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt similarity index 81% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt index dc1e80ac..a3d5c942 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt @@ -3,19 +3,19 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.value -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.Value -import hep.dataforge.values.parseValue -import hep.dataforge.values.string import javafx.collections.FXCollections import javafx.scene.control.ComboBox import javafx.util.StringConverter +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.value +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.parseValue +import space.kscience.dataforge.values.string import java.util.* public class ComboBoxValueChooser(public val values: Collection? = null) : ValueChooserBase>() { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt similarity index 96% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt index 2d48b5d1..76d32f57 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt @@ -3,15 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView -import hep.dataforge.context.Global -import hep.dataforge.meta.Config -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.names.NameToken -import hep.dataforge.vision.dfIconView import javafx.scene.Node import javafx.scene.control.* import javafx.scene.control.cell.TextFieldTreeTableCell @@ -20,6 +15,11 @@ import javafx.scene.layout.HBox import javafx.scene.layout.Priority import javafx.scene.paint.Color import javafx.scene.text.Text +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.Config +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.names.NameToken +import space.kscience.visionforge.dfIconView import tornadofx.* /** diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt similarity index 94% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt index 150b5bb8..3e2cfc8d 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt @@ -1,18 +1,18 @@ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.names.* -import hep.dataforge.values.Null -import hep.dataforge.values.Value import javafx.beans.binding.ListBinding import javafx.beans.binding.ObjectBinding import javafx.beans.property.SimpleObjectProperty import javafx.beans.value.ObservableBooleanValue import javafx.beans.value.ObservableStringValue import javafx.collections.ObservableList +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.names.* +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.Value import tornadofx.* /** diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt similarity index 92% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt index 88079731..1a822793 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.Meta -import hep.dataforge.values.string -import hep.dataforge.vision.dfIconView import javafx.beans.property.SimpleStringProperty import javafx.scene.control.TreeItem import javafx.scene.control.TreeSortMode import javafx.scene.control.TreeTableView +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.values.string +import space.kscience.visionforge.dfIconView import tornadofx.* class MetaViewer(val rootNode: FXMetaNode<*>, title: String = "Meta viewer") : Fragment(title, diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt similarity index 93% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt index e6cff8fe..ea55fc83 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.* import javafx.beans.value.ObservableValue import javafx.scene.control.TextField import javafx.scene.input.KeyCode import javafx.scene.input.KeyEvent +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.* import tornadofx.* class TextValueChooser : ValueChooserBase() { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt similarity index 86% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt index c7c7dd8d..32a0d741 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.values.Value +import space.kscience.dataforge.values.Value /** diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt similarity index 85% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt index 1530484a..c3796fa0 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt @@ -3,22 +3,22 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.context.Context -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.misc.Named -import hep.dataforge.misc.Type -import hep.dataforge.names.toName -import hep.dataforge.provider.provideByType -import hep.dataforge.values.Null -import hep.dataforge.values.Value -import hep.dataforge.vision.widget -import hep.dataforge.vision.widgetType import javafx.beans.property.ObjectProperty import javafx.beans.value.ObservableValue import javafx.scene.Node +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.provider.provideByType +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.Value +import space.kscience.visionforge.widget +import space.kscience.visionforge.widgetType import tornadofx.* /** @@ -63,7 +63,7 @@ public interface ValueChooser { public fun setCallback(callback: ValueCallback) - @Type("hep.dataforge.vis.fx.valueChooserFactory") + @Type("space.kscience.dataforge.vis.fx.valueChooserFactory") public interface Factory : Named { public operator fun invoke(meta: Meta = Meta.EMPTY): ValueChooser } diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt similarity index 89% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt index b05fb4fb..81dc42ac 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt @@ -3,14 +3,14 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.values.Null -import hep.dataforge.values.Value import javafx.beans.property.SimpleObjectProperty import javafx.scene.Node import org.slf4j.LoggerFactory +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.Value import tornadofx.* /** diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt similarity index 87% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt index 762c8090..929c7e85 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt @@ -1,13 +1,16 @@ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.vision.* import javafx.beans.binding.Binding import javafx.beans.property.SimpleObjectProperty import javafx.scene.Node import javafx.scene.Parent import javafx.scene.layout.VBox +import space.kscience.dataforge.meta.Config +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MutableItemProvider +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.update +import space.kscience.visionforge.* import tornadofx.* class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt similarity index 93% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt index 409fa1ff..f1faaf1a 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.editor +package space.kscience.visionforge.editor -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionGroup import javafx.beans.property.SimpleObjectProperty import javafx.scene.control.SelectionMode import javafx.scene.control.TreeItem +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionGroup import tornadofx.* private fun toTreeItem(vision: Vision, title: String): TreeItem> { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt similarity index 92% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt index 3cf8dec4..6bd56fcf 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt @@ -1,12 +1,5 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.context.* -import hep.dataforge.meta.Meta -import hep.dataforge.meta.boolean -import hep.dataforge.misc.Type -import hep.dataforge.vision.solid.FX3DFactory.Companion.TYPE -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY import javafx.scene.Group import javafx.scene.Node import javafx.scene.shape.CullFace @@ -19,6 +12,13 @@ import org.fxyz3d.geometry.Point3D import org.fxyz3d.shapes.composites.PolyLine3D import org.fxyz3d.shapes.primitives.CuboidMesh import org.fxyz3d.shapes.primitives.SpheroidMesh +import space.kscience.dataforge.context.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.boolean +import space.kscience.dataforge.misc.Type +import space.kscience.visionforge.solid.FX3DFactory.Companion.TYPE +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY import kotlin.collections.set import kotlin.math.PI import kotlin.reflect.KClass diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt similarity index 91% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt index 8cef5208..171bc5a3 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.context.Context -import hep.dataforge.context.ContextAware -import hep.dataforge.vision.solid.specifications.Canvas3DOptions import javafx.application.Platform import javafx.beans.property.ObjectProperty import javafx.beans.property.SimpleObjectProperty import javafx.scene.* import javafx.scene.paint.Color import org.fxyz3d.scene.Axes +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.ContextAware +import space.kscience.visionforge.solid.specifications.Canvas3DOptions import tornadofx.* class FXCanvas3D( diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt similarity index 95% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt index 4a485529..5aa7619e 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid import eu.mihosoft.jcsg.CSG import eu.mihosoft.jcsg.Polygon @@ -8,8 +8,6 @@ import javafx.scene.Node import javafx.scene.shape.MeshView import javafx.scene.shape.TriangleMesh import javafx.scene.shape.VertexFormat -import java.util.* -import kotlin.collections.HashMap import kotlin.reflect.KClass private fun MeshView.toCSG(): CSG { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt similarity index 92% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt index f8f6fc32..f2bbba54 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid import eu.mihosoft.jcsg.PropertyStorage import eu.mihosoft.jcsg.ext.quickhull3d.HullUtil diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt similarity index 88% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt index 3f384f63..aa02d1ca 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.* -import hep.dataforge.values.ValueType -import hep.dataforge.values.int -import hep.dataforge.values.string -import hep.dataforge.vision.Colors import javafx.scene.paint.Color import javafx.scene.paint.Material import javafx.scene.paint.PhongMaterial +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.int +import space.kscience.dataforge.values.string +import space.kscience.visionforge.Colors public object FXMaterials { public val RED: PhongMaterial = PhongMaterial().apply { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt similarity index 90% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt index 9b785323..dc72f7f1 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.names.* -import hep.dataforge.vision.Vision -import hep.dataforge.vision.onPropertyChange import javafx.scene.Group import javafx.scene.Node +import space.kscience.dataforge.names.* +import space.kscience.visionforge.Vision +import space.kscience.visionforge.onPropertyChange import kotlin.reflect.KClass class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt similarity index 95% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt index fa8ce279..ad88aac0 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.Meta import javafx.scene.shape.Mesh import javafx.scene.shape.MeshView import javafx.scene.shape.TriangleMesh import javafx.scene.shape.VertexFormat import org.fxyz3d.geometry.Face3 +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KClass object FXShapeFactory : FX3DFactory { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt similarity index 97% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt index 498c756f..47c3c8e8 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid import javafx.beans.InvalidationListener import javafx.beans.property.SimpleDoubleProperty @@ -14,7 +14,7 @@ import javafx.scene.transform.Rotate import javafx.scene.transform.Translate import tornadofx.* import kotlin.math.* -import hep.dataforge.vision.solid.specifications.Camera as CameraSpec +import space.kscience.visionforge.solid.specifications.Camera as CameraSpec class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt similarity index 86% rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt index 2a47b447..5ab8fa70 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt +++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.* -import hep.dataforge.names.Name -import hep.dataforge.names.startsWith -import hep.dataforge.names.toName -import hep.dataforge.values.Value -import hep.dataforge.vision.Vision -import hep.dataforge.vision.onPropertyChange import javafx.application.Platform import javafx.beans.binding.Binding import javafx.beans.binding.ObjectBinding +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.startsWith +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.values.Value +import space.kscience.visionforge.Vision +import space.kscience.visionforge.onPropertyChange import tornadofx.* /** diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt similarity index 90% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt index 02915331..a35e845c 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt +++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.meta.itemSequence -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.Vision -import hep.dataforge.vision.meta -import hep.dataforge.vision.solid.* +import space.kscience.dataforge.meta.itemSequence +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.Vision +import space.kscience.visionforge.meta +import space.kscience.visionforge.solid.* public expect class Counter() { public fun get(): Int diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt similarity index 98% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt index ae253996..b677e124 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt +++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml import space.kscience.gdml.* diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt similarity index 95% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt index 435ea98d..f9bba939 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt +++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt @@ -1,18 +1,18 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.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.plus -import hep.dataforge.names.toName -import hep.dataforge.vision.set -import hep.dataforge.vision.setProperty -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY -import hep.dataforge.vision.styleSheet -import hep.dataforge.vision.useStyle +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName import space.kscience.gdml.* +import space.kscience.visionforge.set +import space.kscience.visionforge.setProperty +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY +import space.kscience.visionforge.styleSheet +import space.kscience.visionforge.useStyle import kotlin.math.cos import kotlin.math.sin import kotlin.random.Random diff --git a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt index ca6f71ab..22f12553 100644 --- a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt +++ b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt @@ -1,16 +1,16 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.context.Context -import hep.dataforge.names.toName -import hep.dataforge.vision.Vision -import hep.dataforge.vision.gdml.GdmlShowcase.cubes -import hep.dataforge.vision.get -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.visionManager +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.names.toName import space.kscience.gdml.Gdml import space.kscience.gdml.GdmlBox import space.kscience.gdml.decodeFromString import space.kscience.gdml.encodeToString +import space.kscience.visionforge.Vision +import space.kscience.visionforge.gdml.GdmlShowcase.cubes +import space.kscience.visionforge.get +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.visionManager import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt b/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt similarity index 79% rename from visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt rename to visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt index 87b0f63c..f90eec29 100644 --- a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt +++ b/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml public actual class Counter { private var count: Int = 0 diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt similarity index 83% rename from visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt rename to visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt index e9fd2a58..310631ce 100644 --- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt +++ b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.vision.solid.SolidGroup import space.kscience.gdml.Gdml import space.kscience.gdml.decodeFromFile +import space.kscience.visionforge.solid.SolidGroup import java.nio.file.Path import java.util.concurrent.atomic.AtomicInteger diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt similarity index 90% rename from visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt rename to visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt index 1d199c0d..730adfa9 100644 --- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt +++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.names.toName -import hep.dataforge.vision.solid.Solids import org.junit.jupiter.api.Test +import space.kscience.dataforge.names.toName import space.kscience.gdml.Gdml import space.kscience.gdml.decodeFromStream +import space.kscience.visionforge.solid.Solids import kotlin.test.assertNotNull @Suppress("UNUSED_VARIABLE") diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt similarity index 84% rename from visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt rename to visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt index e08cb09c..b61a7813 100644 --- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt +++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.gdml +package space.kscience.visionforge.gdml -import hep.dataforge.vision.solid.prototype -import hep.dataforge.vision.visitor.countDistinct -import hep.dataforge.vision.visitor.flowStatistics import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import nl.adaptivity.xmlutil.StAXReader import space.kscience.gdml.Gdml +import space.kscience.visionforge.solid.prototype +import space.kscience.visionforge.visitor.countDistinct +import space.kscience.visionforge.visitor.flowStatistics import java.io.File import kotlin.reflect.KClass diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts index 3e197394..4f8b04db 100644 --- a/visionforge-plotly/build.gradle.kts +++ b/visionforge-plotly/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("ru.mipt.npm.gradle.mpp") } -val plotlyVersion = "0.3.1" +val plotlyVersion = "0.4.0-dev-1" kscience{ useSerialization() @@ -34,7 +34,7 @@ kotlin { commonMain { dependencies { api(project(":visionforge-core")) - api("kscience.plotlykt:plotlykt-core:${plotlyVersion}") + api("space.kscience:plotlykt-core:${plotlyVersion}") } } } diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt deleted file mode 100644 index 7c6f527b..00000000 --- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt +++ /dev/null @@ -1,19 +0,0 @@ -package hep.dataforge.vision.plotly - -import hep.dataforge.meta.Config -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionBase -import hep.dataforge.vision.html.VisionOutput -import kotlinx.serialization.Serializable -import kscience.plotly.Plot -import kscience.plotly.Plotly - -@Serializable -public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){ - public val plot: Plot get() = Plot(plotConfig) -} - -public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config) - -@DFExperimental -public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config) \ No newline at end of file diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt similarity index 63% rename from visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt rename to visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt index 58f39f52..84e3b5d1 100644 --- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt +++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.plotly +package space.kscience.visionforge.plotly -import hep.dataforge.context.PluginFactory -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.VisionPlugin -import hep.dataforge.vision.plugins import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.VisionPlugin +import space.kscience.visionforge.plugins public expect class PlotlyPlugin : VisionPlugin{ public companion object: PluginFactory diff --git a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt new file mode 100644 index 00000000..c9d6db78 --- /dev/null +++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt @@ -0,0 +1,19 @@ +package space.kscience.visionforge.plotly + +import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.Config +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.plotly.Plot +import space.kscience.plotly.Plotly +import space.kscience.visionforge.VisionBase +import space.kscience.visionforge.html.VisionOutput + +@Serializable +public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){ + public val plot: Plot get() = Plot(plotConfig) +} + +public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config) + +@DFExperimental +public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config) \ No newline at end of file diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt similarity index 70% rename from visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt rename to visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt index 790844b6..317a6930 100644 --- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt +++ b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt @@ -1,19 +1,19 @@ -package hep.dataforge.vision.plotly +package space.kscience.visionforge.plotly -import hep.dataforge.context.Context -import hep.dataforge.context.PluginFactory -import hep.dataforge.context.PluginTag -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.vision.ElementVisionRenderer -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionClient -import hep.dataforge.vision.VisionPlugin import kotlinx.serialization.modules.SerializersModule -import kscience.plotly.PlotlyConfig -import kscience.plotly.plot import org.w3c.dom.Element +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.context.PluginTag +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.plotly.PlotlyConfig +import space.kscience.plotly.plot +import space.kscience.visionforge.ElementVisionRenderer +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionClient +import space.kscience.visionforge.VisionPlugin import kotlin.reflect.KClass public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer { diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt similarity index 65% rename from visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt rename to visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt index 65ad8a91..fe966172 100644 --- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt +++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.plotly +package space.kscience.visionforge.plotly -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.html.HtmlFragment -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.scriptHeader import kotlinx.html.script import kotlinx.html.unsafe +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.html.HtmlFragment +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.scriptHeader import java.nio.file.Path internal val plotlyScriptLocation = "js/visionforge-three.js" @@ -24,7 +24,7 @@ public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): Htm type = "text/javascript" unsafe { //language=JavaScript - +"hep.dataforge.vision.plotly.loadPlotly()" + +"space.kscience.visionforge.plotly.loadPlotly()" } } } diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt similarity index 65% rename from visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt rename to visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt index 29687288..21522664 100644 --- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt +++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.plotly +package space.kscience.visionforge.plotly -import hep.dataforge.context.Context -import hep.dataforge.context.Plugin -import hep.dataforge.context.PluginFactory -import hep.dataforge.context.PluginTag -import hep.dataforge.meta.Meta -import hep.dataforge.vision.VisionPlugin import kotlinx.serialization.modules.SerializersModule +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.Plugin +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.context.PluginTag +import space.kscience.dataforge.meta.Meta +import space.kscience.visionforge.VisionPlugin import kotlin.reflect.KClass public actual class PlotlyPlugin : VisionPlugin(), Plugin { diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt similarity index 88% rename from visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt rename to visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt index 5672bd00..52e37fc1 100644 --- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt +++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt @@ -1,19 +1,5 @@ -package hep.dataforge.vision.three.server +package space.kscience.visionforge.three.server -import hep.dataforge.context.Context -import hep.dataforge.meta.* -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionChange -import hep.dataforge.vision.VisionManager -import hep.dataforge.vision.flowChanges -import hep.dataforge.vision.html.HtmlFragment -import hep.dataforge.vision.html.HtmlVisionFragment -import hep.dataforge.vision.html.VisionTagConsumer -import hep.dataforge.vision.html.fragment -import hep.dataforge.vision.three.server.VisionServer.Companion.DEFAULT_PAGE import io.ktor.application.* import io.ktor.features.CORS import io.ktor.features.CallLogging @@ -38,8 +24,31 @@ import kotlinx.coroutines.flow.collect import kotlinx.coroutines.withContext import kotlinx.html.* import kotlinx.html.stream.createHTML +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Vision +import space.kscience.visionforge.VisionChange +import space.kscience.visionforge.VisionManager +import space.kscience.visionforge.flowChanges +import space.kscience.visionforge.html.HtmlFragment +import space.kscience.visionforge.html.HtmlVisionFragment +import space.kscience.visionforge.html.VisionTagConsumer +import space.kscience.visionforge.html.fragment +import space.kscience.visionforge.three.server.VisionServer.Companion.DEFAULT_PAGE import java.awt.Desktop import java.net.URI +import kotlin.collections.ArrayList +import kotlin.collections.HashMap +import kotlin.collections.List +import kotlin.collections.Map +import kotlin.collections.emptyList +import kotlin.collections.first +import kotlin.collections.forEach +import kotlin.collections.plus +import kotlin.collections.set import kotlin.time.milliseconds public enum class VisionServerDataMode { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt deleted file mode 100644 index 90d024c3..00000000 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt +++ /dev/null @@ -1,9 +0,0 @@ -package hep.dataforge.vision.solid.specifications - -import hep.dataforge.meta.Scheme -import hep.dataforge.meta.SchemeSpec - - -public class Controls : Scheme() { - public companion object : SchemeSpec(::Controls) -} \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt deleted file mode 100644 index 46ba8939..00000000 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt +++ /dev/null @@ -1,8 +0,0 @@ -package hep.dataforge.vision.solid.specifications - -import hep.dataforge.meta.Scheme -import hep.dataforge.meta.SchemeSpec - -public class Light : Scheme() { - public companion object : SchemeSpec(::Light) -} \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt similarity index 86% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt index 1a0eab5d..c84d5c9b 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set @Serializable @SerialName("solid.box") diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt similarity index 67% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt index 05e8cad9..9232874c 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.MutableItemProvider -import hep.dataforge.meta.set -import hep.dataforge.meta.value -import hep.dataforge.names.Name -import hep.dataforge.values.Value -import hep.dataforge.values.asValue -import hep.dataforge.values.string -import hep.dataforge.vision.Colors -import hep.dataforge.vision.VisionBuilder +import space.kscience.dataforge.meta.MutableItemProvider +import space.kscience.dataforge.meta.set +import space.kscience.dataforge.meta.value +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.asValue +import space.kscience.dataforge.values.string +import space.kscience.visionforge.Colors +import space.kscience.visionforge.VisionBuilder @VisionBuilder public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt similarity index 89% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt index cee7928d..f7325d2b 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.update -import hep.dataforge.names.NameToken -import hep.dataforge.vision.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.update +import space.kscience.dataforge.names.NameToken +import space.kscience.visionforge.* public enum class CompositeType { UNION, diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt similarity index 94% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt index a04594b6..e07cdee3 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt similarity index 82% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt index af26fa6f..2d242391 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set @Serializable @SerialName("solid.convex") diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt similarity index 93% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt index 96c6802a..d5943e3a 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt similarity index 94% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt index 5d06ea2a..3cfc5da9 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta /** * @param T the type of resulting geometry diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt similarity index 62% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt index 9c46fb05..41fe9903 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.number -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.allProperties -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.number +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.allProperties +import space.kscience.visionforge.set @Serializable @SerialName("solid.line") diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt similarity index 88% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt index bb9a8867..d7d03c90 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt @@ -1,19 +1,19 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.boolean -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.enum -import hep.dataforge.meta.int -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.values.ValueType -import hep.dataforge.values.asValue -import hep.dataforge.vision.* -import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY -import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY -import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY -import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY +import space.kscience.dataforge.meta.boolean +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.enum +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.asValue +import space.kscience.visionforge.* +import space.kscience.visionforge.Vision.Companion.VISIBLE_KEY +import space.kscience.visionforge.solid.Solid.Companion.DETAIL_KEY +import space.kscience.visionforge.solid.Solid.Companion.IGNORE_KEY +import space.kscience.visionforge.solid.Solid.Companion.LAYER_KEY /** * Interface for 3-dimensional [Vision] diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt similarity index 71% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt index 21c8e5bf..77e66a53 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.float -import hep.dataforge.meta.get -import hep.dataforge.meta.node -import hep.dataforge.vision.VisionBase -import hep.dataforge.vision.VisionChange import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.float +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.node +import space.kscience.visionforge.VisionBase +import space.kscience.visionforge.VisionChange @Serializable @SerialName("solid") diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt similarity index 93% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt index 8f51a612..c9c987a2 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt @@ -1,10 +1,5 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.MetaItem -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.vision.* import kotlinx.serialization.KSerializer import kotlinx.serialization.PolymorphicSerializer import kotlinx.serialization.SerialName @@ -13,6 +8,11 @@ import kotlinx.serialization.builtins.MapSerializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder +import space.kscience.dataforge.meta.MetaItem +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.visionforge.* public interface PrototypeHolder { @VisionBuilder diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt similarity index 70% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt index c628a4f0..ac45e22e 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set @Serializable @SerialName("solid.label") diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt similarity index 82% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt index 3062b0ad..aa6c9301 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt @@ -1,17 +1,17 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.attributes -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.values.ValueType -import hep.dataforge.values.asValue -import hep.dataforge.vision.* -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.attributes +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.asValue +import space.kscience.visionforge.* +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY @VisionBuilder public class SolidMaterial : Scheme() { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt similarity index 95% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt index 5008abc2..6379e51f 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.MetaItem -import hep.dataforge.meta.asMetaItem -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.* -import hep.dataforge.vision.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.MetaItem +import space.kscience.dataforge.meta.asMetaItem +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.* +import space.kscience.visionforge.* public interface SolidReference : Vision { public val prototype: Solid diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt similarity index 86% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt index 02c88bcc..b6d9bb16 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt @@ -1,18 +1,18 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.context.Context -import hep.dataforge.context.PluginFactory -import hep.dataforge.context.PluginTag -import hep.dataforge.meta.Meta -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.* -import hep.dataforge.vision.html.VisionOutput import kotlinx.serialization.PolymorphicSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.modules.PolymorphicModuleBuilder import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.subclass +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.context.PluginTag +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.* +import space.kscience.visionforge.html.VisionOutput import kotlin.reflect.KClass diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt similarity index 90% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt index d3da6ed1..f3ace5b3 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt similarity index 93% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt index 69bd3afa..de82d02a 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt similarity index 95% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt index 165c2b8c..00c060ca 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.VisionBuilder -import hep.dataforge.vision.VisionContainerBuilder -import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import space.kscience.visionforge.VisionBuilder +import space.kscience.visionforge.VisionContainerBuilder +import space.kscience.visionforge.set import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt similarity index 84% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt index 8d4fb85a..35fc731f 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.double -import hep.dataforge.meta.get import kotlinx.serialization.Serializable +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.double +import space.kscience.dataforge.meta.get import kotlin.math.PI public const val PI2: Float = 2 * PI.toFloat() diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt similarity index 59% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt index 802bebd6..2f907091 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid.specifications +package space.kscience.visionforge.solid.specifications -import hep.dataforge.meta.Scheme -import hep.dataforge.meta.SchemeSpec -import hep.dataforge.meta.boolean -import hep.dataforge.meta.double +import space.kscience.dataforge.meta.Scheme +import space.kscience.dataforge.meta.SchemeSpec +import space.kscience.dataforge.meta.boolean +import space.kscience.dataforge.meta.double public class Axes : Scheme() { public var visible: Boolean by boolean(false) diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt similarity index 78% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt index 396df8a4..b035e9fe 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid.specifications +package space.kscience.visionforge.solid.specifications -import hep.dataforge.meta.Scheme -import hep.dataforge.meta.SchemeSpec -import hep.dataforge.meta.double -import hep.dataforge.meta.int +import space.kscience.dataforge.meta.Scheme +import space.kscience.dataforge.meta.SchemeSpec +import space.kscience.dataforge.meta.double +import space.kscience.dataforge.meta.int import kotlin.math.PI public class Camera : Scheme() { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt similarity index 86% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt index 2a147100..ffb43756 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.solid.specifications +package space.kscience.visionforge.solid.specifications -import hep.dataforge.meta.* -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name public class Canvas3DOptions : Scheme() { public var axes: Axes by spec(Axes) diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt new file mode 100644 index 00000000..ee8ebb9d --- /dev/null +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt @@ -0,0 +1,9 @@ +package space.kscience.visionforge.solid.specifications + +import space.kscience.dataforge.meta.Scheme +import space.kscience.dataforge.meta.SchemeSpec + + +public class Controls : Scheme() { + public companion object : SchemeSpec(::Controls) +} \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt new file mode 100644 index 00000000..39b79466 --- /dev/null +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt @@ -0,0 +1,8 @@ +package space.kscience.visionforge.solid.specifications + +import space.kscience.dataforge.meta.Scheme +import space.kscience.dataforge.meta.SchemeSpec + +public class Light : Scheme() { + public companion object : SchemeSpec(::Light) +} \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt similarity index 88% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt index 72db9f97..5d07303e 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid.transform +package space.kscience.visionforge.solid.transform -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.asName -import hep.dataforge.vision.* -import hep.dataforge.vision.solid.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.asName +import space.kscience.visionforge.* +import space.kscience.visionforge.solid.* @DFExperimental internal fun mergeChild(parent: VisionGroup, child: Vision): Vision { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt similarity index 78% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt index a9f22c1c..b6d7c2e6 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.solid.transform +package space.kscience.visionforge.solid.transform -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.vision.MutableVisionGroup -import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.solid.SolidGroup -import hep.dataforge.vision.solid.SolidReferenceGroup +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.visionforge.MutableVisionGroup +import space.kscience.visionforge.VisionGroup +import space.kscience.visionforge.solid.SolidGroup +import space.kscience.visionforge.solid.SolidReferenceGroup @DFExperimental internal object UnRef : VisualTreeTransform() { diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt similarity index 89% rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt index 22825f6c..d1f78e96 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt +++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.solid.transform +package space.kscience.visionforge.solid.transform -import hep.dataforge.vision.Vision +import space.kscience.visionforge.Vision /** * A root class for [Vision] tree optimization diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt similarity index 89% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt index 45cc6d49..411aa75b 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt @@ -1,6 +1,5 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.Colors import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt similarity index 76% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt index 16b4c6d6..58cde48e 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.MetaItemNode -import hep.dataforge.meta.getIndexed -import hep.dataforge.meta.node -import hep.dataforge.meta.toMetaItem -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.meta.MetaItemNode +import space.kscience.dataforge.meta.getIndexed +import space.kscience.dataforge.meta.node +import space.kscience.dataforge.meta.toMetaItem +import space.kscience.dataforge.misc.DFExperimental import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt similarity index 91% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt index 5bfc8382..4e78e340 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.vision.Colors -import hep.dataforge.vision.get +import space.kscience.visionforge.Colors +import space.kscience.visionforge.get import kotlin.math.PI import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt similarity index 92% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt index 5f6fad96..1a9aa45b 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.meta.int -import hep.dataforge.names.asName -import hep.dataforge.vision.* +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.names.asName +import space.kscience.visionforge.* import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt similarity index 83% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt index 90a158de..6df7b285 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.vision.MutableVisionGroup -import hep.dataforge.vision.get -import hep.dataforge.vision.meta +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.MutableVisionGroup +import space.kscience.visionforge.get +import space.kscience.visionforge.meta import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt similarity index 78% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt index 9613fb9b..fe8c4ad8 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.context.Global -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.get +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.get import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt similarity index 80% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt index bb84eb31..2f8b7781 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.get -import hep.dataforge.vision.style -import hep.dataforge.vision.useStyle import kotlinx.serialization.json.encodeToJsonElement +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.get +import space.kscience.visionforge.style +import space.kscience.visionforge.useStyle import kotlin.test.Test import kotlin.test.assertEquals diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt similarity index 89% rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt index 2b8502e5..a96c7d49 100644 --- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.solid +package space.kscience.visionforge.solid -import hep.dataforge.context.Global -import hep.dataforge.meta.MetaItem -import hep.dataforge.names.toName -import hep.dataforge.vision.VisionChange -import hep.dataforge.vision.get +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.MetaItem +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.VisionChange +import space.kscience.visionforge.get import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt similarity index 89% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt index 605c658f..b01dbd1a 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt @@ -1,19 +1,19 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.meta.boolean -import hep.dataforge.meta.node -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.names.startsWith -import hep.dataforge.vision.onPropertyChange -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.SolidMaterial -import hep.dataforge.vision.solid.layer import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.EdgesGeometry import info.laht.threekt.objects.LineSegments import info.laht.threekt.objects.Mesh +import space.kscience.dataforge.meta.boolean +import space.kscience.dataforge.meta.node +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.startsWith +import space.kscience.visionforge.onPropertyChange +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.SolidMaterial +import space.kscience.visionforge.solid.layer import kotlin.reflect.KClass /** diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt similarity index 72% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt index b1a3d07b..dad57066 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.Box -import hep.dataforge.vision.solid.detail import info.laht.threekt.geometries.BoxBufferGeometry +import space.kscience.visionforge.solid.Box +import space.kscience.visionforge.solid.detail public object ThreeBoxFactory : MeshThreeFactory(Box::class) { override fun buildGeometry(obj: Box): BoxBufferGeometry = diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt similarity index 91% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt index f6bec606..b68133b2 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt @@ -1,17 +1,5 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.context.logger -import hep.dataforge.meta.get -import hep.dataforge.meta.string -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.names.toName -import hep.dataforge.vision.Colors -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.specifications.* -import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL -import hep.dataforge.vision.solid.three.ThreeMaterials.SELECTED_MATERIAL import info.laht.threekt.WebGLRenderer import info.laht.threekt.cameras.PerspectiveCamera import info.laht.threekt.core.BufferGeometry @@ -31,6 +19,19 @@ import org.w3c.dom.Element import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.Node import org.w3c.dom.events.MouseEvent +import space.kscience.dataforge.context.info +import space.kscience.dataforge.context.logger +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.Colors +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.specifications.* +import space.kscience.visionforge.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL +import space.kscience.visionforge.solid.three.ThreeMaterials.SELECTED_MATERIAL import kotlin.math.cos import kotlin.math.sin diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt similarity index 88% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt index f8d26cec..cae984d9 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt @@ -1,8 +1,5 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.SolidLabel -import hep.dataforge.vision.solid.color -import hep.dataforge.vision.solid.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG import info.laht.threekt.DoubleSide import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.PlaneBufferGeometry @@ -14,6 +11,9 @@ import org.w3c.dom.CanvasRenderingContext2D import org.w3c.dom.CanvasTextBaseline import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.MIDDLE +import space.kscience.visionforge.solid.SolidLabel +import space.kscience.visionforge.solid.color +import space.kscience.visionforge.solid.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG import kotlin.reflect.KClass /** diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt similarity index 86% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt index ffe249d2..1f8c9328 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt @@ -1,9 +1,10 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.Composite -import hep.dataforge.vision.solid.CompositeType +import CSG import info.laht.threekt.core.BufferGeometry import info.laht.threekt.objects.Mesh +import space.kscience.visionforge.solid.Composite +import space.kscience.visionforge.solid.CompositeType /** * This should be inner, because it uses object builder diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt similarity index 77% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt index e41035c9..fe08b1cf 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.Convex import info.laht.threekt.external.geometries.ConvexBufferGeometry +import space.kscience.visionforge.solid.Convex public object ThreeConvexFactory : MeshThreeFactory(Convex::class) { override fun buildGeometry(obj: Convex): ConvexBufferGeometry { diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt similarity index 88% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt index 00154c88..57206c3e 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.ConeSegment -import hep.dataforge.vision.solid.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.CylinderBufferGeometry +import space.kscience.visionforge.solid.ConeSegment +import space.kscience.visionforge.solid.detail import kotlin.math.PI import kotlin.math.pow diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt similarity index 79% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt index 41cccd43..e231c4ce 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt @@ -1,16 +1,16 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.startsWith -import hep.dataforge.vision.Vision -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY -import hep.dataforge.vision.solid.three.ThreeFactory.Companion.TYPE -import hep.dataforge.vision.visible import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.objects.Mesh +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.startsWith +import space.kscience.visionforge.Vision +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY +import space.kscience.visionforge.solid.three.ThreeFactory.Companion.TYPE +import space.kscience.visionforge.visible import kotlin.reflect.KClass /** diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt similarity index 84% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt index e0861f98..c1568ffd 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.int -import hep.dataforge.vision.solid.GeometryBuilder -import hep.dataforge.vision.solid.Point3D import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Face3 import info.laht.threekt.core.Geometry import info.laht.threekt.math.Vector3 +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.int +import space.kscience.visionforge.solid.GeometryBuilder +import space.kscience.visionforge.solid.Point3D internal fun Point3D.toVector() = Vector3(x, y, z) diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt similarity index 78% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt index ebb6e76c..d0c10605 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt @@ -1,13 +1,14 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.context.logger -import hep.dataforge.vision.onPropertyChange -import hep.dataforge.vision.solid.SolidLabel import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.TextBufferGeometry import info.laht.threekt.objects.Mesh import kotlinext.js.jsObject +import space.kscience.dataforge.context.logger +import space.kscience.dataforge.context.warn +import space.kscience.visionforge.onPropertyChange +import space.kscience.visionforge.solid.SolidLabel import kotlin.reflect.KClass /** diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt similarity index 75% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt index 655b3c38..cc9c58ce 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.meta.node -import hep.dataforge.vision.onPropertyChange -import hep.dataforge.vision.solid.PolyLine -import hep.dataforge.vision.solid.color -import hep.dataforge.vision.solid.string -import hep.dataforge.vision.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR import info.laht.threekt.core.Geometry import info.laht.threekt.core.Object3D import info.laht.threekt.math.Color import info.laht.threekt.objects.LineSegments +import space.kscience.dataforge.meta.node +import space.kscience.visionforge.onPropertyChange +import space.kscience.visionforge.solid.PolyLine +import space.kscience.visionforge.solid.color +import space.kscience.visionforge.solid.string +import space.kscience.visionforge.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR import kotlin.reflect.KClass public object ThreeLineFactory : ThreeFactory { diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt similarity index 93% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt index f41e9112..7f79ce37 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt @@ -1,20 +1,20 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.meta.* -import hep.dataforge.names.Name -import hep.dataforge.values.ValueType -import hep.dataforge.values.int -import hep.dataforge.values.string -import hep.dataforge.vision.Colors -import hep.dataforge.vision.Vision -import hep.dataforge.vision.ownProperties -import hep.dataforge.vision.solid.SolidMaterial import info.laht.threekt.materials.LineBasicMaterial import info.laht.threekt.materials.Material import info.laht.threekt.materials.MeshBasicMaterial import info.laht.threekt.materials.MeshPhongMaterial import info.laht.threekt.math.Color import info.laht.threekt.objects.Mesh +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.int +import space.kscience.dataforge.values.string +import space.kscience.visionforge.Colors +import space.kscience.visionforge.Vision +import space.kscience.visionforge.ownProperties +import space.kscience.visionforge.solid.SolidMaterial public object ThreeMaterials { diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt similarity index 95% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt index 63eb4e28..c91698f1 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt @@ -1,18 +1,18 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.context.* -import hep.dataforge.meta.Meta -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.* -import hep.dataforge.vision.* -import hep.dataforge.vision.solid.* -import hep.dataforge.vision.solid.specifications.Canvas3DOptions import info.laht.threekt.core.Object3D import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import org.w3c.dom.Element import org.w3c.dom.HTMLElement +import space.kscience.dataforge.context.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.* +import space.kscience.visionforge.* +import space.kscience.visionforge.solid.* +import space.kscience.visionforge.solid.specifications.Canvas3DOptions import kotlin.collections.set import kotlin.reflect.KClass import info.laht.threekt.objects.Group as ThreeGroup diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt similarity index 82% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt index d245f846..33fd3ccb 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.names.cutFirst -import hep.dataforge.names.firstOrNull -import hep.dataforge.names.toName -import hep.dataforge.vision.onPropertyChange -import hep.dataforge.vision.solid.Solid -import hep.dataforge.vision.solid.SolidReferenceGroup -import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.objects.Mesh +import space.kscience.dataforge.names.cutFirst +import space.kscience.dataforge.names.firstOrNull +import space.kscience.dataforge.names.toName +import space.kscience.visionforge.onPropertyChange +import space.kscience.visionforge.solid.Solid +import space.kscience.visionforge.solid.SolidReferenceGroup +import space.kscience.visionforge.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX import kotlin.reflect.KClass public object ThreeReferenceFactory : ThreeFactory { diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt similarity index 85% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt index 37910fc9..8f117516 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.Sphere -import hep.dataforge.vision.solid.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.SphereBufferGeometry +import space.kscience.visionforge.solid.Sphere +import space.kscience.visionforge.solid.detail public object ThreeSphereFactory : MeshThreeFactory(Sphere::class) { override fun buildGeometry(obj: Sphere): BufferGeometry { diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt similarity index 69% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt index 8a6d2a52..16d1bd4f 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three -import hep.dataforge.vision.solid.SolidBase import info.laht.threekt.core.Object3D +import space.kscience.visionforge.solid.SolidBase /** * A custom visual object that has its own Three.js renderer diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt similarity index 100% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt similarity index 88% rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt index 9a11c550..fa13e91d 100644 --- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt +++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt @@ -1,11 +1,6 @@ -package hep.dataforge.vision.solid.three +package space.kscience.visionforge.solid.three import CSG -import hep.dataforge.meta.MetaItem -import hep.dataforge.meta.float -import hep.dataforge.meta.get -import hep.dataforge.meta.node -import hep.dataforge.vision.solid.* import info.laht.threekt.core.* import info.laht.threekt.external.controls.OrbitControls import info.laht.threekt.materials.Material @@ -13,6 +8,11 @@ import info.laht.threekt.math.Euler import info.laht.threekt.math.Vector3 import info.laht.threekt.objects.Mesh import info.laht.threekt.textures.Texture +import space.kscience.dataforge.meta.MetaItem +import space.kscience.dataforge.meta.float +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.node +import space.kscience.visionforge.solid.* import kotlin.math.PI public val Solid.euler: Euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name) diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt deleted file mode 100644 index 9fd1ebf4..00000000 --- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt +++ /dev/null @@ -1,11 +0,0 @@ -package hep.dataforge.vision.three.server - -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.solid.three.useThreeJs - -@DFExperimental -public fun main(): Unit = VisionForge.run { - useThreeJs() - renderVisionsInWindow() -} \ No newline at end of file diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt new file mode 100644 index 00000000..e65b2503 --- /dev/null +++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt @@ -0,0 +1,11 @@ +package space.kscience.visionforge.three.server + +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.solid.three.useThreeJs + +@DFExperimental +public fun main(): Unit = VisionForge.run { + useThreeJs() + renderVisionsInWindow() +} \ No newline at end of file diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt similarity index 62% rename from visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt rename to visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt index 1a7639d9..fd9b1636 100644 --- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt +++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.three.server +package space.kscience.visionforge.three.server -import hep.dataforge.misc.DFExperimental -import hep.dataforge.vision.VisionForge -import hep.dataforge.vision.html.HtmlVisionFragment -import hep.dataforge.vision.html.ResourceLocation -import hep.dataforge.vision.html.page -import hep.dataforge.vision.html.scriptHeader -import hep.dataforge.vision.makeFile +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.visionforge.VisionForge +import space.kscience.visionforge.html.HtmlVisionFragment +import space.kscience.visionforge.html.ResourceLocation +import space.kscience.visionforge.html.page +import space.kscience.visionforge.html.scriptHeader +import space.kscience.visionforge.makeFile import java.awt.Desktop import java.nio.file.Path