Fix loss of colobar options.

JetBrains · Apr 10, 2024 · fd76882 · fd76882
1 parent 3daf22b
commit fd76882
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/.../commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/assemble/ColorBarAssembler.kt b/.../commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/assemble/ColorBarAssembler.kt
@@ -25,16 +25,14 @@ import org.jetbrains.letsPlot.core.plot.builder.layout.PlotLabelSpecFactory
 import org.jetbrains.letsPlot.core.plot.builder.layout.PlotLayoutUtil
 import kotlin.math.max
 
-class ColorBarAssembler(
+class ColorBarAssembler constructor(
  private val legendTitle: String,
  private val transformedDomain: DoubleSpan,
  private val scale: Scale,
  private val scaleMapper: ScaleMapper<Color>,
- private val theme: LegendTheme
+ private val theme: LegendTheme,
+ private var colorBarOptions: ColorBarOptions?
 ) {
-
- private var colorBarOptions: ColorBarOptions? = null
-
  fun createColorBar(): LegendBoxInfo {
  var scale = scale
  if (!scale.hasBreaks()) {
@@ -64,9 +62,6 @@ class ColorBarAssembler(
  }
  }
 
- internal fun setOptions(options: ColorBarOptions?) {
- colorBarOptions = options
- }
 
  fun equalScalesAndOptions(other: ColorBarAssembler): Boolean {
  if (transformedDomain != other.transformedDomain) return false
@@ -82,7 +77,7 @@ class ColorBarAssembler(
  fun withTitle(title: String): ColorBarAssembler {
  return ColorBarAssembler(
  title,
- transformedDomain, scale, scaleMapper, theme
+ transformedDomain, scale, scaleMapper, theme, colorBarOptions
  )
  }
 

diff --git a/...nMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/assemble/PlotGuidesAssemblerUtil.kt b/...nMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/assemble/PlotGuidesAssemblerUtil.kt
@@ -57,18 +57,14 @@ internal object PlotGuidesAssemblerUtil {
  scaleMapper: ScaleMapper<Color>,
  options: ColorBarOptions?,
  theme: LegendTheme
- ): ColorBarAssembler {
-
- val result = ColorBarAssembler(
- scaleName,
- transformedDomain,
- scale,
- scaleMapper,
- theme
- )
- result.setOptions(options)
- return result
- }
+ ) = ColorBarAssembler(
+ scaleName,
+ transformedDomain,
+ scale,
+ scaleMapper,
+ theme,
+ options
+ )
 
  fun fitsColorBar(aes: Aes<*>, scale: Scale): Boolean {
  return aes.isColor && scale.isContinuous