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

Updates in lollipops #768

Merged
merged 12 commits into from
Apr 28, 2023
Merged

Updates in lollipops #768

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
351997c
Add conditional including of zero to the Y-range for the lollipop geo…
ASmirnov-HORIS Apr 24, 2023
47294a8
Increase multiplicative expand for the continuous scale when geometry…
ASmirnov-HORIS Apr 25, 2023
961d56b
Update the cookbook-notebook for the lollipop geometry.
ASmirnov-HORIS Apr 25, 2023
b8f4b9d
Refactor continuous scale expanding for the lollipop geometry.
ASmirnov-HORIS Apr 25, 2023
68d251f
Refactor scale expand parameters for the lollipop geometry.
ASmirnov-HORIS Apr 25, 2023
b0bf374
Fix rangeIncludesZero() for lollipops.
ASmirnov-HORIS Apr 25, 2023
c449f99
Rerun cookbook-notebook for the lollipop geometry.
ASmirnov-HORIS Apr 25, 2023
9824de6
Change behaviour of the dir parameter for the lollipop geometry.
ASmirnov-HORIS Apr 27, 2023
163d7bf
Undo expanding scales for lollipops.
ASmirnov-HORIS Apr 28, 2023
ce2bcd2
Update API for geom_lollipop() (change behaviour of the dir parameter).
ASmirnov-HORIS Apr 28, 2023
74d26eb
Fix the future_changes.md file.
ASmirnov-HORIS Apr 28, 2023
b308b7b
Rebuild the cookbook-notebook for the lollipop geometry.
ASmirnov-HORIS Apr 28, 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
Increase multiplicative expand for the continuous scale when geometry… 
… is lollipop.
  • Loading branch information
@ASmirnov-HORIS
ASmirnov-HORIS committed Apr 25, 2023
commit 47294a8988e368fb319f0378d8c561061085c246
5 changes: 3 additions & 2 deletions plot-builder-portable/src/commonMain/kotlin/jetbrains/datalore/plot/builder/PlotUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,12 @@ object PlotUtil {
internal fun rangeWithExpand(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you instead keep the size related stuff in lollipop geom widthSpan / heightSpan ?

range: DoubleSpan?,
scale: Scale,
includeZero: Boolean
includeZero: Boolean,
mulExpCoeff: Double
): DoubleSpan? {
if (range == null) return null

val mulExp = scale.multiplicativeExpand
val mulExp = mulExpCoeff * scale.multiplicativeExpand
val addExp = scale.additiveExpand

// Compute expands in terms of the original data.
Expand Down
3 changes: 2 additions & 1 deletion ...le/src/commonMain/kotlin/jetbrains/datalore/plot/builder/assemble/PositionalScalesUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,9 @@ internal object PositionalScalesUtil {
true -> updateRange(DoubleSpan.singleton(0.0), range)
false -> range
}
val mulExpCoeff = 1.0.takeUnless { layers.any { it.geomKind == GeomKind.LOLLIPOP } } ?: 2.0

return PlotUtil.rangeWithExpand(range, scale, includeZero)
return PlotUtil.rangeWithExpand(range, scale, includeZero, mulExpCoeff)
}

private fun updateRange(values: Iterable<Double>, wasRange: DoubleSpan?): DoubleSpan {
Expand Down