Skip to content

Commit 2587ddf

Browse files
3.0.3 Features, fixes (#55)
* Remove obsolete skia-mapper, prepare code to work with Lets-Plot v4.9.0 * Experimental visual testing * Fix build * Add figureModel cleanup in android plot panel * Migrate to 'drawable' from 'figure' * PlotFigureModel inherits FigureModelBase * Remove Skiko dependency from build configuration * Remove unused skiko version from build.gradle.kts * Update PlotFigureModel to use SpecOverrideState. * Remove 0.0.1-SNAPSHOT * Remove redundant dependencies already present in lets-plot-common * Add SkiaComposeCanvasTests to validate canvas rendering functionality * visual-testing initial integration. Temp ignored due to fonts inconsistency * Add NotoFontManager for test * Achieve rendering parity in Skia canvas and enable regression testing * Initial support for visual-tests on Android * Switch to LP 4.9.0-rc1 * Disable visual tests * Fix tests, minor code cleanup * Add macOS-specific image baselines due to text rendering differences * Update Kotlin and dependency versions in gradle.properties * Rename CanvasView2 --------- Co-authored-by: Ivan Kupriyanov <ikupriyanov@horis.ru> Co-authored-by: Ivan Kupriyanov <horis.ikupriyanov@gmail.com>
1 parent d680735 commit 2587ddf

305 files changed

Lines changed: 968 additions & 7649 deletions

File tree

Some content is hidden

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

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ allprojects {
4646
// version = "0.0.0-SNAPSHOT" // for local publishing only
4747

4848
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
49-
kotlinOptions {
50-
jvmTarget = "11"
49+
compilerOptions {
50+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
5151
}
5252
}
5353

@@ -134,7 +134,7 @@ subprojects {
134134
mavenLocal()
135135
}
136136

137-
val jarJavaDocs by tasks.creating(Jar::class) {
137+
val jarJavaDocs by tasks.registering(Jar::class) {
138138
archiveClassifier.set("javadoc")
139139
group = "lets plot"
140140
from("$rootDir/README.md")

demo/plot/compose-android-median/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ dependencies {
5757

5858
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-kernel:$letsPlotKotlinVersion")
5959
implementation("org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion")
60-
implementation("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
61-
implementation("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
6260

6361
implementation(project(":lets-plot-compose"))
6462
implementation(project(":demo-plot-shared"))

demo/plot/compose-android-min/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ dependencies {
5757

5858
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-kernel:$letsPlotKotlinVersion")
5959
implementation("org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion")
60-
implementation("org.jetbrains.lets-plot:plot-stem:$letsPlotVersion")
61-
implementation("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
62-
implementation("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
6360

6461
implementation(project(":lets-plot-compose"))
6562
implementation(project(":demo-plot-shared"))

demo/plot/compose-android-redraw/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ dependencies {
6161
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-kernel:$letsPlotKotlinVersion")
6262
implementation("org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion")
6363

64-
implementation("org.jetbrains.lets-plot:canvas:$letsPlotVersion")
65-
implementation("org.jetbrains.lets-plot:plot-raster:$letsPlotVersion")
66-
6764
implementation(project(":lets-plot-compose"))
6865
implementation(project(":demo-plot-shared"))
6966
}

demo/plot/compose-desktop/src/main/kotlin/demo/plot/interact/CustomToolbarAndDefaultInteractions.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.jetbrains.letsPlot.compose.sandbox.SandboxToolbarCmp
2121
import org.jetbrains.letsPlot.core.interact.InteractionSpec
2222
import org.jetbrains.letsPlot.interact.ggtb
2323
import plotSpec.AutoSpec
24+
import plotSpec.IrisSpec
2425

2526
/**
2627
* Demo showing:
@@ -86,7 +87,8 @@ fun main() = application {
8687
)
8788

8889
// Plot
89-
val plot = remember { AutoSpec().scatter() + ggtb() }
90+
// val plot = remember { AutoSpec().scatter() + ggtb() }
91+
val plot = remember { IrisSpec().pair() + ggtb() }
9092
PlotPanel(
9193
figure = plot,
9294
figureModel = figureModel,
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* Copyright (c) 2024 JetBrains s.r.o.
3+
* Use of this source code is governed by the MIT license that can be found in the LICENSE file.
4+
*/
5+
6+
package plotSpec
7+
8+
import demoData.Iris
9+
import org.jetbrains.letsPlot.Figure
10+
import org.jetbrains.letsPlot.geom.geomDensity
11+
import org.jetbrains.letsPlot.geom.geomPoint
12+
import org.jetbrains.letsPlot.gggrid
13+
import org.jetbrains.letsPlot.interact.ggtb
14+
import org.jetbrains.letsPlot.intern.Plot
15+
import org.jetbrains.letsPlot.intern.figure.SubPlotsFigure
16+
import org.jetbrains.letsPlot.letsPlot
17+
import org.jetbrains.letsPlot.scale.scaleYContinuous
18+
import org.jetbrains.letsPlot.themes.themeBW
19+
20+
class IrisSpec : PlotDemoFigure {
21+
override fun createFigureList(): List<Figure> {
22+
return listOf(
23+
scatter()
24+
)
25+
}
26+
27+
fun scatter(): Plot {
28+
return letsPlot(Iris.map()) {
29+
x = "sepal length (cm)"
30+
y = "sepal width (cm)"
31+
} + geomPoint(
32+
size = 5,
33+
alpha = 0.4
34+
) + themeBW()
35+
}
36+
37+
fun density(): Plot {
38+
return letsPlot(Iris.map()) {
39+
x = "sepal length (cm)"
40+
} + geomDensity(
41+
size = 1.5,
42+
alpha = 0.1
43+
) + scaleYContinuous(position = "right")
44+
}
45+
46+
fun pair(): SubPlotsFigure {
47+
return gggrid(
48+
plots = listOf(scatter(), density()),
49+
ncol = 2,
50+
sharex = "row"
51+
)
52+
}
53+
}

demo/svg/compose-desktop/build.gradle.kts

Lines changed: 0 additions & 19 deletions
This file was deleted.

demo/svg/compose-desktop/src/main/kotlin/demo/svg/AppMain.kt

Lines changed: 0 additions & 87 deletions
This file was deleted.

demo/svg/swing/build.gradle.kts

Lines changed: 0 additions & 17 deletions
This file was deleted.

demo/svg/swing/src/main/kotlin/demo/svg/ClipPathSvgDemo.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)