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 +18 -17
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4970955cb - Show all commits

3
playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
View File

@ -1,5 +1,6 @@
package ru.mipt.npm.sat package ru.mipt.npm.sat
import hep.dataforge.vision.ResourceLocation
import hep.dataforge.vision.VisionManager import hep.dataforge.vision.VisionManager
import hep.dataforge.vision.html.fragment import hep.dataforge.vision.html.fragment
import hep.dataforge.vision.solid.box import hep.dataforge.vision.solid.box
@ -15,5 +16,5 @@ fun main() {
} }
} }
fragment.makeFile() fragment.makeFile(resourceLocation = ResourceLocation.LOCAL)
} }

6
visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
View File

@ -102,11 +102,10 @@ internal fun fileCssHeader(
@DFExperimental @DFExperimental
public fun Context.Companion.scriptHeader( public fun Context.Companion.scriptHeader(
scriptResource: String, scriptResource: String,
basePath: Path?, basePath: Path,
resourceLocation: ResourceLocation, resourceLocation: ResourceLocation,
): HtmlFragment { ): HtmlFragment {
val targetPath = if (basePath == null) null else { val targetPath = when (resourceLocation) {
when (resourceLocation) {
ResourceLocation.LOCAL -> checkOrStoreFile( ResourceLocation.LOCAL -> checkOrStoreFile(
basePath, basePath,
Path.of(DATAFORGE_ASSETS_PATH), Path.of(DATAFORGE_ASSETS_PATH),
@ -119,7 +118,6 @@ public fun Context.Companion.scriptHeader(
) )
ResourceLocation.EMBED -> null ResourceLocation.EMBED -> null
} }
}
return if (targetPath == null) { return if (targetPath == null) {
embedScriptHeader(scriptResource) embedScriptHeader(scriptResource)
} else { } else {

4
visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
View File

@ -10,6 +10,7 @@ import hep.dataforge.vision.makeFile
import hep.dataforge.vision.scriptHeader import hep.dataforge.vision.scriptHeader
import hep.dataforge.vision.solid.SolidGroup import hep.dataforge.vision.solid.SolidGroup
import hep.dataforge.vision.solid.SolidManager import hep.dataforge.vision.solid.SolidManager
import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
public actual val visionContext: Context = Global.context("vision-server") { public actual val visionContext: Context = Global.context("vision-server") {
@ -38,6 +39,7 @@ public fun HtmlVisionFragment.makeFile(
resourceLocation: ResourceLocation = ResourceLocation.SYSTEM, resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
show: Boolean = true, show: Boolean = true,
) { ) {
val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", path, resourceLocation) val actualPath = path ?: Files.createTempFile("tempPlot", ".html")
val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", actualPath, resourceLocation)
makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader)) makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader))
} }