Maintain the label always inside the chartArea, whatever rotation has been set #282
Conversation
src/types/line.js
Outdated
| @@ -228,7 +228,70 @@ function calculateLabelPosition(line, width, height) { | |||
| x = pt.x + xAdjust; | |||
| y = pt.y + yAdjust; | |||
| } | |||
| return {x, y}; | |||
|
|
|||
| a = {x: x - ((width / 2) * Math.cos(angle)) - ((height / 2) * Math.sin(angle)), y: y - ((width / 2) * Math.sin(angle)) + ((height / 2) * Math.cos(angle))}; | |||
There was a problem hiding this comment.
Only calculating the rotated width/height here, right?
This should work:
const cos = Math.cos(angle);
const sin = Math.sin(angle);
const h = Math.abs(width * sin) + Math.abs(height * cos);
const w = Math.abs(width * cos) + Math.abs(height * sin);There was a problem hiding this comment.
Only calculating the rotated width/height here, right?
Not only, it's calculating all apexes of rotated rectangle, needed to catch also the events correctly.
And then the width and height of the rectangle are calculated using the differences among the apexes.
There was a problem hiding this comment.
@kurkle sorry, I misunderstood your comment, maybe I have understood right now. Let me test it.
There was a problem hiding this comment.
@kurkle in calculateLabelPosition I need to calculate ONLY the width and height and your review is correct. I don't need to calculate the apexes because they must be calculated in adjustLabelPosition.
I think I need to rebase and then I'm gonna push again.
|
@kurkle I was thinking if this PR could still make sense. The issue #258 could be addressed removing the clip area when the labels are drawn. Therefore it couldn't make sense to try adjusting the drawing of the label inside the chart area if we are thinking to allow this kind of feature. Having split the drawing of labels from the annotation (#275), the clip area could be maintained only for the annotation and removed for the labels which can be drawn outside of chart area. The used must be take care to create "enough space" (by padding?) in the chart in order to avoid the the label will be cut because is going outside of the canvas. Nevertheless, if we decided to leave the clip area, in this case this PR looks like very helpful, I guess. |
|
What about |
|
If those "similar blocks" look like it would make sense to refactor, take a look at those. The line counts can be ignored for now, we'll probably move something away from here later. |
|
I need a little more time to do it, if ok for you. I'm struggling with a case that I didn't recognize before today |
|
No worries, take your time :) |
There are only 2 issues related to the lines of code which are exceeding the max allowed. |
|
@kurkle thank you very much for your support and patience! |
Fixes #271