adding scatter plots, packing library

Author: jposada202020

circuitpython_uplot/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: MIT

circuitpython_uplot/scatter.py

@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: MIT
+
+
+"""
+
+`scatter`
+================================================================================
+
+CircuitPython scatter graph
+
+* Author(s): Jose D. Montoya
+
+
+"""
+from ulab import numpy as np
+import displayio
+from vectorio import Circle
+
+# pylint: disable=too-few-public-methods, invalid-name
+class scatter:
+    """
+    Main class to display different graphics
+    """
+
+    def __init__(self, plot, x, y, radius=3):
+        """
+
+        :param plot: Plot Object for the scatter to be drawn
+        :param x: x points coordinates
+        :param y: y points coordinates
+        :param radius: circle radius
+
+        """
+        plot._drawbox()
+
+        x = np.array(x)
+        y = np.array(y)
+
+        xnorm = np.array(
+            plot.normalize(np.min(x), np.max(x), plot._newxmin, plot._newxmax, x),
+            dtype=np.uint16,
+        )
+        ynorm = np.array(
+            plot.normalize(np.min(y), np.max(y), plot._newymin, plot._newymax, y),
+            dtype=np.uint16,
+        )
+
+        palette = displayio.Palette(1)
+        palette[0] = 0xFFFFFF
+        for i, _ in enumerate(x):
+            plot.append(
+                Circle(pixel_shader=palette, radius=radius, x=xnorm[i], y=ynorm[i])
+            )

uplot.py renamed to circuitpython_uplot/uplot.py

@@ -26,6 +26,7 @@
 from vectorio import Circle
 from ulab import numpy as np
 
+
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/CircuitPython_uplot.git"
 
@@ -74,15 +75,15 @@ def __init__(self, x=0, y=0, width=None, height=None, padding=15):
 
     def axs_params(self, axstype="box"):
         """
-        :param axs:
+        Setting up axs visibility
+
+        :param axs: argument with the kind of axs you selected
         :return: none
 
         """
-        print("aca", axstype)
         self._axesparams = axstype
 
     def _drawbox(self):
-        print(self._axesparams)
         if self._axesparams == "cartesian":
             draw_box = [True, True, False, False]
         elif self._axesparams == "line":

docs/api.rst

@@ -4,5 +4,8 @@
 .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py)
 .. use this format as the module name: "adafruit_foo.foo"
 
-.. automodule:: uplot
+.. automodule:: circuitpython_uplot.uplot
+    :members:
+
+.. automodule:: circuitpython_uplot.scatter
     :members:

examples/uplot_integration_example.py

@@ -5,8 +5,7 @@
 import board
 from ulab import numpy as np
 from uhistogram import Histogram
-from uplot import Uplot
-
+from circuitpython_uplot.uplot import Uplot
 
 # Setting Up the histogram
 data = [5, 4, 3, 2, 7, 5, 3, 3, 3, 3, 2, 9, 7, 6]

examples/uplot_plot_example.py

@@ -5,7 +5,7 @@
 import time
 import board
 from ulab import numpy as np
-from uplot import Uplot
+from circuitpython_uplot.uplot import Uplot
 
 display = board.DISPLAY
 plot = Uplot(0, 0, display.width, display.height)

examples/uplot_scatter.py

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: Unlicense
+
+import time
+from random import choice
+import board
+from ulab import numpy as np
+from circuitpython_uplot.uplot import Uplot
+from circuitpython_uplot.scatter import scatter
+
+
+# Setting up the display
+display = board.DISPLAY
+
+plot = Uplot(0, 0, display.width, display.height)
+
+# Setting up tick parameters
+plot.tick_params(tickheight=12, tickcolor=0xFF0008, tickgrid=True)
+plot.axs_params(axstype="cartesian")
+a = np.linspace(1, 100)
+b = [choice(a) for _ in a]
+scatter(plot, a, b)
+
+# Seeting some date to plot
+
+# Plotting and showing the plot
+display.show(plot)
+
+# Adding some wait time
+while True:
+    time.sleep(1)

examples/uplot_simpletest.py

@@ -5,7 +5,7 @@
 import time
 import board
 import displayio
-from uplot import Uplot
+from circuitpython_uplot.uplot import Uplot
 
 display = board.DISPLAY
 plot = Uplot(0, 0, display.width, display.height)

examples/uplot_tickparameters.py

@@ -5,7 +5,7 @@
 import time
 import board
 from ulab import numpy as np
-from uplot import Uplot
+from circuitpython_uplot.uplot import Uplot
 
 # Setting up the display
 display = board.DISPLAY