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

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/aes/AesScaling.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object AesScaling {

fun lineWidth(p: DataPointAesthetics): Double {
// aes Units -> px
return p.linewidth()!! * 2.0
return p.linewidth()!! * UNIT_SHAPE_SIZE / 2.0
}

fun circleDiameter(p: DataPointAesthetics): Double {
Expand Down
2 changes: 1 addition & 1 deletion ...ase-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/aes/AestheticsDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ open class AestheticsDefaults(geomTheme: GeomTheme) {
put(Aes.ALPHA, geomTheme.alpha())
put(Aes.SIZE, geomTheme.size())
put(Aes.LINEWIDTH, geomTheme.lineWidth())
put(Aes.STROKE, geomTheme.lineWidth())
}
private val myDefaultsInLegend = TypedKeyHashMap()

Expand Down Expand Up @@ -96,7 +97,6 @@ open class AestheticsDefaults(geomTheme: GeomTheme) {
private fun lollipop(geomTheme: GeomTheme): AestheticsDefaults {
return point(geomTheme)
.update(Aes.SHAPE, NamedShape.STICK_CIRCLE)
.update(Aes.STROKE, 1.0)
}

private fun base(geomTheme: GeomTheme): AestheticsDefaults {
Expand Down
32 changes: 4 additions & 28 deletions plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/aes/AestheticsUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,35 +50,11 @@ object AestheticsUtil {
// else, override with color's alpha
}

fun strokeWidth(p: DataPointAesthetics): Double {
// aes Units -> px
return p.size()!! * 2.0
}
fun strokeWidth(p: DataPointAesthetics) = AesScaling.strokeWidth(p)

fun pointStrokeWidth(p: DataPointAesthetics): Double {
// aes Units -> px
return p.stroke()!! * AesScaling.UNIT_SHAPE_SIZE / 2.0
}
//
// fun circleDiameter(p: DataPointAesthetics): Double {
// // aes Units -> px
// return p.size()!! * 2.2
// }
//
// fun circleDiameterSmaller(p: DataPointAesthetics): Double {
// // aes Units -> px
// return p.size()!! * 1.5
// }
//
// fun sizeFromCircleDiameter(diameter: Double): Double {
// // px -> aes Units
// return diameter / 2.2
// }
//
fun textSize(p: DataPointAesthetics): Double {
// aes Units -> px
return p.size()!! * 2
}
fun pointStrokeWidth(p: DataPointAesthetics) = AesScaling.pointStrokeWidth(p)
alshan marked this conversation as resolved.
Show resolved Hide resolved

fun textSize(p: DataPointAesthetics) = AesScaling.textSize(p)

fun updateStroke(shape: SvgShape, p: DataPointAesthetics, applyAlpha: Boolean) {
shape.strokeColor().set(p.color())
Expand Down
17 changes: 12 additions & 5 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 @@ -67,7 +67,7 @@ internal class DefaultGeomTheme private constructor(
var fill = BASE.fill
alshan marked this conversation as resolved.
Show resolved Hide resolved
var alpha = BASE.alpha
var size = BASE.size
val lineWidth = BASE.lineWidth
var lineWidth = BASE.lineWidth

when (geomKind) {
GeomKind.PATH,
Expand Down Expand Up @@ -108,19 +108,26 @@ internal class DefaultGeomTheme private constructor(
size = 0.2
}

GeomKind.POINT,
GeomKind.JITTER,
GeomKind.Q_Q,
GeomKind.Q_Q_2 -> {
color = inheritedColors.lineColor()
fill = Colors.withOpacity(inheritedColors.lineColor(), 0.1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

We don't want to use colors with opacity.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Changed to fill = background color

size = 2.0
}

GeomKind.POINT_RANGE -> {
color = inheritedColors.lineColor()
fill = Colors.withOpacity(inheritedColors.lineColor(), 0.1)
lineWidth = 1.0 // line width and stroke for point
}

GeomKind.POINT,
GeomKind.JITTER,
GeomKind.Q_Q,
GeomKind.Q_Q_2,
GeomKind.LOLLIPOP -> {
color = inheritedColors.lineColor()
fill = Colors.withOpacity(inheritedColors.lineColor(), 0.1)
size = 2.0
lineWidth = 1.0 // 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