Skip to content

Commit 917b5b2

Browse files
committed
Merge pull request '0.5.1' (!84) from dev into main
Reviewed-on: https://git.sciprog.center/kscience/visionforge/pulls/84
2 parents ad5ec93 + 3c20583 commit 917b5b2

File tree

68 files changed

+303
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+303
-457
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v3
1414
- uses: actions/setup-java@v3.5.1
1515
with:
16-
java-version: '17'
16+
java-version: '21'
1717
distribution: 'liberica'
1818
cache: 'gradle'
1919
- name: Gradle Wrapper Validation

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-java@v4
1515
with:
16-
java-version: 17
16+
java-version: 21
1717
distribution: liberica
1818
- uses: gradle/gradle-build-action@v3
1919
with:

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@
1414

1515
### Security
1616

17+
## 0.5.1 - 2026-01-10
18+
19+
### Changed
20+
21+
- Kotlin 2.3
22+
23+
### Fixed
24+
25+
- Fix DSLMarker annotations for builders
26+
- Flaky test
27+
- Fix the problem where property listeners do not react on property child node changes
28+
- Plotly plot title now writes proper field
29+
1730
## 0.5.0 - 2025-03-21
1831

1932
### Added

README.md

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
[![Slack](https://img.shields.io/badge/slack-channel-green?logo=slack)](https://kotlinlang.slack.com/archives/CEXV2QWNM)
77

8-
# DataForge Visualization Platform
8+
# VisionForge platform
99

1010
## Table of Contents
1111

1212
* [Introduction](#introduction)
1313
* [Requirements](#requirements)
1414
* [Features](#features)
15-
* [About DataForge](#about-dataforge)
15+
* [About VisionForge](#about-VisionForge)
1616
* [Modules contained in this repository](#modules-contained-in-this-repository)
1717
* [Visualization for External Systems](#visualization-for-external-systems)
1818
* [Demonstrations](#demonstrations)
@@ -23,7 +23,7 @@
2323

2424
## Introduction
2525

26-
This repository contains a [DataForge](#about-dataforge)\-based framework
26+
This repository contains a [VisionForge](#about-VisionForge) framework
2727
used for visualization in various scientific applications.
2828

2929
The main framework's use case for now is 3D visualization for particle physics experiments.
@@ -41,16 +41,16 @@ JVM backend requires JDK 11 or later
4141
The main framework's features for now include:
4242
- 3D visualization of complex experimental set-ups
4343
- Event display such as particle tracks, etc.
44-
- Scales up to few hundred thousands of elements
45-
- Camera move, rotate, zoom-in and zoom-out
44+
- Scales up to hundreds of thousands of elements
45+
- The camera moves, rotates, zoom-in and zoom-out
4646
- Scene graph as an object tree with property editor
4747
- Settings export and import
4848
- Multiple platform support
4949

50-
## About DataForge
50+
## About VisionForge
5151

52-
DataForge is a software framework for automated scientific data processing. DataForge Visualization
53-
Platform uses some of the concepts and modules of DataForge, including: `Meta`, `Configuration`, `Context`,
52+
[DataForge](https://git.sciprog.center/kscience/dataforge-core) is a software framework for automated scientific data processing. VisionForge
53+
Platform uses some concepts and modules of DataForge, including: `Meta`, `Configuration`, `Context`,
5454
`Provider`, and some others.
5555

5656
To learn more about DataForge, please consult the following URLs:
@@ -66,10 +66,6 @@ To learn more about DataForge, please consult the following URLs:
6666
>
6767
> **Maturity**: EXPERIMENTAL
6868
69-
### [demo](demo)
70-
>
71-
> **Maturity**: EXPERIMENTAL
72-
7369
### [plotly-kt](plotly-kt)
7470
>
7571
> **Maturity**: EXPERIMENTAL
@@ -131,10 +127,6 @@ To learn more about DataForge, please consult the following URLs:
131127
>
132128
> **Maturity**: EXPERIMENTAL
133129
134-
### [demo/playground](demo/playground)
135-
>
136-
> **Maturity**: EXPERIMENTAL
137-
138130
### [demo/sat-demo](demo/sat-demo)
139131
>
140132
> **Maturity**: EXPERIMENTAL
@@ -143,10 +135,6 @@ To learn more about DataForge, please consult the following URLs:
143135
>
144136
> **Maturity**: EXPERIMENTAL
145137
146-
### [plotly-kt/examples](plotly-kt/examples)
147-
>
148-
> **Maturity**: EXPERIMENTAL
149-
150138
### [plotly-kt/plotly-kt-core](plotly-kt/plotly-kt-core)
151139
>
152140
> **Maturity**: DEVELOPMENT
@@ -164,18 +152,6 @@ To learn more about DataForge, please consult the following URLs:
164152
>
165153
> **Maturity**: EXPERIMENTAL
166154
167-
### [plotly-kt/examples/compose-demo](plotly-kt/examples/compose-demo)
168-
>
169-
> **Maturity**: EXPERIMENTAL
170-
171-
### [plotly-kt/examples/js-demo](plotly-kt/examples/js-demo)
172-
>
173-
> **Maturity**: EXPERIMENTAL
174-
175-
### [plotly-kt/examples/native-demo](plotly-kt/examples/native-demo)
176-
>
177-
> **Maturity**: EXPERIMENTAL
178-
179155

180156
**Class diagram:**
181157

build.gradle.kts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
alias(spclibs.plugins.kotlinx.kover)
88
}
99

10-
val dataforgeVersion by extra("0.10.1")
10+
val dataforgeVersion by extra("0.10.2")
1111

1212
allprojects {
1313
group = "space.kscience"
14-
version = "0.5.0"
14+
version = "0.5.1"
1515
}
1616

1717
subprojects {
@@ -39,17 +39,24 @@ subprojects {
3939
}
4040

4141

42-
ksciencePublish {
42+
kscienceProject {
4343
pom("https://github.com/SciProgCentre/visionforge") {
4444
useApache2Licence()
4545
useSPCTeam()
4646
}
47-
repository("spc", "https://maven.sciprog.center/kscience")
48-
central()
49-
}
47+
publishTo("spc", "https://maven.sciprog.center/kscience")
48+
publishToCentral()
49+
50+
abiValidation {
51+
// filters{
52+
// excluded{
53+
// byNames
54+
// }
55+
// }
56+
//ignoredPackages.add("info.laht.threekt")
57+
}
5058

51-
apiValidation {
52-
ignoredPackages.add("info.laht.threekt")
59+
readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
5360
}
5461

55-
readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
62+

cern-root-loader/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## Artifact:
88

9-
The Maven coordinates of this project are `space.kscience:cern-root-loader:0.5.0`.
9+
The Maven coordinates of this project are `space.kscience:cern-root-loader:0.5.1`.
1010

1111
**Gradle Kotlin DSL:**
1212
```kotlin
@@ -16,6 +16,6 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation("space.kscience:cern-root-loader:0.5.0")
19+
implementation("space.kscience:cern-root-loader:0.5.1")
2020
}
2121
```

demo/js-playground/src/jsMain/kotlin/gravityDemo.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ fun GravityDemo(context: Context) {
8181
y = h
8282

8383

84-
box(200, 5, 200, name = "floor") {
85-
y = -2.5
86-
}
8784
}
85+
86+
box(200, 5, 200, name = "floor") {
87+
y = -2.5
88+
}
89+
8890
}
8991
}
9092

demo/muon-monitor/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ kscience {
1212
"muon-monitor.js",
1313
development = false,
1414
jvmConfig = {
15-
binaries {
16-
executable {
17-
mainClass.set("ru.mipt.npm.muon.monitor.MMServerKt")
18-
}
19-
}
15+
application("ru.mipt.npm.muon.monitor.MMServerKt")
2016
},
2117
browserConfig = {
2218
commonWebpackConfig {

demo/playground/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
kotlin("multiplatform")
3-
kotlin("jupyter.api")
3+
alias(spclibs.plugins.kotlin.jupyter.api)
44
id("com.gradleup.shadow") version "8.3.6"
55

66
}
@@ -12,7 +12,7 @@ repositories {
1212
}
1313

1414
kotlin {
15-
jvmToolchain(17)
15+
jvmToolchain(21)
1616
js {
1717
useEsModules()
1818
browser {

demo/playground/src/jvmMain/kotlin/antenna.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ suspend fun main() = serve(
4949
//axes(200)
5050
ambientLight {
5151
color(Colors.white)
52-
intensity = 3.0
52+
intensity = 1.5
5353
}
5454
val platform = solidGroup("platform") {
5555
cylinder(50, 5, name = "base")
@@ -88,7 +88,7 @@ suspend fun main() = serve(
8888
val incRot = Quaternion.fromRotation(30.degrees, Float64Space3D.zAxis)
8989

9090

91-
context.launch {
91+
this@vision.context.launch {
9292
var time: Long = 0L
9393
while (isActive) {
9494
with(QuaternionAlgebra) {

0 commit comments

Comments
 (0)