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

Fix calculation of XY-ranges for geom_errorbar #770

Merged
merged 6 commits into from
May 2, 2023
Merged

Fix calculation of XY-ranges for geom_errorbar #770

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b015c09
Fix XY-ranges calculation, use height/width expansion for errorbar de…
OLarionova-HORIS Apr 27, 2023
e65d67c
Separate logic to identify renderedAes for errobar.
OLarionova-HORIS Apr 28, 2023
7818ff1
Remove unused import directive.
OLarionova-HORIS Apr 28, 2023
58f12e3
Code cleanup.
OLarionova-HORIS Apr 28, 2023
980973d
Fix requirements for the specified aesthetics for the errorbar.
OLarionova-HORIS May 2, 2023
460f57e
Update demo notebook.
OLarionova-HORIS May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix requirements for the specified aesthetics for the errorbar.
  • Loading branch information
@OLarionova-HORIS
OLarionova-HORIS committed May 2, 2023
commit 980973d8387d2ea203de449d1f5bc0da185cfa4c
12 changes: 5 additions & 7 deletions ...rtable/src/commonMain/kotlin/jetbrains/datalore/plot/builder/assemble/GeomLayerBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,16 +289,14 @@ class GeomLayerBuilder(
// Check that the settings are consistent
// and set the aesthetics needed for that geometry.
val definedAes = allRenderedAes.filter { aes -> hasBinding(aes) || hasConstant(aes) }
val verticalAesSet = setOf(Aes.X, Aes.YMIN, Aes.YMAX)
val horizontalAesSet = setOf(Aes.Y, Aes.XMIN, Aes.XMAX)
val isVertical = verticalAesSet.all { aes -> aes in definedAes }
val isHorizontal = horizontalAesSet.all { aes -> aes in definedAes }
val isVertical = setOf(Aes.YMIN, Aes.YMAX).all { aes -> aes in definedAes }
val isHorizontal = setOf(Aes.XMIN, Aes.XMAX).all { aes -> aes in definedAes }
require(!(isVertical && isHorizontal)) {
"For errorbar either x, ymin, ymax or y, xmin, xmax must be specified."
"Either ymin, ymax or xmin, xmax must be specified for the errorbar."
}
allRenderedAes - when (isVertical) {
true -> horizontalAesSet + Aes.HEIGHT
false -> verticalAesSet + Aes.WIDTH
true -> setOf(Aes.Y, Aes.XMIN, Aes.XMAX, Aes.HEIGHT)
false -> setOf(Aes.X, Aes.YMIN, Aes.YMAX, Aes.WIDTH)
}
} else {
allRenderedAes
Expand Down