pikers
/
piker
3
0
Fork 0
Code Issues 2 Pull Requests 5 Packages Projects Releases Wiki Activity

Drop step mode "last datum" graphics creation from `.draw_last()` 

We're doing this in `Flow.update_graphics()` atm and probably are going
to in general want custom graphics objects for all the diff curve / path
types. The new flows work seems to fix the bounding rect width calcs to
not require the ad-hoc extra `+ 1` in the step mode case; before it was
always a bit hacky anyway. This also tries to add a more correct
bounding rect adjustment for the `._last_line` segment.
incremental_update_paths
Tyler Goodlet 2022-05-21 11:46:56 -04:00
parent b985b48eb3
commit 5d91516b41
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
piker/ui/_curve.py
View File

@ -121,6 +121,7 @@ class FastAppendCurve(pg.GraphicsObject):
self._last_line: Optional[QLineF] = None self._last_line: Optional[QLineF] = None
self._last_step_rect: Optional[QRectF] = None self._last_step_rect: Optional[QRectF] = None
self._last_w: float = 1
# flat-top style histogram-like discrete curve # flat-top style histogram-like discrete curve
self._step_mode: bool = step_mode self._step_mode: bool = step_mode
@ -183,29 +184,11 @@ class FastAppendCurve(pg.GraphicsObject):
# draw the "current" step graphic segment so it lines up with # draw the "current" step graphic segment so it lines up with
# the "middle" of the current (OHLC) sample. # the "middle" of the current (OHLC) sample.
if self._step_mode: self._last_line = QLineF(
self._last_line = QLineF( x[-2], y[-2],
x_last - 0.5, 0, x_last, y_last
x_last + 0.5, 0, )
# x_last, 0, # self._last_w = x_last - x[-2]
# x_last, 0,
)
self._last_step_rect = QRectF(
x_last - 0.5, 0,
x_last + 0.5, y_last
# x_last, 0,
# x_last, y_last
)
# print(
# f"path br: {self.path.boundingRect()}",
# f"fast path br: {self.fast_path.boundingRect()}",
# f"last rect br: {self._last_step_rect}",
# )
else:
self._last_line = QLineF(
x[-2], y[-2],
x_last, y_last
)
# XXX: lol brutal, the internals of `CurvePoint` (inherited by # XXX: lol brutal, the internals of `CurvePoint` (inherited by
# our `LineDot`) required ``.getData()`` to work.. # our `LineDot`) required ``.getData()`` to work..
@ -290,13 +273,20 @@ class FastAppendCurve(pg.GraphicsObject):
# # hb_size.height() + 1 # # hb_size.height() + 1
# ) # )
# if self._last_step_rect:
# br = self._last_step_rect.bottomRight() # br = self._last_step_rect.bottomRight()
# else: w = hb_size.width()
# hb_size += QSizeF(1, 1) h = hb_size.height()
w = hb_size.width() + 1
h = hb_size.height() + 1 if not self._last_step_rect:
# only on a plane line do we include
# and extra index step's worth of width
# since in the step case the end of the curve
# actually terminates earlier so we don't need
# this for the last step.
w += self._last_w
ll = self._last_line
h += ll.y2() - ll.y1()
# br = QPointF( # br = QPointF(
# self._vr[-1], # self._vr[-1],