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

Size unit implementation for PointGeom and TextGeom #215

Merged
merged 17 commits into from
Oct 27, 2020
Merged

Size unit implementation for PointGeom and TextGeom #215

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d2b7857
Size unit implemented for PointGeom and TextGeom
IKrukov-HORIS Oct 21, 2020
fcb1a6f
Add comment for getSizeUnitRatio implementation
IKrukov-HORIS Oct 22, 2020
d89f265
Add comment for getSizeUnitRatio implementation
IKrukov-HORIS Oct 22, 2020
595c0af
Add comment for getSizeUnitRatio implementation
IKrukov-HORIS Oct 22, 2020
cdf4d9d
Add comment for getSizeUnitRatio implementation
IKrukov-HORIS Oct 22, 2020
35e2dba
Add size_unit notebook demo
IKrukov-HORIS Oct 22, 2020
8abb82c
Modified size_unit example
IKrukov-HORIS Oct 22, 2020
487e5e6
Simplify PointGeom.getSizeUnitRatio implementation
IKrukov-HORIS Oct 22, 2020
23233c3
Remove unused constant
IKrukov-HORIS Oct 22, 2020
e113fcd
Remove unused constant
IKrukov-HORIS Oct 22, 2020
c2fcf58
Format rollback
IKrukov-HORIS Oct 22, 2020
416ce88
Return comment
IKrukov-HORIS Oct 22, 2020
29e2e4c
Edit comment
IKrukov-HORIS Oct 22, 2020
1975e04
Removed unused import
IKrukov-HORIS Oct 22, 2020
517dbdb
Comment fix
IKrukov-HORIS Oct 22, 2020
ecff5d5
Changed comments in size_unit demo
IKrukov-HORIS Oct 26, 2020
d3bcec9
code cleanup
IKrukov-HORIS Oct 27, 2020
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
Return comment
  • Loading branch information
@IKrukov-HORIS
IKrukov-HORIS committed Oct 22, 2020
commit 416ce88306798752183dcc9cb4f52ca8de2577e5
3 changes: 2 additions & 1 deletion plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/PointGeom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ open class PointGeom : GeomBase() {
private fun getSizeUnitRatio(ctx: GeomContext): Double {
sizeUnit?.let { sizeUnitValue ->
alshan marked this conversation as resolved.
Show resolved Hide resolved
val unitRes = getUnitResBySizeUnit(ctx, sizeUnitValue)

// TODO: Need refactoring: It's better to use NamedShape.FILLED_CIRCLE.size(1.0)
// but AesScaling.circleDiameter is used because Shape.size() takes DataPointAesthetics
val unitShapeSize = 2.2
alshan marked this conversation as resolved.
Show resolved Hide resolved
return unitRes / unitShapeSize
}
Expand Down