teldufalsari/visionforge
1
0
Fork 0
forked from kscience/visionforge
Code Pull Requests Activity

Migration to 1.3.70

Browse Source
This commit is contained in:
Alexander Nozik 2020-03-23 22:37:02 +03:00
parent d4dcd32b73
commit 67082c9cd3
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/vis/editor/ObjectTreeComponent.kt
View File

@ -90,12 +90,14 @@ class ObjectTreeComponent : RComponent<ObjectTreeProps, TreeState>() {
fun RBuilder.objectTree( fun RBuilder.objectTree(
obj: VisualObject, obj: VisualObject,
clickCallback: (Name) -> Unit = {} clickCallback: (Name) -> Unit = {}
) = child(ObjectTreeComponent::class) { ) = card("Object tree") {
child(ObjectTreeComponent::class) {
attrs { attrs {
name = Name.EMPTY name = Name.EMPTY
this.obj = obj this.obj = obj
this.clickCallback = clickCallback this.clickCallback = clickCallback
} }
}
} }
fun Element.objectTree( fun Element.objectTree(

6
dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt
View File

@ -124,10 +124,10 @@ inline fun VisualGroup3D.prototypes(builder: VisualGroup3D.() -> Unit): Unit {
} }
/** /**
* Define a group with given [key], attach it to this parent and return it. * Define a group with given [name], attach it to this parent and return it.
*/ */
fun VisualGroup3D.group(key: String = "", action: VisualGroup3D.() -> Unit = {}): VisualGroup3D = fun VisualGroup3D.group(name: String = "", action: VisualGroup3D.() -> Unit = {}): VisualGroup3D =
VisualGroup3D().apply(action).also { VisualGroup3D().apply(action).also {
set(key, it) set(name, it)
} }

6
playground/src/jsMain/kotlin/PlayGroundApp.kt
View File

@ -25,10 +25,10 @@ private class PlayGroundApp : Application {
document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page") document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page")
val obj = VisualGroup3D().apply { val obj = VisualGroup3D().apply {
box(100, 100, 100) box(100, 100, 100, name = "A")
group { group("B") {
position = Point3D(120, 0, 0) position = Point3D(120, 0, 0)
box(100, 100, 100) box(100, 100, 100, name = "C")
} }
} }