[graph] fix top margin location and simplify y-coordinate calculation #1915
Conversation
This file contains 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
saulpw
reviewed
Jun 8, 2023
visidata/graph.py
Outdated
| return p | ||
|
|
||
| def render_sync(self): |
There was a problem hiding this comment.
I guess this is almost-but-not-exactly identical to Canvas.render_sync? Is there any reasonable way to parameterize it for the inverted canvas, without duplicating the code?
saulpw
reviewed
Jun 17, 2023
visidata/graph.py
Outdated
| @@ -10,6 +10,10 @@ def numericCols(vd, cols): | |||
|
|
|||
|
|
|||
| class InvertedCanvas(Canvas): | |||
| @asyncthread | |||
| def render_async(self): | |||
| self.plot_elements(True) | |||
There was a problem hiding this comment.
This is all great, but we should probably use invert_y=True for good measure.
saulpw
approved these changes
Jun 17, 2023
|
Oops sorry, I have just rebased the squashed version onto the latest develop commit. |
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.
These changes are for the y-coordinate calculations in InvertedCanvas.
They do not properly take
topMarginPixelsinto account, though the problem is hidden because the top margin is currently 0. If we increase it, the new margin shows up below the graph points instead of above, and the y-axis labels become misaligned.Another problem is that the calculation of y-coordinate inversion is done separately at a few too many interfaces (
plotpixel(),scaleY(),canvasH(),canvasMouse()), and sometimes with slight differences. That makes it extremely difficult to reason about y coordinates. So I have simplified the inversions, making them go through just one pair of functions:scaleY()and its inverseunscaleY(). The change happens to fix thetopMarginPixelsbug and simplifycalcTopCursorY(), which is a sign it's a good way to handle the y coordinates.I've also added a fix to the y coordinates in
zoom-cursor(zz). The zoom used to go incorrectly to the area above the cursor. Now it zooms into it.