forked from kscience/visionforge
Fix persistent bug with sat-demo updates
This commit is contained in:
parent
3f9f253416
commit
33146fef1b
@ -10,6 +10,7 @@
|
|||||||
## Table of Contents
|
## Table of Contents
|
||||||
|
|
||||||
* [Introduction](#introduction)
|
* [Introduction](#introduction)
|
||||||
|
* [Requirements](#requirements)
|
||||||
* [Features](#features)
|
* [Features](#features)
|
||||||
* [About DataForge](#about-dataforge)
|
* [About DataForge](#about-dataforge)
|
||||||
* [Modules contained in this repository](#modules-contained-in-this-repository)
|
* [Modules contained in this repository](#modules-contained-in-this-repository)
|
||||||
@ -34,6 +35,9 @@ Other applications including 2D plots are planned for the future.
|
|||||||
The project is developed as a [Kotlin multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html)
|
The project is developed as a [Kotlin multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html)
|
||||||
application, currently targeting browser JavaScript and JVM.
|
application, currently targeting browser JavaScript and JVM.
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
JVM backend requires JDK 11 or later
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
|
@ -86,7 +86,9 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
|
|||||||
if (inherit) {
|
if (inherit) {
|
||||||
yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
|
yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
|
||||||
}
|
}
|
||||||
yield(descriptor?.get(name)?.defaultItem())
|
if (includeDefaults) {
|
||||||
|
yield(descriptor?.get(name)?.defaultItem())
|
||||||
|
}
|
||||||
}.merge()
|
}.merge()
|
||||||
|
|
||||||
override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
|
override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
|
||||||
|
@ -82,7 +82,7 @@ private fun CoroutineScope.collectChange(
|
|||||||
|
|
||||||
//Collect properties change
|
//Collect properties change
|
||||||
source.onPropertyChange(this) { propertyName ->
|
source.onPropertyChange(this) { propertyName ->
|
||||||
val newItem = source.getProperty(propertyName, inherit = false, includeStyles = false, includeDefaults = false)
|
val newItem = source.getOwnProperty(propertyName)
|
||||||
collector().propertyChanged(name, propertyName, newItem)
|
collector().propertyChanged(name, propertyName, newItem)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import kotlinx.html.*
|
|||||||
* A placeholder object to attach inline vision builders.
|
* A placeholder object to attach inline vision builders.
|
||||||
*/
|
*/
|
||||||
@DFExperimental
|
@DFExperimental
|
||||||
public class VisionOutput @PublishedApi internal constructor(){
|
public class VisionOutput @PublishedApi internal constructor() {
|
||||||
public var meta: Meta = Meta.EMPTY
|
public var meta: Meta = Meta.EMPTY
|
||||||
|
|
||||||
public inline fun meta(block: MetaBuilder.() -> Unit) {
|
public inline fun meta(block: MetaBuilder.() -> Unit) {
|
||||||
@ -104,6 +104,6 @@ public abstract class VisionTagConsumer<R>(
|
|||||||
public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
|
public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
|
||||||
public const val DEFAULT_ENDPOINT: String = "."
|
public const val DEFAULT_ENDPOINT: String = "."
|
||||||
|
|
||||||
public const val DEFAULT_VISION_NAME = "vision"
|
public const val DEFAULT_VISION_NAME: String = "vision"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user