Skip to content

add plotInset parameter to style #431

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

Merged
merged 9 commits into from
Sep 4, 2024
Merged

add plotInset parameter to style #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28cf988
Add plotInset paramter to style
lucas-watkins Aug 30, 2024
8283e96
Refactor Inset Parameter
lucas-watkins Sep 2, 2024
4b1e7dc
Remove Test
lucas-watkins Sep 3, 2024
d591296
Delete docs/images/guides/quickStartGuide/experimentalLayoutSimpleCus…
lucas-watkins Sep 3, 2024
a7683e8
Delete docs/images/guides/quickStartGuide/experimentalLayoutSimpleCus…
lucas-watkins Sep 3, 2024
9c46dc1
Remove unused import
lucas-watkins Sep 3, 2024
61ef63d
Merge branch 'plotInset-parameter' of https://github.com/lucas-watkin…
lucas-watkins Sep 3, 2024
affc37f
Refactor class
lucas-watkins Sep 3, 2024
a13120c
Refactor class
lucas-watkins Sep 3, 2024
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
26 changes: 24 additions & 2 deletions kandy-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/style/CustomStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,27 @@ public interface WithMargin {
}
}

public typealias Inset = Margin

public interface WithInset {
public var inset: Inset?
public fun inset(all: Double) {
inset = Inset(all, all, all, all)
}

public fun inset(vertical: Double, horizontal: Double) {
inset = Inset(vertical, horizontal, vertical, horizontal)
}

public fun inset(top: Double, horizontal: Double, bottom: Double) {
inset = Inset(top, horizontal, bottom, horizontal)
}

public fun inset(top: Double, right: Double, bottom: Double, left: Double) {
inset = Inset(top, right, bottom, left)
}
}

public data class LineParameters internal constructor(
var color: Color? = null,
var width: Double? = null,
Expand Down Expand Up @@ -322,8 +343,9 @@ public data class PlotCanvas internal constructor(
override var title: TextParameters? = null,
var subtitle: TextParameters? = null,
var caption: TextParameters? = null,
override var margin: Margin? = null
) : SelfInvocationContext, WithBackground, WithTitle, WithMargin {
override var margin: Margin? = null,
override var inset: Inset? = null,
) : SelfInvocationContext, WithBackground, WithTitle, WithMargin, WithInset {
public fun subtitle(block: TextParameters.() -> Unit) {
subtitle = TextParameters().apply(block)
}
Expand Down
3 changes: 1 addition & 2 deletions kandy-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/translator/style.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ internal fun CustomStyle.wrap(): theme {
plotSubtitle = plotCanvas.subtitle?.wrap(),
plotTitle = plotCanvas.title?.wrap(),
plotMargin = plotCanvas.margin?.wrap(),
plotInset = plotCanvas.inset?.wrap(),
stripBackground = strip.background?.wrap(),
stripText = strip.text?.wrap(),
axisTooltip = axis.tooltip.background?.wrap(),
Expand All @@ -100,8 +101,6 @@ internal fun CustomStyle.wrap(): theme {
tooltip = layerTooltips.background?.wrap(),
tooltipText = layerTooltips.text?.wrap(),
tooltipTitleText = layerTooltips.title?.wrap()
/*
*/
)

when (val justification = this@wrap.legend.justification) {
Expand Down