Merge branch 'master' into Optical-Encoder-Module

1 files changed, 139 insertions, 0 deletions

diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
new file mode 100644
index 000000000..b8bb377ac
--- /dev/null
+++ b/shared-bindings/vectorio/Polygon.c
@@ -0,0 +1,139 @@
+
+#include "shared-module/vectorio/__init__.h"
+#include "shared-bindings/vectorio/Polygon.h"
+
+#include <stdint.h>
+
+#include "py/obj.h"
+#include "py/objproperty.h"
+#include "py/objtype.h"
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+
+#define VECTORIO_POLYGON_DEBUG(...) (void)0
+// #define VECTORIO_POLYGON_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
+
+
+// Converts a list of points tuples to a flat list of ints for speedier internal use.
+// Also validates the points.
+static mp_obj_t _to_points_list(mp_obj_t points_tuple_list) {
+    size_t len = 0;
+    mp_obj_t *items;
+    mp_obj_list_get(points_tuple_list, &len, &items);
+    VECTORIO_POLYGON_DEBUG("polygon_points_list len: %d\n", len);
+
+    if ( len == 0 ) {
+        mp_raise_TypeError_varg(translate("empty %q list"), MP_QSTR_point);
+    }
+
+    mp_obj_t points_list = mp_obj_new_list(0, NULL);
+
+    for ( size_t i = 0; i < len; ++i) {
+        size_t tuple_len = 0;
+        mp_obj_t *tuple_items;
+        mp_obj_tuple_get(items[i], &tuple_len, &tuple_items);
+
+        if (tuple_len != 2) {
+            mp_raise_ValueError_varg(translate("%q must be a tuple of length 2"), MP_QSTR_point);
+        }
+        int value;
+        if (!mp_obj_get_int_maybe(tuple_items[0], &value)) {
+            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
+        }
+        mp_obj_list_append(points_list, MP_OBJ_NEW_SMALL_INT(value));
+        if (!mp_obj_get_int_maybe(tuple_items[1], &value)) {
+            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
+        }
+        mp_obj_list_append(points_list, MP_OBJ_NEW_SMALL_INT(value));
+    }
+    return points_list;
+}
+
+
+
+//| .. currentmodule:: vectorio
+//|
+//| :class:`Polygon` -- Represents a closed shape by ordered vertices
+//| ==========================================================================
+//|
+//| .. class:: Polygon( List[ Tuple[ x, y ], ... ] )
+//|
+//|   :param [Point] points_array: Vertices for the polygon
+//|
+static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_points_list };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_points, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (!MP_OBJ_IS_TYPE(args[ARG_points_list].u_obj, &mp_type_list)) {
+        mp_raise_TypeError_varg(translate("%q list must be a list"), MP_QSTR_point);
+    }
+    mp_obj_t points_list = _to_points_list(args[ARG_points_list].u_obj);
+
+    vectorio_polygon_t *self = m_new_obj(vectorio_polygon_t);
+    self->base.type = &vectorio_polygon_type;
+
+    common_hal_vectorio_polygon_construct(self, points_list);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+
+//|   .. attribute:: points
+//|
+//|     Set a new look and shape for this polygon
+//|
+STATIC mp_obj_t vectorio_polygon_obj_get_points(mp_obj_t self_in) {
+    vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+    
+    size_t len = 0;
+    mp_obj_t *items;
+    mp_obj_list_get(common_hal_vectorio_polygon_get_points(self), &len, &items);
+
+    for (size_t i = 0; i < len; i += 2) {
+        mp_obj_t tuple[] = { items[i], items[i+1] };
+        mp_obj_list_append(
+            list,
+            mp_obj_new_tuple(2, tuple)
+        );
+    }
+    return list;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(vectorio_polygon_get_points_obj, vectorio_polygon_obj_get_points);
+
+STATIC mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t points) {
+    vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in);
+
+    mp_obj_t points_list = _to_points_list(points);
+
+    common_hal_vectorio_polygon_set_points(self, points_list);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_points_obj, vectorio_polygon_obj_set_points);
+
+const mp_obj_property_t vectorio_polygon_points_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&vectorio_polygon_get_points_obj,
+              (mp_obj_t)&vectorio_polygon_set_points_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+
+
+STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_points), MP_ROM_PTR(&vectorio_polygon_points_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(vectorio_polygon_locals_dict, vectorio_polygon_locals_dict_table);
+
+const mp_obj_type_t vectorio_polygon_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Polygon,
+    .make_new = vectorio_polygon_make_new,
+    .locals_dict = (mp_obj_dict_t*)&vectorio_polygon_locals_dict,
+};
+