Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add element_geom(pen, brush, paper) #836

Merged
merged 15 commits into from
Aug 4, 2023
Merged

Add element_geom(pen, brush, paper) #836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
488284c
`theme_none()`: use grey colors for elements.
OLarionova-HORIS Aug 2, 2023
05282e5
Add theme keys for 'pen', 'brush', 'paper'. Add ColorTheme to access …
OLarionova-HORIS Aug 2, 2023
80b8068
Use `ColorTheme` colors as default in NamedSystemColors.
OLarionova-HORIS Aug 2, 2023
5488813
Update demo.
OLarionova-HORIS Aug 2, 2023
6b270a2
Access to colors via `ColorTheme` (also use for color defaults of geo…
OLarionova-HORIS Aug 3, 2023
eed03e8
Use `color.paper()` in `GeomContext`.
OLarionova-HORIS Aug 3, 2023
7a90be7
Check ordering in theme setting to choose which colors to use.
OLarionova-HORIS Aug 3, 2023
b7a2358
Update demo.
OLarionova-HORIS Aug 3, 2023
ba3800a
Fix key order in plot spec.
OLarionova-HORIS Aug 3, 2023
e1eaf98
Minor.
OLarionova-HORIS Aug 3, 2023
2c13984
Add `element_geom()` to python.
OLarionova-HORIS Aug 3, 2023
5b50496
Remove extra import.
OLarionova-HORIS Aug 4, 2023
ab0c575
Add ThemeConfigTest.
OLarionova-HORIS Aug 4, 2023
3f61bab
Update future_changes.md.
OLarionova-HORIS Aug 4, 2023
9d7e414
Reformat code.
OLarionova-HORIS Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use ColorTheme colors as default in NamedSystemColors.
  • Loading branch information
@OLarionova-HORIS
OLarionova-HORIS committed Aug 4, 2023
commit 80b80680dd11f207127d6f52042a8c7483b65deb
16 changes: 12 additions & 4 deletions plot-stem/src/commonMain/kotlin/org/jetbrains/letsPlot/core/spec/config/PlotConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

package org.jetbrains.letsPlot.core.spec.config

import org.jetbrains.letsPlot.commons.intern.json.getString
import org.jetbrains.letsPlot.core.plot.base.Aes
import org.jetbrains.letsPlot.core.plot.base.DataFrame
import org.jetbrains.letsPlot.core.plot.base.GeomKind
import org.jetbrains.letsPlot.core.plot.base.Transform
import org.jetbrains.letsPlot.core.plot.base.data.DataFrameUtil
import org.jetbrains.letsPlot.core.plot.builder.assemble.PlotFacets
import org.jetbrains.letsPlot.core.plot.builder.data.OrderOptionUtil
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.ThemeFlavor
import org.jetbrains.letsPlot.core.plot.builder.presentation.DefaultFontFamilyRegistry
import org.jetbrains.letsPlot.core.plot.builder.scale.MapperProvider
import org.jetbrains.letsPlot.core.plot.builder.scale.ScaleProvider
import org.jetbrains.letsPlot.core.spec.*
Expand Down Expand Up @@ -62,9 +63,16 @@ abstract class PlotConfig(
sharedData = ConfigUtil.createDataFrame(get(DATA))

// update the color option converter with system named colors including flavors
val flavorTheme = getMap(Option.Plot.THEME).getString(Option.Theme.FLAVOR)?.let(ThemeFlavor.Companion::forName)
val colorConverter = NamedSystemColorOptionConverter(NamedSystemColors(flavorTheme))
AesOptionConversion.updateWith(colorConverter)
run {
val themeConfig = ThemeConfig(getMap(Option.Plot.THEME), DefaultFontFamilyRegistry())
val colorConverter = NamedSystemColorOptionConverter(
NamedSystemColors(
colorTheme = themeConfig.theme.colors(),
themeFlavor = themeConfig.themeFlavor
)
)
AesOptionConversion.updateWith(colorConverter)
}

layerConfigs = createLayerConfigs(sharedData, isClientSide)

Expand Down
11 changes: 4 additions & 7 deletions plot-stem/src/commonMain/kotlin/org/jetbrains/letsPlot/core/spec/config/ThemeConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class ThemeConfig constructor(
) {

val theme: Theme
val themeFlavor: ThemeFlavor?

init {

Expand All @@ -35,13 +36,9 @@ class ThemeConfig constructor(
LegendThemeConfig.convertValue(key, value)
}

val themeFlavorOptions = baselineValues.values.let {
val flavorName = themeSettings.getString(Option.Theme.FLAVOR)
if (flavorName != null) {
ThemeFlavor.forName(flavorName).updateColors(it)
} else {
it
}
val themeFlavorOptions = baselineValues.values.let { baseOptions ->
themeFlavor = themeSettings.getString(Option.Theme.FLAVOR)?.let(ThemeFlavor.Companion::forName)
themeFlavor?.updateColors(baseOptions) ?: baseOptions
}

theme = DefaultTheme(themeFlavorOptions, fontFamilyRegistry, userOptions)
Expand Down
13 changes: 8 additions & 5 deletions ...em/src/commonMain/kotlin/org/jetbrains/letsPlot/core/spec/conversion/NamedSystemColors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@
package org.jetbrains.letsPlot.core.spec.conversion

import org.jetbrains.letsPlot.commons.values.Color
import org.jetbrains.letsPlot.core.plot.base.theme.ColorTheme
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.ThemeFlavor

class NamedSystemColors(private val themeFlavor: ThemeFlavor?) {

class NamedSystemColors(
private val colorTheme: ColorTheme,
private val themeFlavor: ThemeFlavor?
) {
fun getColor(id: String): Color? {
val systemColor = toSystemColor(id) ?: return null
return when (systemColor) {
SystemColor.PEN -> themeFlavor?.color ?: Color.BLACK
SystemColor.PAPER -> themeFlavor?.fill ?: Color.WHITE
SystemColor.BRUSH -> Color.PACIFIC_BLUE
SystemColor.PEN -> themeFlavor?.color ?: colorTheme.pen()
SystemColor.PAPER -> themeFlavor?.fill ?: colorTheme.paper()
SystemColor.BRUSH -> colorTheme.brush()
}
}

Expand Down