Skip to content

Commit a80d846

Browse files
OLarionova-HORISalshan
OLarionova-HORIS
and
alshan
authored
Update demos and tests to camelcase (#65)
* Update jfx demos to camelCase. * Update batik demos to camelCase. * Update HLineVLineScripts to camelCase. * Tests in camelCase. * Demos in camelCase. Co-authored-by: Igor Alshannikov <[email protected]>
1 parent faaffba commit a80d846

File tree

80 files changed

+554
-544
lines changed

Some content is hidden

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

80 files changed

+554
-544
lines changed

‎demo/browser/src/main/kotlin/frontendContextDemo/scripts/BarGeomAndCountStat.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package frontendContextDemo.scripts
77

8-
import jetbrains.letsPlot.ggplot
9-
import jetbrains.letsPlot.stat.stat_count
108
import frontendContextDemo.ScriptInBrowserContext
119
import jetbrains.letsPlot.geom.geomBar
10+
import jetbrains.letsPlot.ggplot
11+
import jetbrains.letsPlot.stat.statCount
1212

1313
object BarGeomAndCountStat {
1414
@JvmStatic
@@ -28,7 +28,7 @@ object BarGeomAndCountStat {
2828
}
2929

3030
// count stat (with bar geom by default)
31-
val countLayer = stat_count {
31+
val countLayer = statCount {
3232
x = "cat1"
3333
fill = "cat2"
3434
}

‎demo/browser/src/main/kotlin/frontendContextDemo/scripts/PointsOverBars.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
package frontendContextDemo.scripts
77

8+
import frontendContextDemo.ScriptInBrowserContext
89
import jetbrains.letsPlot.Pos
910
import jetbrains.letsPlot.Stat
10-
import jetbrains.letsPlot.geom.geom_point
11-
import jetbrains.letsPlot.ggplot
12-
import frontendContextDemo.ScriptInBrowserContext
1311
import jetbrains.letsPlot.geom.geomBar
12+
import jetbrains.letsPlot.geom.geomPoint
13+
import jetbrains.letsPlot.ggplot
1414

1515
object PointsOverBars {
1616
@JvmStatic
@@ -30,7 +30,7 @@ object PointsOverBars {
3030
}
3131

3232
// points with count stat and `stack` position adjustment
33-
val points = geom_point(stat = Stat.count(), position = Pos.stack, size = 15.0) {
33+
val points = geomPoint(stat = Stat.count(), position = Pos.stack, size = 15.0) {
3434
x = "cat1"
3535
color = "cat2"
3636
}

‎demo/demo-common/src/main/kotlin/frontendContextDemo/scripts/HLineVLineScripts.kt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package frontendContextDemo.scripts
77

88
import jetbrains.datalore.base.values.Color
9-
import jetbrains.letsPlot.geom.geom_abline
10-
import jetbrains.letsPlot.geom.geom_hline
11-
import jetbrains.letsPlot.geom.geom_point
12-
import jetbrains.letsPlot.geom.geom_vline
9+
import jetbrains.letsPlot.geom.geomABLine
10+
import jetbrains.letsPlot.geom.geomHLine
11+
import jetbrains.letsPlot.geom.geomPoint
12+
import jetbrains.letsPlot.geom.geomVLine
1313
import jetbrains.letsPlot.ggplot
1414
import jetbrains.letsPlot.label.ggtitle
1515
import jetbrains.letsPlot.letsPlot
@@ -30,15 +30,15 @@ object HLineVLineScripts {
3030

3131
val p = letsPlot(data) { x = "x"; y = "y" } +
3232
ggtitle("Horizontal and vertical lines of different styles + points") +
33-
geom_point(size = 80.0, alpha = 0.2, showLegend = false) { color = "c" } +
34-
geom_hline(yintercept = 3.7) +
35-
geom_hline(yintercept = 2.7, color = "red", linetype = "dashed", size = 1.0) +
36-
geom_hline(yintercept = 1.7, color = "green", linetype = "dotted", size = 2.0) +
37-
geom_hline(yintercept = 0.7, color = "orange", linetype = "dotdash", size = 3.0) +
38-
geom_vline(xintercept = 0.7, color = "black", linetype = "longdash", size = 1.5, alpha = 0.5) +
39-
geom_vline(xintercept = 1.7, color = "#770077", linetype = "twodash", size = 1.0) +
40-
geom_vline(xintercept = 2.7, color = "blue", linetype = "blank", size = 0.7) +
41-
geom_vline(xintercept = 3.7)
33+
geomPoint(size = 80.0, alpha = 0.2, showLegend = false) { color = "c" } +
34+
geomHLine(yintercept = 3.7) +
35+
geomHLine(yintercept = 2.7, color = "red", linetype = "dashed", size = 1.0) +
36+
geomHLine(yintercept = 1.7, color = "green", linetype = "dotted", size = 2.0) +
37+
geomHLine(yintercept = 0.7, color = "orange", linetype = "dotdash", size = 3.0) +
38+
geomVLine(xintercept = 0.7, color = "black", linetype = "longdash", size = 1.5, alpha = 0.5) +
39+
geomVLine(xintercept = 1.7, color = "#770077", linetype = "twodash", size = 1.0) +
40+
geomVLine(xintercept = 2.7, color = "blue", linetype = "blank", size = 0.7) +
41+
geomVLine(xintercept = 3.7)
4242

4343
// ToDo: scale_xxx_identity
4444
// + scale_color_identity()
@@ -52,7 +52,7 @@ object HLineVLineScripts {
5252
"rating" to listOf(-0.011843241476365302, 0.5547269440141214)
5353
)
5454
val p = ggplot() +
55-
geom_vline(data = cdata, linetype = "dashed", size = 1.0) {
55+
geomVLine(data = cdata, linetype = "dashed", size = 1.0) {
5656
xintercept = "rating"
5757
color = "cond"
5858
}
@@ -71,7 +71,7 @@ object HLineVLineScripts {
7171
"rating" to input.values
7272
)
7373
val p = ggplot() +
74-
geom_vline(data = cdata, linetype = "dashed", size = 1.0) {
74+
geomVLine(data = cdata, linetype = "dashed", size = 1.0) {
7575
xintercept = "rating"
7676
color = "cond"
7777
}
@@ -83,10 +83,10 @@ object HLineVLineScripts {
8383
// use 'alpha' parameter
8484
val p = ggplot() +
8585
ggtitle("Use 'alpha' parameter") +
86-
geom_vline(xintercept = 0, color = "red", size = 2, alpha = 0.1) +
87-
geom_hline(yintercept=0, color="red", size=2, alpha=0.5) +
88-
geom_abline(intercept=0, slope=1.0, color="red", size=2, alpha=1) +
89-
geom_abline(intercept=0, slope=-1.0, color="red", size=2, alpha=0)
86+
geomVLine(xintercept = 0, color = "red", size = 2, alpha = 0.1) +
87+
geomHLine(yintercept = 0, color = "red", size = 2, alpha = 0.5) +
88+
geomABLine(intercept = 0, slope = 1.0, color = "red", size = 2, alpha = 1) +
89+
geomABLine(intercept = 0, slope = -1.0, color = "red", size = 2, alpha = 0)
9090
p.show()
9191
}
9292
}

‎demo/geotools-batik/src/main/kotlin/naturalEarth/PolygonsAndPointsMapMain.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package naturalEarth
77

88
import jetbrains.datalore.base.geometry.DoubleVector
9-
import jetbrains.letsPlot.geom.geom_point
10-
import jetbrains.letsPlot.geom.geom_polygon
9+
import jetbrains.letsPlot.geom.geomPoint
10+
import jetbrains.letsPlot.geom.geomPolygon
1111
import jetbrains.letsPlot.intern.toSpec
1212
import jetbrains.letsPlot.label.ggtitle
1313
import jetbrains.letsPlot.letsPlot
@@ -22,8 +22,8 @@ fun main() {
2222
val polygonsSD = polygons.toSpatialDataset(10)
2323
val citiesSD = cities.toSpatialDataset()
2424
val p = letsPlot() +
25-
geom_polygon(map = polygonsSD, fill = "white", color = "gray") +
26-
geom_point(map = citiesSD, color = "red") +
25+
geomPolygon(map = polygonsSD, fill = "white", color = "gray") +
26+
geomPoint(map = citiesSD, color = "red") +
2727
ggtitle("geom_polygon, geom_point: 'map'")
2828

2929
SimpleBatikView.show(

‎demo/geotools-batik/src/main/kotlin/naturalEarth/PolygonsDataMain.kt‎

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

88
import jetbrains.datalore.base.geometry.DoubleVector
9-
import jetbrains.letsPlot.geom.geom_polygon
9+
import jetbrains.letsPlot.geom.geomPolygon
1010
import jetbrains.letsPlot.intern.toSpec
1111
import jetbrains.letsPlot.label.ggtitle
1212
import jetbrains.letsPlot.letsPlot
@@ -18,7 +18,7 @@ fun main() {
1818

1919
// Lets-Plot
2020
val spatialDataset = features.toSpatialDataset(10)
21-
val p = letsPlot() + geom_polygon(data = spatialDataset, alpha = 0.2, color = "black") {
21+
val p = letsPlot() + geomPolygon(data = spatialDataset, alpha = 0.2, color = "black") {
2222
fill = "continent"
2323
} + ggtitle("geom_polygon: 'data'")
2424

‎demo/geotools-batik/src/main/kotlin/naturalEarth/PolygonsMapJoinMain.kt‎

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

88
import jetbrains.datalore.base.geometry.DoubleVector
9-
import jetbrains.letsPlot.geom.geom_polygon
9+
import jetbrains.letsPlot.geom.geomPolygon
1010
import jetbrains.letsPlot.intern.toSpec
1111
import jetbrains.letsPlot.label.ggtitle
1212
import jetbrains.letsPlot.letsPlot
@@ -24,7 +24,7 @@ fun main() {
2424
"region" to listOf("Europe", "Asia", "North America", "Africa", "Australia", "Oceania"),
2525
"avg_temp" to listOf(8.6, 16.6, 11.7, 21.9, 14.9, 23.9)
2626
)
27-
val p = letsPlot() + geom_polygon(
27+
val p = letsPlot() + geomPolygon(
2828
data = climateData,
2929
map = spatialDataset,
3030
mapJoin = "region" to "continent",

‎demo/geotools-batik/src/main/kotlin/naturalEarth/PolygonsMapMain.kt‎

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

88
import jetbrains.datalore.base.geometry.DoubleVector
9-
import jetbrains.letsPlot.geom.geom_polygon
9+
import jetbrains.letsPlot.geom.geomPolygon
1010
import jetbrains.letsPlot.intern.toSpec
1111
import jetbrains.letsPlot.label.ggtitle
1212
import jetbrains.letsPlot.letsPlot
@@ -18,7 +18,7 @@ fun main() {
1818

1919
// Lets-Plot
2020
val spatialDataset = features.toSpatialDataset(10)
21-
val p = letsPlot() + geom_polygon(map = spatialDataset, alpha = 0.2, color = "black") +
21+
val p = letsPlot() + geomPolygon(map = spatialDataset, alpha = 0.2, color = "black") +
2222
ggtitle("geom_polygon: 'map'")
2323

2424
SimpleBatikView.show(

‎demo/geotools-batik/src/main/kotlin/naturalEarth/ReferencedEnvelopeMain.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package naturalEarth
77

88
import jetbrains.datalore.base.geometry.DoubleVector
9-
import jetbrains.letsPlot.geom.geom_polygon
10-
import jetbrains.letsPlot.geom.geom_rect
9+
import jetbrains.letsPlot.geom.geomPolygon
10+
import jetbrains.letsPlot.geom.geomRect
1111
import jetbrains.letsPlot.intern.toSpec
1212
import jetbrains.letsPlot.label.ggtitle
1313
import jetbrains.letsPlot.letsPlot
@@ -34,9 +34,9 @@ fun main() {
3434
val boundaries = features.toSpatialDataset(10)
3535
val box = envelope.toSpatialDataset()
3636
val p = letsPlot() +
37-
geom_polygon(map = boundaries, alpha = 0.2, color = "black") +
38-
geom_rect(map = box, size = 4, color = "orange", alpha = 0) +
39-
geom_rect(map = anotherEnvelope.toSpatialDataset(), size = 4, color = "light-blue", alpha = 0) +
37+
geomPolygon(map = boundaries, alpha = 0.2, color = "black") +
38+
geomRect(map = box, size = 4, color = "orange", alpha = 0) +
39+
geomRect(map = anotherEnvelope.toSpatialDataset(), size = 4, color = "light-blue", alpha = 0) +
4040
ggtitle("geom_polygon: 'map'")
4141

4242
SimpleBatikView.show(

‎demo/jvm-batik/src/main/kotlin/frontendContextDemo/scripts/AsDiscrete.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package frontendContextDemo.scripts
77

88
import frontendContextDemo.ScriptInBatikContext
9-
import jetbrains.letsPlot.as_discrete
10-
import jetbrains.letsPlot.geom.geom_point
9+
import jetbrains.letsPlot.asDiscrete
10+
import jetbrains.letsPlot.geom.geomPoint
1111
import jetbrains.letsPlot.ggplot
1212
import jetbrains.letsPlot.label.ggtitle
13-
import jetbrains.letsPlot.scale.scale_color_discrete
13+
import jetbrains.letsPlot.scale.scaleColorDiscrete
1414

1515
object AsDiscrete {
1616
@JvmStatic
@@ -26,45 +26,45 @@ object AsDiscrete {
2626
// scale
2727
run {
2828
val p = ggplot(dat) { x = "x"; y = "y" } +
29-
geom_point(size = 9.0) { color = "a" } + scale_color_discrete(name = "custom name") +
29+
geomPoint(size = 9.0) { color = "a" } + scaleColorDiscrete(name = "custom name") +
3030
ggtitle("scale_color_discrete()")
3131
p.show()
3232
}
3333

3434
// as_discrete, no scale
3535
run {
3636
val p = ggplot(dat) { x = "x"; y = "y" } +
37-
geom_point(size = 9.0) { color = as_discrete(variable = "a", label = "custom name") } +
37+
geomPoint(size = 9.0) { color = asDiscrete(variable = "a", label = "custom name") } +
3838
ggtitle("color as_discrete()")
3939
p.show()
4040
}
4141

4242
// as_discrete, scale
4343
run {
4444
val p = ggplot(dat) { x = "x"; y = "y" } +
45-
geom_point(shape = 21, size = 9.0, stroke = 5.0) { color = "a"; fill = as_discrete("b") } +
46-
scale_color_discrete() +
45+
geomPoint(shape = 21, size = 9.0, stroke = 5.0) { color = "a"; fill = asDiscrete("b") } +
46+
scaleColorDiscrete() +
4747
ggtitle("scale_color_discrete(), fill as_discrete()")
4848
p.show()
4949
}
5050

5151
// data in mappings, scale_color_discrete
5252
run {
5353
val p = ggplot() +
54-
geom_point(size = 9.0) {
54+
geomPoint(size = 9.0) {
5555
x = listOf(0, 5, 10)
5656
y = listOf(0, 5, 10)
5757
color = listOf(1, 2, 4)
5858
} +
59-
scale_color_discrete() +
59+
scaleColorDiscrete() +
6060
ggtitle("scale_color_discrete()")
6161
p.show()
6262
}
6363

6464
// as_discrete should work when it is used in "ggplot()" mapping
6565
run {
66-
val p = ggplot(dat) { x = "x"; y = "y"; color = as_discrete(variable = "a") } +
67-
geom_point(size = 9.0) +
66+
val p = ggplot(dat) { x = "x"; y = "y"; color = asDiscrete(variable = "a") } +
67+
geomPoint(size = 9.0) +
6868
ggtitle("color as_discrete()")
6969
p.show()
7070
}

‎demo/jvm-batik/src/main/kotlin/frontendContextDemo/scripts/BarGeomAndCountStat.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package frontendContextDemo.scripts
77

8-
import jetbrains.letsPlot.ggplot
9-
import jetbrains.letsPlot.stat.stat_count
108
import frontendContextDemo.ScriptInBatikContext
119
import jetbrains.letsPlot.geom.geomBar
10+
import jetbrains.letsPlot.ggplot
11+
import jetbrains.letsPlot.stat.statCount
1212

1313
object BarGeomAndCountStat {
1414
@JvmStatic
@@ -28,7 +28,7 @@ object BarGeomAndCountStat {
2828
}
2929

3030
// count stat (with bar geom by default)
31-
val countLayer = stat_count {
31+
val countLayer = statCount {
3232
x = "cat1"
3333
fill = "cat2"
3434
}

0 commit comments

Comments
 (0)