v0.2.0-dev-22 #47

Merged
altavir merged 158 commits from dev into master 2021-07-17 11:04:22 +03:00
3 changed files with 24 additions and 16 deletions
Showing only changes of commit 30e6370204 - Show all commits

View File

@ -43,7 +43,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
}
script {
type = "text/javascript"
unsafe { +"renderVisionsAt(\"$id\");" }
unsafe { +"window.renderVisionsAt(\"$id\");" }
}
}
@ -63,7 +63,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
"hep.dataforge.vision.solid.*"
)
import("hep.dataforge.vision.VisionForge")
import<VisionForge>()
render<Gdml> { gdmlModel ->
val fragment = VisionForge.fragment {

View File

@ -1,9 +1,14 @@
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
@DFExperimental
fun main(): Unit = VisionForge.run{
usePlotly()
useThreeJs()
renderVisionsInWindow()
window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
}

View File

@ -43,17 +43,20 @@ public val VisionForge.visionClient: VisionClient
get() = plugins.fetch(VisionClient)
/**
* Render all visions in this [window] using current global state of [VisionForge]
*/
@DFExperimental
@JsExport
public fun renderVisionsInWindow(): Unit = VisionForge.renderVisionsInWindow()
/**
* Render all visions in an element with a given [id]
*/
@DFExperimental
@JsExport
public fun renderVisionsAt(id: String): Unit = VisionForge.renderVisionsAt(id)
///**
// * Render all visions in this [window] using current global state of [VisionForge]
// */
//@DFExperimental
//@JsExport
//public fun renderVisionsInWindow(): Unit {
// VisionForge.renderVisionsInWindow()
//}
//
///**
// * Render all visions in an element with a given [id]
// */
//@DFExperimental
//@JsExport
//public fun renderVisionsAt(id: String): Unit {
// VisionForge.renderVisionsAt(id)
//}