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

Improve border line type experience #1106

Merged
merged 8 commits into from
May 24, 2024
Merged

Improve border line type experience #1106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7de207e
Improve linetype experience (LPK-220).
ASmirnov-HORIS May 8, 2024
544bbc5
Merge branch 'refs/heads/master' into LPK-220
ASmirnov-HORIS May 8, 2024
34728d9
Fix conflicts after merging with master.
ASmirnov-HORIS May 20, 2024
9931a32
LPK-220: Change linewidth calculation for the midline of the boxplot.
ASmirnov-HORIS May 20, 2024
fcc8865
LPK-220: Refactor code and fix linewidth calculation for the crossbars.
ASmirnov-HORIS May 20, 2024
788b528
LPK-220: Refactor code.
ASmirnov-HORIS May 24, 2024
85e0660
Merge branch 'master' into LPK-220
ASmirnov-HORIS May 24, 2024
9d71292
LPK-220: Another small refactor in BoxHelper.
ASmirnov-HORIS May 24, 2024
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
LPK-220: Refactor code.
  • Loading branch information
@ASmirnov-HORIS
ASmirnov-HORIS committed May 24, 2024
commit 788b5281c1cbbf1a74422f9b9350ba7f89ee94a0
1 change: 0 additions & 1 deletion plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/base/geom/BoxplotGeom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class BoxplotGeom : GeomBase() {
sizeAes = Aes.WIDTH,
ctx,
geomHelper,
linesRotation = { it },
fatten = fattenMidline
)

Expand Down
4 changes: 2 additions & 2 deletions plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/base/geom/CrossBarGeom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class CrossBarGeom(
sizeAes = Aes.WIDTH, // do not flip as height is not defined for CrossBarGeom
ctx,
geomHelper,
linesRotation = flipHelper::flip,
fatten = fattenMidline
fatten = fattenMidline,
flip = !isVertical
)
// tooltip
flipHelper.buildHints(
Expand Down
8 changes: 4 additions & 4 deletions plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/base/geom/util/BoxHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ object BoxHelper {
sizeAes: Aes<Double>,
ctx: GeomContext,
geomHelper: GeomHelper,
linesRotation: (DoubleVector) -> DoubleVector,
fatten: Double
fatten: Double,
flip: Boolean = false
) {
val elementHelper = geomHelper.createSvgElementHelper()
for (p in aesthetics.dataPoints()) {
Expand All @@ -51,8 +51,8 @@ object BoxHelper {
val width = w * ctx.getResolution(xAes)

val (line) = elementHelper.createLine(
linesRotation(DoubleVector(x - width / 2, middle)),
linesRotation(DoubleVector(x + width / 2, middle)),
DoubleVector(x - width / 2, middle).flipIf(flip),
DoubleVector(x + width / 2, middle).flipIf(flip),
p
) { AesScaling.strokeWidth(it) * fatten } ?: continue

Expand Down