kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Move server to controls-vision

Browse Source
This commit is contained in:
Alexander Nozik 2023-11-05 10:18:26 +03:00
parent 0e963a7b13
commit 78b18ebda6
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls-vision/build.gradle.kts
View File

@ -10,8 +10,7 @@ description = """
val visionforgeVersion = "0.3.0-dev-10" val visionforgeVersion = "0.3.0-dev-10"
kscience { kscience {
jvm() fullStack("js/controls-vision.js", development = true)
js()
useKtor() useKtor()
useContextReceivers() useContextReceivers()
dependencies { dependencies {
@ -19,6 +18,7 @@ kscience {
api(projects.controlsConstructor) api(projects.controlsConstructor)
api("space.kscience:visionforge-plotly:$visionforgeVersion") api("space.kscience:visionforge-plotly:$visionforgeVersion")
api("space.kscience:visionforge-markdown:$visionforgeVersion") api("space.kscience:visionforge-markdown:$visionforgeVersion")
api("space.kscience:visionforge-tables:$visionforgeVersion")
} }
jvmMain{ jvmMain{

0
controls-vision/src/commonMain/kotlin/space/kscience/controls/vision/plotExtensions.kt → controls-vision/src/commonMain/kotlin/plotExtensions.kt
View File

5
demo/constructor/src/jsMain/kotlin/constructorJs.kt → controls-vision/src/jsMain/kotlin/client.kt
View File

@ -1,6 +1,11 @@
package space.kscience.controls.vision
import space.kscience.visionforge.markup.MarkupPlugin
import space.kscience.visionforge.plotly.PlotlyPlugin import space.kscience.visionforge.plotly.PlotlyPlugin
import space.kscience.visionforge.runVisionClient import space.kscience.visionforge.runVisionClient
public fun main(): Unit = runVisionClient { public fun main(): Unit = runVisionClient {
plugin(PlotlyPlugin) plugin(PlotlyPlugin)
plugin(MarkupPlugin)
// plugin(TableVisionJsPlugin)
} }

2
controls-vision/src/jvmMain/kotlin/space/kscience/controls/vision/dashboard.kt → controls-vision/src/jvmMain/kotlin/dashboard.kt
View File

@ -33,7 +33,7 @@ public fun Context.showDashboard(
visionPage( visionPage(
visionManager, visionManager,
VisionPage.scriptHeader("js/constructor.js"), VisionPage.scriptHeader("js/controls-vision.js"),
configurationBuilder = configurationBuilder, configurationBuilder = configurationBuilder,
visionFragment = visionFragment visionFragment = visionFragment
) )

4
demo/constructor/build.gradle.kts
View File

@ -4,7 +4,9 @@ plugins {
} }
kscience { kscience {
fullStack("js/constructor.js", jvmConfig = {withJava()}) jvm{
withJava()
}
useKtor() useKtor()
useContextReceivers() useContextReceivers()
dependencies { dependencies {

7
demo/constructor/src/jvmMain/kotlin/main.kt
View File

@ -21,7 +21,6 @@ import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit import kotlin.time.DurationUnit
@Suppress("ExtractKtorModule")
public fun main() { public fun main() {
val context = Context { val context = Context {
plugin(DeviceManager) plugin(DeviceManager)
@ -73,12 +72,6 @@ public fun main() {
} }
plot { plot {
// plotBooleanState(context, state.atStartState) {
// name = "start"
// }
// plotBooleanState(context, state.atEndState) {
// name = "end"
// }
plotDeviceProperty(device["start"], LimitSwitch.locked.name) { plotDeviceProperty(device["start"], LimitSwitch.locked.name) {
name = "start measured" name = "start measured"
mode = ScatterMode.markers mode = ScatterMode.markers