Merge pull request #4362 from microDev1/code-formatting

Add code formatting and translations check

1 files changed, 36 insertions, 28 deletions

diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
index e00a4696b..00af1e0d7 100644
--- a/shared-module/vectorio/Polygon.c
+++ b/shared-module/vectorio/Polygon.c
@@ -22,21 +22,21 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
     mp_obj_list_get(points_tuple_list, &len, &items);
     VECTORIO_POLYGON_DEBUG(" self.len: %d, len: %d, ", self->len, len);
 
-    if ( len < 3 ) {
+    if (len < 3) {
         mp_raise_TypeError_varg(translate("Polygon needs at least 3 points"));
     }
 
-    if ( self->len < 2*len ) {
-        if ( self->points_list != NULL ) {
+    if (self->len < 2 * len) {
+        if (self->points_list != NULL) {
             VECTORIO_POLYGON_DEBUG("free(%d), ", sizeof(self->points_list));
-            gc_free( self->points_list );
+            gc_free(self->points_list);
         }
-        self->points_list = gc_alloc( 2 * len * sizeof(int), false, false );
+        self->points_list = gc_alloc(2 * len * sizeof(int), false, false);
         VECTORIO_POLYGON_DEBUG("alloc(%p, %d)", self->points_list, 2 * len * sizeof(int));
     }
-    self->len = 2*len;
+    self->len = 2 * len;
 
-    for ( size_t i = 0; i < len; ++i) {
+    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);
@@ -44,11 +44,11 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
         if (tuple_len != 2) {
             mp_raise_ValueError_varg(translate("%q must be a tuple of length 2"), MP_QSTR_point);
         }
-        if (   !mp_obj_get_int_maybe(tuple_items[ 0 ], &self->points_list[2*i    ])
-            || !mp_obj_get_int_maybe(tuple_items[ 1 ], &self->points_list[2*i + 1])
-        ) {
+        if (!mp_obj_get_int_maybe(tuple_items[ 0 ], &self->points_list[2 * i    ])
+            || !mp_obj_get_int_maybe(tuple_items[ 1 ], &self->points_list[2 * i + 1])
+            ) {
             self->len = 0;
-            gc_free( self->points_list );
+            gc_free(self->points_list);
             self->points_list = NULL;
             mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
         }
@@ -62,27 +62,27 @@ void common_hal_vectorio_polygon_construct(vectorio_polygon_t *self, mp_obj_t po
     self->points_list = NULL;
     self->len = 0;
     self->on_dirty.obj = NULL;
-    _clobber_points_list( self, points_list );
+    _clobber_points_list(self, points_list);
     VECTORIO_POLYGON_DEBUG("\n");
 }
 
 
 mp_obj_t common_hal_vectorio_polygon_get_points(vectorio_polygon_t *self) {
     VECTORIO_POLYGON_DEBUG("%p common_hal_vectorio_polygon_get_points {len: %d, points_list: %p}\n", self, self->len, self->points_list);
-    mp_obj_t list = mp_obj_new_list(self->len/2, NULL);
+    mp_obj_t list = mp_obj_new_list(self->len / 2, NULL);
 
     for (size_t i = 0; i < self->len; i += 2) {
-        mp_obj_t tuple[] = { mp_obj_new_int(self->points_list[i]), mp_obj_new_int(self->points_list[i+1]) };
+        mp_obj_t tuple[] = { mp_obj_new_int(self->points_list[i]), mp_obj_new_int(self->points_list[i + 1]) };
         mp_obj_list_append(
             list,
             mp_obj_new_tuple(2, tuple)
-        );
+            );
     }
     return list;
 }
 void common_hal_vectorio_polygon_set_points(vectorio_polygon_t *self, mp_obj_t points_list) {
     VECTORIO_POLYGON_DEBUG("%p common_hal_vectorio_polygon_set_points: ", self);
-    _clobber_points_list( self, points_list );
+    _clobber_points_list(self, points_list);
     if (self->on_dirty.obj != NULL) {
         self->on_dirty.event(self->on_dirty.obj);
     }
@@ -90,7 +90,7 @@ void common_hal_vectorio_polygon_set_points(vectorio_polygon_t *self, mp_obj_t p
 }
 
 void common_hal_vectorio_polygon_set_on_dirty(vectorio_polygon_t *self, vectorio_event_t notification) {
-    if ( self->on_dirty.obj != NULL ) {
+    if (self->on_dirty.obj != NULL) {
         mp_raise_TypeError(translate("polygon can only be registered in one parent"));
     }
     self->on_dirty = notification;
@@ -104,14 +104,22 @@ void common_hal_vectorio_polygon_get_area(void *polygon, displayio_area_t *area)
     area->y1 = SHRT_MAX;
     area->x2 = SHRT_MIN;
     area->y2 = SHRT_MIN;
-    for (size_t i=0; i < self->len; ++i) {
+    for (size_t i = 0; i < self->len; ++i) {
         int x = self->points_list[i];
         ++i;
         int y = self->points_list[i];
-        if (x <= area->x1) area->x1 = x-1;
-        if (y <= area->y1) area->y1 = y-1;
-        if (x >= area->x2) area->x2 = x+1;
-        if (y >= area->y2) area->y2 = y+1;
+        if (x <= area->x1) {
+            area->x1 = x - 1;
+        }
+        if (y <= area->y1) {
+            area->y1 = y - 1;
+        }
+        if (x >= area->x2) {
+            area->x2 = x + 1;
+        }
+        if (y >= area->y2) {
+            area->y2 = y + 1;
+        }
     }
 }
 
@@ -119,9 +127,9 @@ void common_hal_vectorio_polygon_get_area(void *polygon, displayio_area_t *area)
 // <0 if the point is to the left of the line vector
 //  0 if the point is on the line
 // >0 if the point is to the right of the line vector
-__attribute__((always_inline)) static inline int line_side( mp_int_t x1, mp_int_t y1, mp_int_t x2, mp_int_t y2, int16_t px, int16_t py ) {
+__attribute__((always_inline)) static inline int line_side(mp_int_t x1, mp_int_t y1, mp_int_t x2, mp_int_t y2, int16_t px, int16_t py) {
     return (px - x1) * (y2 - y1)
-         - (py - y1) * (x2 - x1);
+           - (py - y1) * (x2 - x1);
 }
 
 
@@ -136,19 +144,19 @@ uint32_t common_hal_vectorio_polygon_get_pixel(void *obj, int16_t x, int16_t y)
     int winding_number = 0;
     int x1 = self->points_list[0];
     int y1 = self->points_list[1];
-    for (size_t i=2; i <= self->len + 1; ++i) {
+    for (size_t i = 2; i <= self->len + 1; ++i) {
         VECTORIO_POLYGON_DEBUG("  {(%3d, %3d),", x1, y1);
         int x2 = self->points_list[i % self->len];
         ++i;
         int y2 = self->points_list[i % self->len];
         VECTORIO_POLYGON_DEBUG(" (%3d, %3d)}\n", x2, y2);
-        if ( y1 <= y ) {
-            if ( y2 > y && line_side(x1, y1, x2, y2, x, y) < 0 ) {
+        if (y1 <= y) {
+            if (y2 > y && line_side(x1, y1, x2, y2, x, y) < 0) {
                 // Wind up, point is to the left of the edge vector
                 ++winding_number;
                 VECTORIO_POLYGON_DEBUG("    wind:%2d winding_number:%2d\n", 1, winding_number);
             }
-        } else if ( y2 <= y && line_side(x1, y1, x2, y2, x, y) > 0 ) {
+        } else if (y2 <= y && line_side(x1, y1, x2, y2, x, y) > 0) {
             // Wind down, point is to the right of the edge vector
             --winding_number;
             VECTORIO_POLYGON_DEBUG("    wind:%2d winding_number:%2d\n", -1, winding_number);