From 95e7c8648cb0ba845c1b08dd75b30314de78e230 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Fri, 16 Dec 2022 17:46:44 -0500 Subject: [PATCH] Align step curves the same as OHLC bars --- piker/data/_formatters.py | 4 ++-- piker/ui/_curve.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/piker/data/_formatters.py b/piker/data/_formatters.py index 8e18b714..a2339261 100644 --- a/piker/data/_formatters.py +++ b/piker/data/_formatters.py @@ -675,8 +675,8 @@ class OHLCBarsAsCurveFmtr(OHLCBarsFmtr): class StepCurveFmtr(IncrementalFormatter): x_offset: np.ndarray = np.array([ - -0.5, - 0.5, + 0, + 1, ]) def allocate_xy_nd( diff --git a/piker/ui/_curve.py b/piker/ui/_curve.py index 065887af..b5d128d6 100644 --- a/piker/ui/_curve.py +++ b/piker/ui/_curve.py @@ -374,6 +374,11 @@ class Curve(pg.GraphicsObject): # lines up with the "middle" of the current # (OHLC) sample. self._last_line = QLineF( + + # NOTE: currently we draw in x-domain + # from last datum to current such that + # the end of line touches the "beginning" + # of the current datum step span. x[-2], y[-2], x[-1], y[-1], ) @@ -439,7 +444,6 @@ class StepCurve(Curve): x_2last = x[-2] y_last = y[-1] step_size = x_last - x_2last - half_step = step_size / 2 # lol, commenting this makes step curves # all "black" for me :eyeroll:.. @@ -448,7 +452,7 @@ class StepCurve(Curve): x_last, 0, ) self._last_step_rect = QRectF( - x_last - half_step, 0, + x_last, 0, step_size, y_last, ) return x, y