Merge pull request #3275 from kmatch98/bitmap_v2
Add `bitmap.blit` command for bitmap copy
This commit is contained in:
commit
5b1a1c773f
@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
|
"POT-Creation-Date: 2020-08-21 21:39-0500\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -1349,10 +1349,6 @@ msgstr ""
|
|||||||
msgid "Pull not used when direction is output."
|
msgid "Pull not used when direction is output."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ports/stm/ref/pulseout-pre-timeralloc.c
|
|
||||||
msgid "PulseOut not supported on this chip"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: ports/stm/common-hal/os/__init__.c
|
#: ports/stm/common-hal/os/__init__.c
|
||||||
msgid "RNG DeInit Error"
|
msgid "RNG DeInit Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -2879,6 +2875,14 @@ msgstr ""
|
|||||||
msgid "ord() expected a character, but string of length %d found"
|
msgid "ord() expected a character, but string of length %d found"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: shared-bindings/displayio/Bitmap.c
|
||||||
|
msgid "out of range of source"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: shared-bindings/displayio/Bitmap.c
|
||||||
|
msgid "out of range of target"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: py/objint_mpz.c
|
#: py/objint_mpz.c
|
||||||
msgid "overflow converting long int to machine word"
|
msgid "overflow converting long int to machine word"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -3056,6 +3060,10 @@ msgstr ""
|
|||||||
msgid "sosfilt requires iterable arguments"
|
msgid "sosfilt requires iterable arguments"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: shared-bindings/displayio/Bitmap.c
|
||||||
|
msgid "source palette too large"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: py/objstr.c
|
#: py/objstr.c
|
||||||
msgid "start/end indices"
|
msgid "start/end indices"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -172,7 +172,109 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
|
|||||||
return mp_const_none;
|
return mp_const_none;
|
||||||
}
|
}
|
||||||
|
|
||||||
//| def fill(self, value: int) -> None:
|
//| def blit(self, x: int, y: int, source_bitmap: bitmap, *, x1: int, y1: int, x2: int, y2: int, skip_index: int) -> None:
|
||||||
|
//| """Inserts the source_bitmap region defined by rectangular boundaries
|
||||||
|
//| (x1,y1) and (x2,y2) into the bitmap at the specified (x,y) location.
|
||||||
|
//|
|
||||||
|
//| :param int x: Horizontal pixel location in bitmap where source_bitmap upper-left
|
||||||
|
//| corner will be placed
|
||||||
|
//| :param int y: Vertical pixel location in bitmap where source_bitmap upper-left
|
||||||
|
//| corner will be placed
|
||||||
|
//| :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied
|
||||||
|
//| :param int x1: Minimum x-value for rectangular bounding box to be copied from the source bitmap
|
||||||
|
//| :param int y1: Minimum y-value for rectangular bounding box to be copied from the source bitmap
|
||||||
|
//| :param int x2: Maximum x-value (exclusive) for rectangular bounding box to be copied from the source bitmap
|
||||||
|
//| :param int y2: Maximum y-value (exclusive) for rectangular bounding box to be copied from the source bitmap
|
||||||
|
//| :param int skip_index: bitmap palette index in the source that will not be copied,
|
||||||
|
//| set to None to copy all pixels"""
|
||||||
|
//| ...
|
||||||
|
//|
|
||||||
|
STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args){
|
||||||
|
enum {ARG_x, ARG_y, ARG_source, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_index};
|
||||||
|
static const mp_arg_t allowed_args[] = {
|
||||||
|
{MP_QSTR_x, MP_ARG_REQUIRED | MP_ARG_INT},
|
||||||
|
{MP_QSTR_y, MP_ARG_REQUIRED | MP_ARG_INT},
|
||||||
|
{MP_QSTR_source_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ},
|
||||||
|
{MP_QSTR_x1, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
|
||||||
|
{MP_QSTR_y1, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
|
||||||
|
{MP_QSTR_x2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, // None convert to source->width
|
||||||
|
{MP_QSTR_y2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, // None convert to source->height
|
||||||
|
{MP_QSTR_skip_index, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj=mp_const_none} },
|
||||||
|
};
|
||||||
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
||||||
|
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
||||||
|
|
||||||
|
displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]);
|
||||||
|
|
||||||
|
int16_t x = args[ARG_x].u_int;
|
||||||
|
int16_t y = args[ARG_y].u_int;
|
||||||
|
|
||||||
|
displayio_bitmap_t *source = MP_OBJ_TO_PTR(args[ARG_source].u_obj);
|
||||||
|
|
||||||
|
// ensure that the target bitmap (self) has at least as many `bits_per_value` as the source
|
||||||
|
if (self->bits_per_value < source->bits_per_value) {
|
||||||
|
mp_raise_ValueError(translate("source palette too large"));
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t x1 = args[ARG_x1].u_int;
|
||||||
|
int16_t y1 = args[ARG_y1].u_int;
|
||||||
|
int16_t x2, y2;
|
||||||
|
// if x2 or y2 is None, then set as the maximum size of the source bitmap
|
||||||
|
if ( args[ARG_x2].u_obj == mp_const_none ) {
|
||||||
|
x2 = source->width;
|
||||||
|
} else {
|
||||||
|
x2 = mp_obj_get_int(args[ARG_x2].u_obj);
|
||||||
|
}
|
||||||
|
//int16_t y2;
|
||||||
|
if ( args[ARG_y2].u_obj == mp_const_none ) {
|
||||||
|
y2 = source->height;
|
||||||
|
} else {
|
||||||
|
y2 = mp_obj_get_int(args[ARG_y2].u_obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check x,y are within self (target) bitmap boundary
|
||||||
|
if ( (x < 0) || (y < 0) || (x > self->width) || (y > self->height) ) {
|
||||||
|
mp_raise_ValueError(translate("out of range of target"));
|
||||||
|
}
|
||||||
|
// Check x1,y1,x2,y2 are within source bitmap boundary
|
||||||
|
if ( (x1 < 0) || (x1 > source->width) ||
|
||||||
|
(y1 < 0) || (y1 > source->height) ||
|
||||||
|
(x2 < 0) || (x2 > source->width) ||
|
||||||
|
(y2 < 0) || (y2 > source->height) ) {
|
||||||
|
mp_raise_ValueError(translate("out of range of source"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure x1 < x2 and y1 < y2
|
||||||
|
if (x1 > x2) {
|
||||||
|
int16_t temp=x2;
|
||||||
|
x2=x1;
|
||||||
|
x1=temp;
|
||||||
|
}
|
||||||
|
if (y1 > y2) {
|
||||||
|
int16_t temp=y2;
|
||||||
|
y2=y1;
|
||||||
|
y1=temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t skip_index;
|
||||||
|
bool skip_index_none; // flag whether skip_value was None
|
||||||
|
|
||||||
|
if (args[ARG_skip_index].u_obj == mp_const_none ) {
|
||||||
|
skip_index = 0;
|
||||||
|
skip_index_none = true;
|
||||||
|
} else {
|
||||||
|
skip_index = mp_obj_get_int(args[ARG_skip_index].u_obj);
|
||||||
|
skip_index_none = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
common_hal_displayio_bitmap_blit(self, x, y, source, x1, y1, x2, y2, skip_index, skip_index_none);
|
||||||
|
|
||||||
|
return mp_const_none;
|
||||||
|
}
|
||||||
|
MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_blit_obj, 4, displayio_bitmap_obj_blit);
|
||||||
|
// `displayio_bitmap_obj_blit` requires at least 4 arguments
|
||||||
|
|
||||||
|
//| def fill(self, value: Any) -> None:
|
||||||
//| """Fills the bitmap with the supplied palette index value."""
|
//| """Fills the bitmap with the supplied palette index value."""
|
||||||
//| ...
|
//| ...
|
||||||
//|
|
//|
|
||||||
@ -192,6 +294,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill);
|
|||||||
STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = {
|
STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = {
|
||||||
{ MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_bitmap_height_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_bitmap_height_obj) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_bitmap_width_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_bitmap_width_obj) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&displayio_bitmap_blit_obj) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&displayio_bitmap_fill_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&displayio_bitmap_fill_obj) },
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -40,6 +40,9 @@ uint16_t common_hal_displayio_bitmap_get_height(displayio_bitmap_t *self);
|
|||||||
uint16_t common_hal_displayio_bitmap_get_width(displayio_bitmap_t *self);
|
uint16_t common_hal_displayio_bitmap_get_width(displayio_bitmap_t *self);
|
||||||
uint32_t common_hal_displayio_bitmap_get_bits_per_value(displayio_bitmap_t *self);
|
uint32_t common_hal_displayio_bitmap_get_bits_per_value(displayio_bitmap_t *self);
|
||||||
void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y, uint32_t value);
|
void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y, uint32_t value);
|
||||||
|
void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16_t y, displayio_bitmap_t *source,
|
||||||
|
int16_t x1, int16_t y1, int16_t x2, int16_t y2,
|
||||||
|
uint32_t skip_index, bool skip_index_none);
|
||||||
uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y);
|
uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y);
|
||||||
void common_hal_displayio_bitmap_fill(displayio_bitmap_t *bitmap, uint32_t value);
|
void common_hal_displayio_bitmap_fill(displayio_bitmap_t *bitmap, uint32_t value);
|
||||||
|
|
||||||
|
@ -105,6 +105,32 @@ uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *self, int16_t
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16_t y, displayio_bitmap_t *source,
|
||||||
|
int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint32_t skip_index, bool skip_index_none) {
|
||||||
|
// Copy complete "source" bitmap into "self" bitmap at location x,y in the "self"
|
||||||
|
// Add a boolean to determine if all values are copied, or only if non-zero
|
||||||
|
// If skip_value is encountered in the source bitmap, it will not be copied.
|
||||||
|
// If skip_value is `None`, then all pixels are copied.
|
||||||
|
|
||||||
|
if (self->read_only) {
|
||||||
|
mp_raise_RuntimeError(translate("Read-only object"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// simplest version - use internal functions for get/set pixels
|
||||||
|
for (int16_t i=0; i < (x2-x1) ; i++) {
|
||||||
|
if ( (x+i >= 0) && (x+i < self->width) ) {
|
||||||
|
for (int16_t j=0; j < (y2-y1) ; j++){
|
||||||
|
if ((y+j >= 0) && (y+j < self->height) ) {
|
||||||
|
uint32_t value = common_hal_displayio_bitmap_get_pixel(source, x1+i, y1+j);
|
||||||
|
if ( (skip_index_none) || (value != skip_index) ) { // write if skip_value_none is True
|
||||||
|
common_hal_displayio_bitmap_set_pixel(self, x+i, y+j, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *self, int16_t x, int16_t y, uint32_t value) {
|
void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *self, int16_t x, int16_t y, uint32_t value) {
|
||||||
if (self->read_only) {
|
if (self->read_only) {
|
||||||
mp_raise_RuntimeError(translate("Read-only object"));
|
mp_raise_RuntimeError(translate("Read-only object"));
|
||||||
|
Loading…
Reference in New Issue
Block a user