kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Update kotlin and DF

Browse Source
This commit is contained in:
Alexander Nozik 2021-11-23 17:51:47 +03:00
parent 9eb5def13c
commit b40c1d0025
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
// kotlin("js") version "1.5.30" apply false
}
val dataforgeVersion by extra("0.5.1")
val dataforgeVersion by extra("0.5.2-dev-2")
val fxVersion by extra("11")
allprojects {
@ -16,7 +16,7 @@ allprojects {
}
group = "space.kscience"
version = "0.2.0-dev-24"
version = "0.2.0-dev-25"
}
subprojects {

1
demo/playground/src/jvmMain/kotlin/rootParser.kt
View File

@ -40,7 +40,6 @@ fun main() {
println(it)
}
val solid = geo.toSolid()
Paths.get("BM@N.vf.json").writeText(Solids.encodeToString(solid))

2
settings.gradle.kts
View File

@ -1,6 +1,6 @@
pluginManagement {
val toolsVersion = "0.10.3"
val toolsVersion = "0.10.7"
repositories {
//mavenLocal()

4
ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
View File

@ -10,8 +10,8 @@ import org.w3c.dom.events.Event
import org.w3c.files.Blob
import org.w3c.files.BlobPropertyBag
import react.FunctionComponent
import react.Props
import react.RBuilder
import react.RProps
import react.dom.attrs
import react.dom.button
import react.functionComponent
@ -42,7 +42,7 @@ public fun RBuilder.canvasControls(canvasOptions: Canvas3DOptions, vision: Visio
}
}
public external interface CanvasControlsProps : RProps {
public external interface CanvasControlsProps : Props {
public var canvasOptions: Canvas3DOptions
public var vision: Vision?
}

4
ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
View File

@ -3,8 +3,8 @@ package space.kscience.visionforge.bootstrap
import kotlinx.css.*
import kotlinx.css.properties.border
import react.FunctionComponent
import react.PropsWithChildren
import react.RBuilder
import react.RProps
import react.dom.h2
import react.functionComponent
import space.kscience.dataforge.names.Name
@ -16,7 +16,7 @@ import space.kscience.visionforge.solid.specifications.Canvas3DOptions
import styled.css
import styled.styledDiv
public external interface ThreeControlsProps : RProps {
public external interface ThreeControlsProps : PropsWithChildren {
public var canvasOptions: Canvas3DOptions
public var vision: Vision?
public var selected: Name?

2
ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
View File

@ -20,7 +20,7 @@ import styled.css
import styled.styledDiv
import styled.styledSpan
public external interface MetaViewerProps : RProps {
public external interface MetaViewerProps : Props {
/**
* Root meta
*/

2
ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
View File

@ -19,7 +19,7 @@ import styled.styledButton
import styled.styledDiv
import styled.styledSpan
public external interface PropertyEditorProps : RProps {
public external interface PropertyEditorProps : Props {
/**
* Root config object - always non-null

2
ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
View File

@ -14,7 +14,7 @@ import space.kscience.visionforge.solid.three.ThreePlugin
import styled.css
import styled.styledDiv
public external interface ThreeCanvasProps : RProps {
public external interface ThreeCanvasProps : Props {
public var context: Context
public var options: Canvas3DOptions?
public var solid: Solid?

2
ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
View File

@ -21,7 +21,7 @@ import styled.css
import styled.styledDiv
import styled.styledSpan
public external interface ObjectTreeProps : RProps {
public external interface ObjectTreeProps : Props {
public var name: Name
public var selected: Name?
public var obj: Vision

4
ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
View File

@ -11,7 +11,7 @@ import org.w3c.dom.HTMLInputElement
import org.w3c.dom.HTMLSelectElement
import org.w3c.dom.events.Event
import react.FunctionComponent
import react.RProps
import react.Props
import react.dom.attrs
import react.dom.option
import react.functionComponent
@ -29,7 +29,7 @@ import styled.css
import styled.styledInput
import styled.styledSelect
public external interface ValueChooserProps : RProps {
public external interface ValueChooserProps : Props {
public var descriptor: MetaDescriptor?
public var meta: ObservableMutableMeta
public var actual: Meta

2
ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
View File

@ -24,7 +24,7 @@ import space.kscience.visionforge.solid.specifications.Canvas3DOptions
import styled.css
import styled.styledDiv
public external interface ThreeCanvasWithControlsProps : RProps {
public external interface ThreeCanvasWithControlsProps : Props {
public var context: Context
public var builderOfSolid: Deferred<Solid?>
public var selected: Name?

6
ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
View File

@ -10,8 +10,8 @@ import org.w3c.dom.events.Event
import org.w3c.files.Blob
import org.w3c.files.BlobPropertyBag
import react.FunctionComponent
import react.Props
import react.RBuilder
import react.RProps
import react.dom.attrs
import react.dom.button
import react.functionComponent
@ -47,7 +47,7 @@ internal fun RBuilder.canvasControls(options: Canvas3DOptions, vision: Vision?):
}
}
internal external interface CanvasControlsProps : RProps {
internal external interface CanvasControlsProps : Props {
public var options: Canvas3DOptions
public var vision: Vision?
}
@ -85,7 +85,7 @@ internal val CanvasControls: FunctionComponent<CanvasControlsProps> = functionCo
}
public external interface ThreeControlsProps : RProps {
public external interface ThreeControlsProps : Props {
public var canvasOptions: Canvas3DOptions
public var vision: Vision?
public var selected: Name?

1
visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt
View File

@ -339,6 +339,7 @@ private class GdmlLoader(val settings: GdmlLoaderOptions) {
when (val vol: GdmlPlacement? = group.placement) {
is GdmlPhysVolume -> addPhysicalVolume(root, vol)
is GdmlDivisionVolume -> addDivisionVolume(root, vol)
else -> {}
}
}

2
visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
View File

@ -65,7 +65,7 @@ public fun SolidGroup.smartComposite(
val group = SolidGroup(builder)
if (name == null && group.meta.isEmpty()) {
//append directly to group if no properties are defined
group.children.forEach { (key, value) ->
group.children.forEach { (_, value) ->
value.parent = null
set(null, value)
}