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

Make line width equal to point's stroke width #798

Merged
merged 9 commits into from
Jun 28, 2023
Merged

Make line width equal to point's stroke width #798

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a973fc
Make line width equal to point's stroke width. Add their defaults for…
OLarionova-HORIS Jun 22, 2023
dff3070
Make `fill`=<background color> for all point geoms.
OLarionova-HORIS Jun 26, 2023
b95864b
Cleanup: remove DefaultGeomTheme.BASE.
OLarionova-HORIS Jun 26, 2023
2bd5c8b
SmoothGeom: draw line over the confidence interval. Simplify LinesHel…
OLarionova-HORIS Jun 26, 2023
ab97c0e
Restore commented code.
OLarionova-HORIS Jun 26, 2023
911118e
Add fixed colors structure.
OLarionova-HORIS Jun 26, 2023
2079efc
Set the default `fill` for crossbar and box_plot based on background …
OLarionova-HORIS Jun 26, 2023
71c2fa9
Enlarge default values for size, linewidth, stroke.
OLarionova-HORIS Jun 26, 2023
39dc2d3
Return alpha=0.1 for some geometries.
OLarionova-HORIS Jun 27, 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
Enlarge default values for size, linewidth, stroke.
  • Loading branch information
@OLarionova-HORIS
OLarionova-HORIS committed Jun 26, 2023
commit 71c2fa9fd63817feaf970a774b7655dc5fc5595b
12 changes: 6 additions & 6 deletions ...le/src/commonMain/kotlin/jetbrains/datalore/plot/builder/defaultTheme/DefaultGeomTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ internal class DefaultGeomTheme private constructor(
var color = fixedColors.color
var fill = fixedColors.fill
var alpha = 1.0
var size = 0.5
var lineWidth = 0.5
var size = 0.6
var lineWidth = 0.6

when (geomKind) {
GeomKind.PATH,
Expand Down Expand Up @@ -106,7 +106,7 @@ internal class DefaultGeomTheme private constructor(
color = inheritedColors.lineColor()
fill = inheritedColors.lineColor()
alpha = 0.1
size = 0.2
size = 0.24
Copy link
Collaborator

Choose a reason for hiding this comment

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

Extract the experimental multiplier (1.2) to a val .

}

GeomKind.CROSS_BAR,
Expand All @@ -121,20 +121,20 @@ internal class DefaultGeomTheme private constructor(
GeomKind.Q_Q_2 -> {
color = inheritedColors.lineColor()
fill = inheritedColors.backgroundFill()
size = 2.0
size = 2.4
}

GeomKind.POINT_RANGE -> {
color = inheritedColors.lineColor()
fill = inheritedColors.backgroundFill()
lineWidth = 1.0 // line width and stroke for point
lineWidth = 1.2 // line width and stroke for point
}

GeomKind.LOLLIPOP -> {
color = inheritedColors.lineColor()
fill = inheritedColors.backgroundFill()
size = 2.0
lineWidth = 1.0 // line width and stroke for point
lineWidth = 1.2 // line width and stroke for point
}

GeomKind.SMOOTH -> {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is bad: alpha = 1.5

                GeomKind.SMOOTH -> {
                    color = Color.MAGENTA

We don't want to use constant values no longer. Should be a field in BASE (but still get rid of the BASE).

Expand Down