logging logic improvement

Author: jposada202020

circuitpython_uplot/logging.py

@@ -63,6 +63,7 @@ def __init__(
         self.points = []
         self.ticksx = np.array(ticksx)
         self.ticksy = np.array(ticksy)
+        self._fill = fill
         if tick_pos:
             self._tickposx = plot._tickheightx
             self._tickposy = plot._tickheighty
@@ -82,42 +83,40 @@ def __init__(
         if limits is not None:
             self._limits = np.array(
                 plot.transform(
-                    self.ymin, self.ymax, plot._newymin, plot._newymax, np.array(limits)
+                    self.ymin,
+                    self.ymax,
+                    plot._newymin,
+                    plot._newymax,
+                    np.array(limits),
                 ),
                 dtype=np.int16,
             )
             plot._plot_palette[9] = limits_color
         else:
             self._limits = None
 
-        self.draw_points(plot, x, y, fill)
-
-        if plot._showticks:
-            if plot._loggingfirst:
-                self._draw_ticks(plot)
-                plot._loggingfirst = False
-                plot._showticks = False
+        self.draw_points(plot, x, y)
 
     def _draw_ticks(self, plot) -> None:
         """
         Draw ticks in the plot area
 
         """
 
-        ticksxnorm = np.array(
+        self._ticksxnorm = np.array(
             plot.transform(
                 self.xmin, self.xmax, plot._newxmin, plot._newxmax, self.ticksx
             ),
             dtype=np.int16,
         )
-        ticksynorm = np.array(
+        self._ticksynorm = np.array(
             plot.transform(
                 self.ymin, self.ymax, plot._newymin, plot._newymax, self.ticksy
             ),
             dtype=np.int16,
         )
 
-        for i, tick in enumerate(ticksxnorm):
+        for i, tick in enumerate(self._ticksxnorm):
             draw_line(
                 plot._plotbitmap,
                 tick,
@@ -128,7 +127,7 @@ def _draw_ticks(self, plot) -> None:
             )
             if plot._showtext:
                 plot.show_text(f"{self.ticksx[i]:.0f}", tick, plot._newymin, (0.5, 0.0))
-        for i, tick in enumerate(ticksynorm):
+        for i, tick in enumerate(self._ticksynorm):
             draw_line(
                 plot._plotbitmap,
                 plot._newxmin - self._tickposy,
@@ -155,7 +154,7 @@ def clear_plot(plot) -> None:
             0,
         )
 
-    def draw_points(self, plot: Plot, x: list, y: list, fill: bool = False) -> None:
+    def draw_points(self, plot: Plot, x: list, y: list) -> None:
         """
         Draws points in the plot
         :param Plot plot: plot object provided
@@ -164,12 +163,22 @@ def draw_points(self, plot: Plot, x: list, y: list, fill: bool = False) -> None:
         :param bool fill: parameter to fill the plot graphic. Defaults to False
         :return: None
         """
+
         self.clear_plot(plot)
         if self._limits:
             self._draw_limit_lines(plot)
-        self.draw_new_lines(plot, x, y, fill)
+        self.draw_new_lines(plot, x, y)
+        if plot._showticks:
+            if plot._loggingfirst:
+                self._draw_ticks(plot)
+                plot._loggingfirst = False
+                plot._showticks = False
+
+        if plot._tickgrid:
+            plot._draw_gridx(self._ticksxnorm)
+            plot._draw_gridy(self._ticksynorm)
 
-    def draw_new_lines(self, plot: Plot, x: list, y: list, fill: bool = False) -> None:
+    def draw_new_lines(self, plot: Plot, x: list, y: list) -> None:
         """
         Draw the plot lines
         :param Plot plot: plot object provided
@@ -204,7 +213,8 @@ def draw_new_lines(self, plot: Plot, x: list, y: list, fill: bool = False) -> No
                     ynorm[index + 1],
                     self._line_index,
                 )
-            if fill:
+
+            if self._fill:
                 for index, _ in enumerate(xnorm):
                     draw_line(
                         plot._plotbitmap,

examples/logging_animation.py

@@ -14,11 +14,11 @@
 
 # Drawing the graph
 my_plot = Plot(
-    140,
-    60,
-    200,
-    200,
-    padding=25,
+    5,
+    5,
+    480,
+    300,
+    padding=20,
     show_box=True,
     box_color=color.WHITE,
 )
@@ -29,6 +29,7 @@
     ticky_height=4,
     show_ticks=True,
     tickcolor=color.TEAL,
+    tickgrid=True,
     showtext=True,
 )
 
@@ -75,6 +76,7 @@
     line_color=color.BLUE,
     ticksx=[25, 50, 75, 100, 125, 150, 175, 200],
     ticksy=[25, 50, 75, 100],
+    fill=False,
 )
 
 # Showing the loggraph

examples/logging_fill.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+import time
 import displayio
 import board
 from circuitpython_uplot.plot import Plot, color
@@ -12,7 +13,6 @@
 
 group = displayio.Group()
 
-
 palette = displayio.Palette(1)
 palette[0] = 0x000000
 
@@ -78,3 +78,5 @@
 group.append(plot_2)
 
 display.root_group = group
+
+time.sleep(10)

examples/logging.py renamed to examples/logging_simple_test.py

@@ -2,13 +2,15 @@
 #
 # SPDX-License-Identifier: MIT
 
+import time
 import displayio
 import terminalio
 import board
 from adafruit_display_text import label
 from circuitpython_uplot.plot import Plot, color
 from circuitpython_uplot.logging import Logging
 
+
 # Setting up the display
 display = board.DISPLAY
 
@@ -59,7 +61,7 @@
 g.append(plot_1)
 
 display.root_group = g
-display.refresh()
+
 
 dist = 3
 
@@ -75,3 +77,5 @@
 )
 
 text_temperature.text = "{}C".format(temp_y[dist])
+
+time.sleep(5)