djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code format and translations

Browse Source
This commit is contained in:
foamyguy 2021-08-13 10:13:38 -05:00
parent c1e164e1ff
commit ec8b31e7b4
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
locale/circuitpython.pot
View File

@ -2566,6 +2566,10 @@ msgstr ""
msgid "axis too long" msgid "axis too long"
msgstr "" msgstr ""
#: shared-bindings/bitmaptools/__init__.c
msgid "background value out of range of target"
msgstr ""
#: py/builtinevex.c #: py/builtinevex.c
msgid "bad compile mode" msgid "bad compile mode"
msgstr "" msgstr ""
@ -3917,6 +3921,7 @@ msgstr ""
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h #: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h #: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
@ -4358,6 +4363,10 @@ msgstr ""
msgid "value must fit in %d byte(s)" msgid "value must fit in %d byte(s)"
msgstr "" msgstr ""
#: shared-bindings/bitmaptools/__init__.c
msgid "value out of range of target"
msgstr ""
#: shared-bindings/displayio/Bitmap.c #: shared-bindings/displayio/Bitmap.c
msgid "value_count must be > 0" msgid "value_count must be > 0"
msgstr "" msgstr ""

26
shared-module/bitmaptools/__init__.c
View File

@ -263,9 +263,9 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
// first point is the one user passed in // first point is the one user passed in
mp_obj_t point[] = { mp_obj_new_int(x), mp_obj_new_int(y) }; mp_obj_t point[] = { mp_obj_new_int(x), mp_obj_new_int(y) };
mp_obj_list_append( mp_obj_list_append(
fill_area, fill_area,
mp_obj_new_tuple(2, point) mp_obj_new_tuple(2, point)
); );
mp_obj_t *fill_points; mp_obj_t *fill_points;
size_t list_length = 0; size_t list_length = 0;
@ -278,7 +278,7 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
mp_obj_t *tuple_items; mp_obj_t *tuple_items;
// while there are still points to check // while there are still points to check
while (list_length > 0){ while (list_length > 0) {
mp_obj_list_get(fill_area, &list_length, &fill_points); mp_obj_list_get(fill_area, &list_length, &fill_points);
current_point = mp_obj_list_pop(fill_area, 0); current_point = mp_obj_list_pop(fill_area, 0);
mp_obj_tuple_get(current_point, &tuple_len, &tuple_items); mp_obj_tuple_get(current_point, &tuple_len, &tuple_items);
@ -288,7 +288,7 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
mp_obj_get_int(tuple_items[1])); mp_obj_get_int(tuple_items[1]));
// if the current point is not background color ignore it // if the current point is not background color ignore it
if(current_point_color_value != background_value){ if (current_point_color_value != background_value) {
mp_obj_list_get(fill_area, &list_length, &fill_points); mp_obj_list_get(fill_area, &list_length, &fill_points);
continue; continue;
} }
@ -303,28 +303,32 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination,
// add all 4 surrounding points to the list to check // add all 4 surrounding points to the list to check
mp_obj_t above_point[] = { mp_obj_t above_point[] = {
tuple_items[0], tuple_items[0],
MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1])-1)}; MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1]) - 1)
};
mp_obj_list_append( mp_obj_list_append(
fill_area, fill_area,
mp_obj_new_tuple(2, above_point)); mp_obj_new_tuple(2, above_point));
mp_obj_t left_point[] = { mp_obj_t left_point[] = {
MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0])-1), MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0]) - 1),
tuple_items[1]}; tuple_items[1]
};
mp_obj_list_append( mp_obj_list_append(
fill_area, fill_area,
mp_obj_new_tuple(2, left_point)); mp_obj_new_tuple(2, left_point));
mp_obj_t right_point[] = { mp_obj_t right_point[] = {
MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0])+1), MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0]) + 1),
tuple_items[1]}; tuple_items[1]
};
mp_obj_list_append( mp_obj_list_append(
fill_area, fill_area,
mp_obj_new_tuple(2, right_point)); mp_obj_new_tuple(2, right_point));
mp_obj_t below_point[] = { mp_obj_t below_point[] = {
tuple_items[0], tuple_items[0],
MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1])+1)}; MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1]) + 1)
};
mp_obj_list_append( mp_obj_list_append(
fill_area, fill_area,
mp_obj_new_tuple(2, below_point)); mp_obj_new_tuple(2, below_point));