adding ubar

Author: jposada202020

circuitpython_uplot/ubar.py

@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: MIT
+
+"""
+
+`ubar`
+================================================================================
+
+CircuitPython uscatter graph
+
+* Author(s): Jose D. Montoya
+
+
+"""
+from bitmaptools import draw_line
+
+# pylint: disable=too-many-arguments, invalid-name, protected-access
+# pylint: disable=too-few-public-methods, no-self-use
+class ubar:
+    """
+    Main class to display different graphics
+    """
+
+    def __init__(self, plot, x: any, y: any, color=0xFFFFFF) -> None:
+
+        plot._drawbox()
+
+        self._graphx = abs(plot._newxmax - plot._newxmin) // (len(x) + 2)
+        self._graphy = abs(plot._newymax - plot._newymin) // (max(y) + 2)
+        self._new_min = int(plot.normalize(0, max(y), max(y), 0, 0))
+        self._new_max = int(plot.normalize(0, max(y), max(y), 0, max(y)))
+        xstart = self._graphx
+        bar_space = 10
+        plot._plot_palette[3] = color
+
+        for i, _ in enumerate(x):
+            self._draw_rectangle(
+                plot,
+                xstart + (i * self._graphx),
+                plot._newymin,
+                self._graphx,
+                self._graphy * y[i],
+                3,
+            )
+            xstart = xstart + bar_space
+
+    def _draw_rectangle(self, plot, x, y, width, height, color):
+        """
+        Helper function to draw bins rectangles
+        """
+        draw_line(plot._plotbitmap, x, y, x + width, y, color)
+        draw_line(plot._plotbitmap, x, y, x, y - height, color)
+        draw_line(plot._plotbitmap, x + width, y, x + width, y - height, color)
+        draw_line(plot._plotbitmap, x + width, y - height, x, y - height, color)

circuitpython_uplot/scatter.py renamed to circuitpython_uplot/uscatter.py

@@ -5,10 +5,10 @@
 
 """
 
-`scatter`
+`uscatter`
 ================================================================================
 
-CircuitPython scatter graph
+CircuitPython uscatter graph
 
 * Author(s): Jose D. Montoya
 
@@ -19,15 +19,15 @@
 from vectorio import Circle
 
 # pylint: disable=too-few-public-methods, invalid-name
-class scatter:
+class uscatter:
     """
     Main class to display different graphics
     """
 
     def __init__(self, plot, x: any, y: any, radius: int = 3) -> None:
         """
 
-        :param plot: Plot object for the scatter to be drawn
+        :param plot: Plot object for the uscatter to be drawn
         :param x: x points coordinates
         :param y: y points coordinates
         :param int radius: circle radius

docs/api.rst

@@ -7,5 +7,9 @@
 .. automodule:: circuitpython_uplot.uplot
     :members:
 
-.. automodule:: circuitpython_uplot.scatter
+.. automodule:: circuitpython_uplot.uscatter
+    :members:
+
+
+.. automodule:: circuitpython_uplot.ubar
     :members:

docs/examples.rst

@@ -46,8 +46,8 @@ Scatter Example
 
 Scatter plot Example
 
-.. literalinclude:: ../examples/uplot_scatter.py
-    :caption: examples/uplot_scatter.py
+.. literalinclude:: ../examples/uplot_uscatter.py
+    :caption: examples/uplot_uscatter.py
     :linenos:
 .. image:: ../docs/uplot_ex7.jpg
 
@@ -60,3 +60,13 @@ Display Shapes integration example
     :caption: examples/uplot_display_shapes.py
     :linenos:
 .. image:: ../docs/uplot_ex6.jpg
+
+Ubar Example
+----------------
+
+ubar example
+
+.. literalinclude:: ../examples/uplot_ubar_example.py
+    :caption: examples/uplot_ubar_example.py
+    :linenos:
+.. image:: ../docs/uplot_ex8.jpg

docs/uplot_ex8.jpg

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023 Jose David M.
+
+SPDX-License-Identifier: MIT

docs/uplot_ex8.jpg.license

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 Jose D. Montoya
+#
+# SPDX-License-Identifier: Unlicense
+
+import time
+import board
+from circuitpython_uplot.uplot import Uplot
+from circuitpython_uplot.ubar import ubar
+
+
+# Setting up the display
+display = board.DISPLAY
+
+plot = Uplot(0, 0, display.width, display.height)
+
+# Setting up tick parameters
+plot.axs_params(axstype="box")
+a = ["a", "b", "c", "d"]
+b = [3, 5, 1, 7]
+ubar(plot, a, b, 0xFF1000)
+
+# Plotting and showing the plot
+display.show(plot)
+
+# Adding some wait time
+while True:
+    time.sleep(1)

examples/uplot_ubar_example.py

@@ -7,7 +7,7 @@
 import board
 from ulab import numpy as np
 from circuitpython_uplot.uplot import Uplot
-from circuitpython_uplot.scatter import scatter
+from circuitpython_uplot.uscatter import uscatter
 
 
 # Setting up the display
@@ -20,9 +20,7 @@
 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
+uscatter(plot, a, b)
 
 # Plotting and showing the plot
 display.show(plot)