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

Minor fixes

Browse Source
This commit is contained in:
Alexander Nozik 2023-05-30 20:04:23 +03:00
parent be52551564
commit a872f10523
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
View File

@ -92,6 +92,7 @@ public abstract class VisionTagConsumer<R>(
vision.setAsRoot(manager) vision.setAsRoot(manager)
} }
attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString() attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString()
renderVision(manager, name, vision, outputMeta)
if (!outputMeta.isEmpty()) { if (!outputMeta.isEmpty()) {
//Hard-code output configuration //Hard-code output configuration
script { script {
@ -102,7 +103,6 @@ public abstract class VisionTagConsumer<R>(
} }
} }
} }
renderVision(manager, name, vision, outputMeta)
} }
/** /**

3
visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
View File

@ -14,6 +14,7 @@ import space.kscience.dataforge.misc.DFExperimental
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.plotly.Plot import space.kscience.plotly.Plot
import space.kscience.plotly.Plotly import space.kscience.plotly.Plotly
import space.kscience.plotly.PlotlyConfig
import space.kscience.visionforge.MutableVisionProperties import space.kscience.visionforge.MutableVisionProperties
import space.kscience.visionforge.Vision import space.kscience.visionforge.Vision
import space.kscience.visionforge.VisionBuilder import space.kscience.visionforge.VisionBuilder
@ -88,8 +89,10 @@ public fun Plot.asVision(): VisionOfPlotly = VisionOfPlotly(this)
*/ */
@VisionBuilder @VisionBuilder
public inline fun VisionOutput.plotly( public inline fun VisionOutput.plotly(
config: PlotlyConfig = PlotlyConfig(),
block: Plot.() -> Unit, block: Plot.() -> Unit,
): VisionOfPlotly { ): VisionOfPlotly {
requirePlugin(PlotlyPlugin) requirePlugin(PlotlyPlugin)
meta = config.meta
return VisionOfPlotly(Plotly.plot(block)) return VisionOfPlotly(Plotly.plot(block))
} }