Enable selectable correction mode for long tick labels #14333
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## branch-3.8 #14333 +/- ##
=============================================
Coverage ? 93.22%
=============================================
Files ? 285
Lines ? 20146
Branches ? 0
=============================================
Hits ? 18782
Misses ? 1364
Partials ? 0 🚀 New features to boost your workflow:
|
mattpap
reviewed
Feb 15, 2025
bokehjs/src/lib/models/axes/axis.ts
Outdated
Comment on lines
423
to
466
| const ids = [...selected.ones()] | ||
| if (ids.length != 0) { | ||
| const cbox = this.canvas.bbox | ||
|
|
||
| const correct_x = (k: number) => { | ||
| const bbox = bboxes[k] | ||
|
|
||
| if (bbox.left < 0) { | ||
| const offset = -bbox.left | ||
| const {position} = items[k] | ||
| items[k].position = {...position, sx: position.sx + offset} | ||
| } else if (bbox.right > cbox.width) { | ||
| const offset = bbox.right - cbox.width | ||
| const {position} = items[k] | ||
| items[k].position = {...position, sx: position.sx - offset} | ||
| } | ||
| } | ||
|
|
||
| const correct_y = (k: number) => { | ||
| const bbox = bboxes[k] | ||
|
|
||
| if (bbox.top < 0) { | ||
| const offset = -bbox.top | ||
| const {position} = items[k] | ||
| items[k].position = {...position, sy: position.sy + offset} | ||
| } else if (bbox.bottom > cbox.height) { | ||
| const offset = bbox.bottom - cbox.height | ||
| const {position} = items[k] | ||
| items[k].position = {...position, sy: position.sy - offset} | ||
| } | ||
| } | ||
|
|
||
| const i = ids[0] | ||
| const j = ids[ids.length - 1] | ||
|
|
||
| if (this.dimension == 0) { | ||
| correct_x(i) | ||
| correct_x(j) | ||
| } else { | ||
| correct_y(i) | ||
| correct_y(j) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
This actually works quite well for parallel labels. I would disable this for other orientations and perhaps add a property to control the behavior (never, auto (default) and always).
|
@mattpap I changed the code to give the user the option to anable/disable the correction of the first label.
I know some tests are missing. I will try to add them soon. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR brings back old behavoir of tick labels. If they are to long to be displayed, they are cut of. In the latest implementation the position was corrected, so that the labels would be disaligned. For long tick labels this looks odd, for formatted time stamps it coudl be easily misinterpreted.
I want to mention that I think this is not perfect. A better solution would be to shorten the labels from the end of the string.