adding cartesian linetypes

Author: jposada202020

docs/examples.rst

@@ -19,6 +19,16 @@ Cartesian Simple Test
     :lines: 5-
 .. image:: ../docs/cartesian_simpletest.jpg
 
+Cartesian Line Types
+----------------------------
+
+Cartesian Line Types examples
+
+.. literalinclude:: ../examples/cartesian_linetypes.py
+    :caption: examples/cartesian_linetypes.py
+    :lines: 5-
+.. image:: ../docs/line_types.jpg
+
 
 Cartesian Fill
 ----------------------------

docs/line_types.jpg

@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: MIT
+
+import gc
+import math
+from machine import Pin, SPI
+from ili9486 import ILI9486
+from micropython_uplot.plot import PLOT
+from micropython_uplot.utils import linspace
+from micropython_uplot.cartesian import Cartesian
+
+# Pin definition
+pdc = Pin(8, Pin.OUT, value=0)
+prst = Pin(15, Pin.OUT, value=1)
+pcs = Pin(9, Pin.OUT, value=1)
+spi = SPI(1, sck=Pin(10), mosi=Pin(11), miso=Pin(12), baudrate=30_000_000)
+gc.collect()
+display = ILI9486(spi, pcs, pdc, prst)
+
+plot = PLOT(display, 5, 5, 300, 250, padding=1, box_color=(255, 255, 255))
+plot.tick_params(
+    tickx_height=12, ticky_height=12, tickcolor=(100, 100, 100), tickgrid=True
+)
+
+# Creating some points to graph
+x = list(linspace(-4, 4, 50))
+constant = 1.0 / math.sqrt(2 * math.pi)
+y = [constant * math.exp((-(_**2)) / 2.0) for _ in x]
+y2 = [constant / 2 * math.exp((-(_**2)) / 1.0) for _ in x]
+y3 = [10 + (2 + constant / 1.1 * math.exp((-(_**2)) / 0.5 + 2)) for _ in x]
+# Drawing the graph
+Cartesian(plot, x, y, line_color=(255, 255, 0), line_style=".")
+Cartesian(plot, x, y2, line_color=(0, 255, 0), line_style="-.-")
+p = Cartesian(plot, x, y3, line_color=(0, 255, 255), line_style="- -")
+display.show()
+import time
+
+time.sleep(1)
+# plot._savingppm("line_types.ppm")
+p.update(plot)
+display.show()

examples/cartesian_linetypes.py

@@ -87,9 +87,6 @@ def __init__(
         if self._line_type not in ["-", ".", "- -", "-.-"]:
             raise ValueError("line_style must be a valid option")
 
-        if line_style is None:
-            self._line_type = "-"
-
         max_x = max(x)
         min_x = min(x)
         max_y = max(y)
@@ -161,9 +158,9 @@ def _draw_plotline(self, plot, index, xnorm, ynorm):
             if index % 3 == 0:
                 self._plot_line(plot, index, xnorm, ynorm)
             else:
-                plot._plotbitmap[xnorm[index], ynorm[index]] = plot._index_colorused
+                plot._display.pixel(xnorm[index], ynorm[index], self._line_color)
         elif self._line_type == ".":
-            plot._plotbitmap[xnorm[index], ynorm[index]] = plot._index_colorused
+            plot._display.pixel(xnorm[index], ynorm[index], self._line_color)
         elif self._line_type == "- -":
             if index % 2 == 0:
                 self._plot_line(plot, index, xnorm, ynorm)
@@ -177,6 +174,12 @@ def _plot_line(self, plot, index, xnorm, ynorm):
             self._line_color,
         )
 
+    def update(self, plot):
+        """
+        Update the plot with new data
+        """
+        plot._display.fill(0)
+
 
 class LineStyle:
     """

micropython_uplot/cartesian.py

@@ -0,0 +1,138 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: MIT
+
+"""
+
+`logging`
+================================================================================
+
+MicroPython logging utility
+
+* Author: Jose D. Montoya
+
+
+"""
+try:
+    from typing import Optional
+    from micropython_uplot.plot import PLOT
+except ImportError:
+    pass
+
+from micropython_uplot.colors import set_color
+
+
+__version__ = "0.0.0+auto.0"
+__repo__ = "https://github.com/adafruit/MicroPython_UPLOT.git"
+
+
+class Logging:
+    """
+    Class to log data
+    """
+
+    def __init__(
+        self,
+        plot: PLOT,
+        x: list,
+        y: list,
+        rangex: Optional[list] = None,
+        rangey: Optional[list] = None,
+        line_color: tuple = (0, 255, 0),
+        ticksx: list = None,
+        ticksy: list = None,
+    ) -> None:
+        """
+
+        :param Plot plot: Plot object for the scatter to be drawn
+        :param list x: x points coordinates
+        :param list y: y points coordinates
+        :param list|None rangex: x range limits. Defaults to None
+        :param list|None rangey: y range limits. Defaults to None
+        :param int|None line_color: line color. Defaults to None
+        :param list ticksx: X axis ticks values
+        :param list ticksy: Y axis ticks values
+
+        """
+        self.points = []
+        self.ticksx = ticksx
+        self.ticksy = ticksy
+
+        self._line_color = set_color(
+            plot._display,
+            self._pointer_index,
+            line_color[0],
+            line_color[1],
+            line_color[2],
+        )
+        plot._pointer_index += 1
+
+        max_x = max(x)
+        min_x = min(x)
+        max_y = max(y)
+        min_y = min(y)
+
+        if rangex is None:
+            self.xmin = min_x - (abs(max_x - min_x) / 10)
+            self.xmax = max_x + (abs(max_x - min_x) / 10)
+
+        else:
+            self.xmin = min(rangex)
+            self.xmax = max(rangex)
+
+        if rangey is None:
+            self.ymin = min_y - (abs(max_y - min_y) / 10)
+            self.ymax = max_y + (abs(max_y - min_y) / 10)
+        else:
+            self.ymin = min(rangey)
+            self.ymax = max(rangey)
+
+        xnorm = tuple(
+            [
+                int(
+                    plot.transform(
+                        self.xmin, self.xmax, plot._newxmin, plot._newxmax, _
+                    )
+                )
+                for _ in x
+            ]
+        )
+        ynorm = tuple(
+            [
+                int(
+                    plot.transform(
+                        self.ymin, self.ymax, plot._newymin, plot._newymax, _
+                    )
+                )
+                for _ in y
+            ]
+        )
+
+        for index, _ in enumerate(xnorm):
+            if index + 1 >= len(xnorm):
+                break
+            if y[index] >= self.ymax:
+                continue
+
+            self._draw_plotline(plot, index, xnorm, ynorm)
+
+        if plot._showticks:
+            if plot._cartesianfirst:
+                plot._draw_ticks(x, y, self.ticksx, self.ticksy)
+                plot._cartesianfirst = False
+                plot._showticks = False
+
+    def _plot_line(self, plot, index, xnorm, ynorm):
+        plot._display.line(
+            xnorm[index],
+            ynorm[index],
+            xnorm[index + 1],
+            ynorm[index + 1],
+            self._line_color,
+        )
+
+    def update(self, plot):
+        """
+        Update the plot with new data
+        """
+        plot._display.fill(0)

micropython_uplot/logging.py

@@ -484,8 +484,8 @@ def _savingppm(self, filename: str = "picture.ppm", width=480, height=320):
             self._color2,
             self._color1,
             (0, 255, 0),
-            (255, 0, 0),
-            (255, 0, 0),
+            (0, 255, 255),
+            (99, 0, 99),
             (0, 94, 153),
             (0, 167, 109),
         ]