From 81be0b4bd0b3b8e3e65a5552df992317d0ac221e Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Tue, 17 May 2022 19:14:49 -0400
Subject: [PATCH] Dont pass `px_width` to m4, add some commented path cap
 tracking

---
 piker/ui/_curve.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/piker/ui/_curve.py b/piker/ui/_curve.py
index b404cb76..8fd31199 100644
--- a/piker/ui/_curve.py
+++ b/piker/ui/_curve.py
@@ -86,7 +86,7 @@ class FastAppendCurve(pg.GraphicsObject):
         self.xData = None
         self._vr: Optional[tuple] = None
         self._avr: Optional[tuple] = None
-        self._br = None
+        self._last_cap: int = 0
 
         self._name = name
         self.path: Optional[QtGui.QPainterPath] = None
@@ -238,8 +238,8 @@ class FastAppendCurve(pg.GraphicsObject):
         # should_redraw = False
 
         # by default we only pull data up to the last (current) index
-        x_out_full = x_out = x[:slice_to_head]
-        y_out_full = y_out = y[:slice_to_head]
+        x_out = x[:slice_to_head]
+        y_out = y[:slice_to_head]
 
         # if a view range is passed, plan to draw the
         # source ouput that's "in view" of the chart.
@@ -319,8 +319,7 @@ class FastAppendCurve(pg.GraphicsObject):
         # check for downsampling conditions
         if (
             # std m4 downsample conditions
-            px_width
-            and abs(uppx_diff) >= 1
+            abs(uppx_diff) >= 1
         ):
             log.info(
                 f'{self._name} sampler change: {self._last_uppx} -> {uppx}'
@@ -366,12 +365,11 @@ class FastAppendCurve(pg.GraphicsObject):
 
                 self._in_ds = False
 
-            elif should_ds and uppx and px_width > 1:
+            elif should_ds and uppx > 1:
 
                 x_out, y_out = xy_downsample(
                     x_out,
                     y_out,
-                    px_width,
                     uppx,
                 )
                 profiler(f'FULL PATH downsample redraw={should_ds}')
@@ -438,7 +436,6 @@ class FastAppendCurve(pg.GraphicsObject):
             #     new_x, new_y = xy_downsample(
             #         new_x,
             #         new_y,
-            #         px_width,
             #         uppx,
             #     )
             #     profiler(f'fast path downsample redraw={should_ds}')
@@ -489,9 +486,9 @@ class FastAppendCurve(pg.GraphicsObject):
             # self.disable_cache()
             # flip_cache = True
 
-        if draw_last:
-            self.draw_last(x, y)
-            profiler('draw last segment')
+        # if draw_last:
+        #     self.draw_last(x, y)
+        #     profiler('draw last segment')
 
         # if flip_cache:
         # #     # XXX: seems to be needed to avoid artifacts (see above).
@@ -544,10 +541,6 @@ class FastAppendCurve(pg.GraphicsObject):
     def getData(self):
         return self.xData, self.yData
 
-    # TODO: drop the above after ``Cursor`` re-work
-    def get_arrays(self) -> tuple[np.ndarray, np.ndarray]:
-        return self._x, self._y
-
     def clear(self):
         '''
         Clear internal graphics making object ready for full re-draw.
@@ -653,7 +646,6 @@ class FastAppendCurve(pg.GraphicsObject):
             # hb_size,
             QSizeF(w, h)
         )
-        self._br = br
         # print(f'bounding rect: {br}')
         return br
 
@@ -691,6 +683,11 @@ class FastAppendCurve(pg.GraphicsObject):
 
         path = self.path
 
+        # cap = path.capacity()
+        # if cap != self._last_cap:
+        #     print(f'NEW CAPACITY: {self._last_cap} -> {cap}')
+        #     self._last_cap = cap
+
         if path:
             p.drawPath(path)
             profiler(f'.drawPath(path): {path.capacity()}')