Merge branch 'adafruit_main' into color_picker

# Conflicts: # docs/api.rst # docs/examples.rst
adafruit · jposada202020 · Mar 30, 2021 · Apr 4, 2021 · Apr 4, 2021 · Apr 4, 2021
commit fb368199632f3b370a630e94cd6c63f3f8189117
diff --git a/docs/api.rst b/docs/api.rst
@@ -46,6 +46,13 @@
    :members:
    :member-order: bysource
 
+.. automodule:: adafruit_displayio_layout.widgets.cartesian
+   :members:
+   :member-order: bysource
+   :inherited-members:
+
+.. inheritance-diagram:: adafruit_displayio_layout.widgets.cartesian
+
 .. automodule:: adafruit_displayio_layout.widgets.color_picker
    :members:
    :member-order: bysource

diff --git a/docs/examples.rst b/docs/examples.rst
@@ -61,6 +61,15 @@ Displays annotations, examples relative to SwitchRound widget or as freeform.
     :caption: examples/displayio_layout_annotation_simpletest.py
     :linenos:
 
+Cartesian plane simple test
+---------------------------
+
+Create a simple plot plane.
+
+.. literalinclude:: ../examples/displayio_layout_cartesian_simpletest.py
+    :caption: examples/displayio_layout_cartesian_simpletest.py
+    :linenos:
+
 Color Picker example
 --------------------