-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47 from mipt-npm/dev
v0.2.0-dev-22
- Loading branch information
Showing
518 changed files
with
14,104 additions
and
9,449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,4 @@ out/ | |
| .gradle | ||
| build/ | ||
|
|
||
|
|
||
| !gradle-wrapper.jar | ||
| gradle.properties | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Changelog | ||
|
|
||
| ## [Unreleased] | ||
| ### Added | ||
| - Server module | ||
| - Change collector | ||
| - Customizable accessors for colors | ||
| - SphereLayer solid | ||
| - Hexagon interface and GenericHexagon implementation (Box inherits Hexagon) | ||
| - Increased the default detail level for spheres and cones to 32 | ||
| - Simple clipping for Solids in ThreeJs | ||
|
|
||
| ### Changed | ||
| - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate. | ||
| - Point3D and Point2D are made separate classes instead of expect/actual (to split up different engines. | ||
| - JavaFX support moved to a separate module | ||
| - Threejs support moved to a separate module | ||
| - \[Format breaking change!\] Stylesheets are moved into properties under `@stylesheet` key | ||
| - VisionGroup builder accepts `null` as name for statics instead of `""` | ||
| - gdml sphere is rendered as a SphereLayer instead of Sphere (#35) | ||
| - Tube is replaced by more general ConeSurface | ||
| - position, rotation and size moved to properties | ||
| - prototypes moved to children | ||
| - Immutable Solid instances | ||
| - Property listeners are not triggered if there are no changes. | ||
| - Feedback websocket connection in the client. | ||
|
|
||
| ### Deprecated | ||
|
|
||
| ### Removed | ||
| - Primary modules dependencies on UI | ||
|
|
||
| ### Fixed | ||
| - Version conflicts | ||
|
|
||
| ### Security |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,41 @@ | ||
| import scientifik.useFx | ||
| import scientifik.useSerialization | ||
|
|
||
| val dataforgeVersion by extra("0.1.8") | ||
|
|
||
| plugins { | ||
| id("scientifik.mpp") apply false | ||
| id("scientifik.jvm") apply false | ||
| id("scientifik.js") apply false | ||
| id("scientifik.publish") apply false | ||
| id("org.jetbrains.changelog") version "0.4.0" | ||
| id("ru.mipt.npm.gradle.project") | ||
|
|
||
| //Override kotlin version | ||
| // val kotlinVersion = "1.5.20-RC" | ||
| // kotlin("multiplatform") version(kotlinVersion) apply false | ||
| // kotlin("jvm") version(kotlinVersion) apply false | ||
| // kotlin("js") version(kotlinVersion) apply false | ||
| } | ||
|
|
||
| val dataforgeVersion by extra("0.4.3") | ||
| val fxVersion by extra("11") | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| mavenLocal() | ||
| maven("https://dl.bintray.com/pdvrieze/maven") | ||
| maven("http://maven.jzy3d.org/releases") | ||
| mavenCentral() | ||
| jcenter() | ||
| maven("https://repo.kotlin.link") | ||
| maven("https://maven.jzy3d.org/releases") | ||
| } | ||
|
|
||
| group = "hep.dataforge" | ||
| version = "0.1.5-dev" | ||
| group = "space.kscience" | ||
| version = "0.2.0-dev-22" | ||
| } | ||
|
|
||
| val githubProject by extra("visionforge") | ||
| val bintrayRepo by extra("dataforge") | ||
| val fxVersion by extra("14") | ||
|
|
||
| subprojects { | ||
| if(name.startsWith("visionforge")) { | ||
| apply(plugin = "scientifik.publish") | ||
| if (name.startsWith("visionforge")) { | ||
| plugins.apply("maven-publish") | ||
| } | ||
| useSerialization() | ||
| useFx(scientifik.FXModule.CONTROLS, version = fxVersion) | ||
| } | ||
|
|
||
| ksciencePublish{ | ||
| github("visionforge") | ||
| space() | ||
| sonatype() | ||
| } | ||
|
|
||
| apiValidation { | ||
| validationDisabled = true | ||
| ignoredPackages.add("info.laht.threekt") | ||
| } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,57 @@ | ||
| import scientifik.DependencyConfiguration | ||
| import scientifik.FXModule | ||
| import scientifik.useFx | ||
| import ru.mipt.npm.gradle.DependencyConfiguration | ||
| import ru.mipt.npm.gradle.FXModule | ||
|
|
||
| plugins { | ||
| id("scientifik.mpp") | ||
| id("application") | ||
| id("ru.mipt.npm.gradle.mpp") | ||
| application | ||
| } | ||
|
|
||
| val fxVersion: String by rootProject.extra | ||
| useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION) | ||
| kscience { | ||
| val fxVersion: String by rootProject.extra | ||
| useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION) | ||
| application() | ||
| } | ||
|
|
||
| kotlin { | ||
|
|
||
| jvm { | ||
| withJava() | ||
| } | ||
|
|
||
| js { | ||
| js{ | ||
| useCommonJs() | ||
| browser { | ||
| commonWebpackConfig { | ||
| cssSupport.enabled = false | ||
| } | ||
| } | ||
| } | ||
|
|
||
| sourceSets { | ||
| commonMain { | ||
| dependencies { | ||
| implementation(project(":visionforge-solid")) | ||
| implementation(project(":visionforge-gdml")) | ||
| } | ||
| } | ||
| jsMain{ | ||
| jvmMain { | ||
| dependencies { | ||
| implementation(project(":visionforge-fx")) | ||
| } | ||
| } | ||
| jsMain { | ||
| dependencies { | ||
| implementation(project(":ui:bootstrap")) | ||
| implementation(project(":ui:ring")) | ||
| implementation(project(":visionforge-threejs")) | ||
| implementation(npm("react-file-drop", "3.0.6")) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| application { | ||
| mainClassName = "hep.dataforge.vision.gdml.demo.GDMLDemoAppKt" | ||
| 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" | ||
| } |
54 changes: 0 additions & 54 deletions
54
demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
This file was deleted.
Oops, something went wrong.
20 changes: 0 additions & 20 deletions
20
demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
This file was deleted.
Oops, something went wrong.
32 changes: 32 additions & 0 deletions
32
demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisionTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package space.kscience.visionforge.gdml | ||
|
|
||
| import space.kscience.dataforge.meta.string | ||
| import space.kscience.dataforge.names.toName | ||
| import space.kscience.dataforge.values.asValue | ||
| import space.kscience.gdml.GdmlShowCase | ||
| import space.kscience.visionforge.setProperty | ||
| import space.kscience.visionforge.solid.SolidMaterial | ||
| import kotlin.test.Test | ||
| import kotlin.test.assertEquals | ||
| import kotlin.test.assertNotNull | ||
|
|
||
| class GDMLVisionTest { | ||
|
|
||
| // @Test | ||
| // fun testCubesStyles(){ | ||
| // val cubes = gdml.toVision() | ||
| // val segment = cubes["composite000.segment_0".toName()] as Solid | ||
| // println(segment.styles) | ||
| // println(segment.material) | ||
| // } | ||
|
|
||
|
|
||
| @Test | ||
| fun testPrototypeProperty() { | ||
| val vision = GdmlShowCase.cubes().toVision() | ||
| val child = vision["composite-000.segment-0".toName()] | ||
| assertNotNull(child) | ||
| child.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue()) | ||
| assertEquals("red", child.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.