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

Legend override_aes #1115

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Legend override_aes #1115

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d861a63
`override_aes` in `guide_legend()`.
OLarionova-HORIS May 14, 2024
bf564c4
Support dict in override_aes for legend
MKoroteev-HORIS Jun 12, 2024
6eb9d12
Merge remote-tracking branch 'origin/master' into legend-override-aes
MKoroteev-HORIS Jun 13, 2024
0a768dc
Fix merging
MKoroteev-HORIS Jun 13, 2024
940e0b5
Add a test for override_aes
MKoroteev-HORIS Jun 16, 2024
34802c1
Add override_aes demo. Update future_changes.md
MKoroteev-HORIS Jun 16, 2024
946ac5c
Fix wording
MKoroteev-HORIS Jun 17, 2024
2f13718
Fix wording
MKoroteev-HORIS Jun 17, 2024
44287db
Refactoring legend
MKoroteev-HORIS Jun 18, 2024
17bf074
Refactoring override_aes processing
MKoroteev-HORIS Jun 25, 2024
75d97a9
Refactoring overrideAes merging
MKoroteev-HORIS Jun 27, 2024
7c171e0
Add tests for legend overrideAes
MKoroteev-HORIS Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Support dict in override_aes for legend
  • Loading branch information
@MKoroteev-HORIS
MKoroteev-HORIS committed Jun 12, 2024
commit bf564c4da106f4c6503ea1e5bbc06fe7ee36ec29
15 changes: 12 additions & 3 deletions ...rc/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/assemble/LegendAssembler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,19 @@ class LegendAssembler(
scaleMappers.getValue(aes)(it) as Any // Don't expect nulls.
}
val labels = scaleBreaks.labels
for ((label, aesValue) in labels.zip(aesValues)) {
aesValuesByLabel.getOrPut(label) { HashMap() }[aes] = aesValue
labels.zip(aesValues).forEachIndexed { index, (label, aesValue) ->
val labelMap = aesValuesByLabel.getOrPut(label) { HashMap() }
labelMap[aes] = aesValue

overrideAesValues.forEach { (aesToOverride, v) ->
aesValuesByLabel.getOrPut(label) { HashMap() }[aesToOverride] = v
val newAesValue = if (v is List<*>) {
v.getOrElse(index) { v.last() }
} else {
v
}
newAesValue?.let {
labelMap[aesToOverride] = it
}
}
}
}
Expand Down