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

Merge branch 'mipt-npm:dev' into dev

Browse Source
This commit is contained in:
Kira Dmitrieva 2021-08-20 21:14:41 +03:00 committed by GitHub
commit f0bf293017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
View File

@ -3,9 +3,7 @@ package space.kscience.visionforge.gdml.demo
import kotlinx.browser.window import kotlinx.browser.window
import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.Deferred import kotlinx.coroutines.Deferred
import kotlinx.css.height import kotlinx.css.*
import kotlinx.css.pt
import kotlinx.css.vh
import org.w3c.files.File import org.w3c.files.File
import org.w3c.files.FileReader import org.w3c.files.FileReader
import org.w3c.files.get import org.w3c.files.get
@ -71,6 +69,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
styledDiv { styledDiv {
css { css {
height = 100.vh - 12.pt height = 100.vh - 12.pt
width = 100.vw
} }
child(ThreeCanvasWithControls) { child(ThreeCanvasWithControls) {
attrs { attrs {

4
demo/jupyter-playground/build.gradle.kts
View File

@ -5,6 +5,7 @@ plugins {
} }
repositories { repositories {
jcenter()
mavenCentral() mavenCentral()
maven("https://repo.kotlin.link") maven("https://repo.kotlin.link")
} }
@ -15,7 +16,6 @@ dependencies {
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> { tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
kotlinOptions { kotlinOptions {
useIR = true
jvmTarget = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET.toString() jvmTarget = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET.toString()
} }
} }
@ -29,7 +29,7 @@ tasks.withType<Test> {
} }
tasks.processJupyterApiResources { tasks.processJupyterApiResources {
libraryProducers = listOf("space.kscience.dataforge.playground.VisionForgePlayGroundForJupyter") libraryProducers = listOf("playground.VisionForgePlayGroundForJupyter")
} }
tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources") tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources")

4
demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt → demo/jupyter-playground/src/main/kotlin/VisionForgePlayGroundForJupyter.kt
View File

@ -1,4 +1,4 @@
package space.kscience.dataforge.playground package playground
import kotlinx.html.div import kotlinx.html.div
import kotlinx.html.id import kotlinx.html.id
@ -24,7 +24,7 @@ import space.kscience.visionforge.visionManager
@JupyterLibrary @JupyterLibrary
@DFExperimental @DFExperimental
internal class VisionForgePlayGroundForJupyter : JupyterIntegration() { public class VisionForgePlayGroundForJupyter : JupyterIntegration() {
private val context = Context("VisionForge") { private val context = Context("VisionForge") {
plugin(Solids) plugin(Solids)

18
demo/playground/build.gradle.kts
View File

@ -51,25 +51,25 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation(project(":visionforge-solid")) api(project(":visionforge-solid"))
implementation(project(":visionforge-gdml")) api(project(":visionforge-gdml"))
implementation(project(":visionforge-plotly")) api(project(":visionforge-plotly"))
implementation(projects.visionforge.visionforgeMarkdown) api(projects.visionforge.visionforgeMarkdown)
} }
} }
val jsMain by getting{ val jsMain by getting{
dependencies { dependencies {
implementation(project(":ui:ring")) api(project(":ui:ring"))
implementation(project(":visionforge-threejs")) api(project(":visionforge-threejs"))
} }
} }
val jvmMain by getting{ val jvmMain by getting{
dependencies { dependencies {
implementation(project(":visionforge-server")) api(project(":visionforge-server"))
implementation("ch.qos.logback:logback-classic:1.2.3") api("ch.qos.logback:logback-classic:1.2.3")
implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6") api("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
} }
} }
} }