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

v0.2.0-dev-22 #47

Merged
altavir merged 158 commits from dev into master 2021-07-17 11:04:22 +03:00
Conversation 0 Commits 158 Files Changed 518 +24 -22
18 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb3ff4d6fc - Show all commits

8
build.gradle.kts
View File

@ -7,8 +7,8 @@ plugins {
id("ru.mipt.npm.gradle.js") apply false
}
val dataforgeVersion by extra("0.4.1")
val kotlinWrappersVersion by extra("pre.152-kotlin-1.4.32")
val dataforgeVersion by extra("0.4.2")
val kotlinWrappersVersion by extra("pre.206-kotlin-1.5.10")
val fxVersion by extra("11")
allprojects {
@ -17,12 +17,10 @@ allprojects {
jcenter()
maven("https://repo.kotlin.link")
maven("https://maven.jzy3d.org/releases")
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
}
group = "space.kscience"
version = "0.2.0-dev-17"
version = "0.2.0-dev-18"
}
subprojects {

9
demo/muon-monitor/build.gradle.kts
View File

@ -8,6 +8,7 @@ group = "ru.mipt.npm"
val ktorVersion: String = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
kscience {
useCoroutines()
useSerialization()
application()
}
@ -23,9 +24,7 @@ kotlin {
tasks.getByName<ProcessResources>("jvmProcessResources") {
dependsOn(jsBrowserDistribution)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
afterEvaluate {
from(jsBrowserDistribution)
}
from(jsBrowserDistribution)
}
}
@ -58,8 +57,8 @@ application {
mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>(){
kotlinOptions{
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>() {
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + "-Xir-property-lazy-initialization"
}
}

2
demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
View File

@ -19,7 +19,6 @@ import io.ktor.routing.get
import io.ktor.serialization.json
import io.ktor.server.cio.CIO
import io.ktor.server.engine.embeddedServer
import io.ktor.util.KtorExperimentalAPI
import org.apache.commons.math3.random.JDKRandomGenerator
import ru.mipt.npm.muon.monitor.Model
import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
@ -69,7 +68,6 @@ fun Application.module(context: Context = Global) {
}
}
@OptIn(KtorExperimentalAPI::class)
fun main() {
embeddedServer(CIO, 8080, host = "localhost", module = Application::module).start(wait = true)
}

4
settings.gradle.kts
View File

@ -1,6 +1,6 @@
pluginManagement {
val kotlinVersion = "1.5.0"
val toolsVersion = "0.9.5"
val kotlinVersion = "1.5.10"
val toolsVersion = "0.9.10"
repositories {
maven("https://repo.kotlin.link")

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

@ -10,6 +10,7 @@ import org.w3c.dom.events.Event
import org.w3c.files.Blob
import org.w3c.files.BlobPropertyBag
import react.*
import react.dom.attrs
import react.dom.button
import space.kscience.dataforge.meta.withDefault
import space.kscience.visionforge.react.flexColumn

1
ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
View File

@ -4,6 +4,7 @@ import kotlinx.html.DIV
import kotlinx.html.classes
import kotlinx.html.js.onClickFunction
import react.*
import react.dom.attrs
import react.dom.button
import react.dom.li
import react.dom.ul

4
ui/react/build.gradle.kts
View File

@ -6,8 +6,8 @@ val kotlinWrappersVersion: String by rootProject.extra
dependencies{
api(project(":visionforge-solid"))
api("org.jetbrains:kotlin-styled:5.2.3-$kotlinWrappersVersion")
api("org.jetbrains:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
api("org.jetbrains.kotlin-wrappers:kotlin-styled:5.3.0-$kotlinWrappersVersion")
api("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
// implementation(npm("react-select","4.3.0"))
implementation(project(":visionforge-threejs"))
}

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

@ -4,6 +4,7 @@ import kotlinx.html.js.onClickFunction
import org.w3c.dom.events.Event
import react.*
import react.dom.a
import react.dom.attrs
import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.MetaItemNode
import space.kscience.dataforge.meta.MetaItemValue

1
ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
View File

@ -6,6 +6,7 @@ import org.w3c.dom.HTMLSelectElement
import org.w3c.dom.asList
import org.w3c.dom.events.Event
import react.FunctionalComponent
import react.dom.attrs
import react.dom.option
import react.dom.select
import react.functionalComponent

1
ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
View File

@ -3,6 +3,7 @@ package space.kscience.visionforge.react
import kotlinx.html.js.onClickFunction
import org.w3c.dom.events.Event
import react.*
import react.dom.attrs
import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.lastOrNull
import space.kscience.dataforge.names.plus

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

@ -13,6 +13,7 @@ import kotlinx.html.js.onClickFunction
import org.w3c.dom.Element
import org.w3c.dom.events.Event
import react.*
import react.dom.attrs
import react.dom.render
import space.kscience.dataforge.meta.*
import space.kscience.dataforge.meta.descriptors.ItemDescriptor

1
ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
View File

@ -5,6 +5,7 @@ import kotlinx.html.js.onChangeFunction
import org.w3c.dom.HTMLInputElement
import org.w3c.dom.events.Event
import react.FunctionalComponent
import react.dom.attrs
import react.functionalComponent
import react.useState
import space.kscience.dataforge.meta.get

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

@ -33,7 +33,7 @@ public external interface ThreeCanvasState : RState {
public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functionalComponent(
"ThreeCanvasComponent"
) { props ->
val elementRef = useRef<Element?>(null)
val elementRef = useRef<Element>(null)
var canvas by useState<ThreeCanvas?>(null)
val three: ThreePlugin = useMemo({props.context.fetch(ThreePlugin)}, arrayOf(props.context))

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

@ -7,6 +7,7 @@ import org.w3c.dom.HTMLInputElement
import org.w3c.dom.HTMLSelectElement
import org.w3c.dom.events.Event
import react.*
import react.dom.attrs
import react.dom.option
import space.kscience.dataforge.meta.*
import space.kscience.dataforge.meta.descriptors.ValueDescriptor

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

@ -7,6 +7,7 @@ import org.w3c.dom.events.Event
import org.w3c.files.Blob
import org.w3c.files.BlobPropertyBag
import react.*
import react.dom.attrs
import react.dom.button
import react.dom.h2
import ringui.island.ringIsland

4
visionforge-core/build.gradle.kts
View File

@ -15,12 +15,12 @@ kotlin {
dependencies {
api("space.kscience:dataforge-context:$dataforgeVersion")
api("org.jetbrains.kotlinx:kotlinx-html:${ru.mipt.npm.gradle.KScienceVersions.htmlVersion}")
api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
api("org.jetbrains.kotlin-wrappers:kotlin-css:1.0.0-$kotlinWrappersVersion")
}
}
jsMain {
dependencies {
api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
api("org.jetbrains.kotlin-wrappers:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
}
}
}

2
visionforge-plotly/build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
id("ru.mipt.npm.gradle.mpp")
}
val plotlyVersion = "0.4.0-dev-1"
val plotlyVersion = "0.4.2"
kscience {
useSerialization()

2
visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
View File

@ -16,7 +16,6 @@ import io.ktor.routing.*
import io.ktor.server.cio.CIO
import io.ktor.server.engine.ApplicationEngine
import io.ktor.server.engine.embeddedServer
import io.ktor.util.KtorExperimentalAPI
import io.ktor.websocket.WebSockets
import io.ktor.websocket.webSocket
import kotlinx.coroutines.CoroutineScope
@ -283,7 +282,6 @@ public fun Application.visionServer(context: Context, route: String = DEFAULT_PA
return VisionServer(visionManager, this, route)
}
@OptIn(KtorExperimentalAPI::class)
public fun VisionManager.serve(
host: String = "localhost",
port: Int = 7777,