Skip to content

Commit 85f0f07

Browse files
kmatch98kmatch98
committed
add fill_region and draw_line to bitmaptools
1 parent 0c012da commit 85f0f07

File tree

5 files changed

+308
-6
lines changed

5 files changed

+308
-6
lines changed

‎locale/circuitpython.pot

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,10 +1042,6 @@ msgstr ""
10421042
msgid "Group already used"
10431043
msgstr ""
10441044

1045-
#: shared-module/displayio/Group.c
1046-
msgid "Group full"
1047-
msgstr ""
1048-
10491045
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
10501046
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
10511047
#: ports/stm/common-hal/sdioio/SDCard.c
@@ -3643,7 +3639,7 @@ msgstr ""
36433639
msgid "out of range of source"
36443640
msgstr ""
36453641

3646-
#: shared-bindings/displayio/Bitmap.c
3642+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
36473643
msgid "out of range of target"
36483644
msgstr ""
36493645

‎shared-bindings/bitmaptools/__init__.c

Lines changed: 149 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,161 @@ STATIC mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args
243243
MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_rotozoom_obj, 0, bitmaptools_obj_rotozoom);
244244
// requires at least 2 arguments (destination bitmap and source bitmap)
245245

246+
//|
247+
//| def fill_region(
248+
//| dest_bitmap: displayio.Bitmap,
249+
//| x1: int, y1: int,
250+
//| x2: int, y2: int,
251+
//| value: int) -> None:
252+
//| """Draws the color value into the destination bitmap within the
253+
//| rectangular region bounded by (x1,y1) and (x2,y2), exclusive.
254+
//|
255+
//| :param bitmap dest_bitmap: Destination bitmap that will be written into
256+
//| :param int x1: x-pixel position of the first corner of the rectangular fill region
257+
//| :param int y1: y-pixel position of the first corner of the rectangular fill region
258+
//| :param int x2: x-pixel position of the second corner of the rectangular fill region
259+
//| :param int y2: y-pixel position of the second corner of the rectangular fill region
260+
//| :param int value: Bitmap palette index that will be written into the rectangular
261+
//| fill region in the destination bitmap"""
262+
//| ...
263+
//|
264+
STATIC mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args){
265+
enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
266+
267+
static const mp_arg_t allowed_args[] = {
268+
{MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ},
269+
{MP_QSTR_x1, MP_ARG_REQUIRED | MP_ARG_INT},
270+
{MP_QSTR_y1, MP_ARG_REQUIRED | MP_ARG_INT},
271+
{MP_QSTR_x2, MP_ARG_REQUIRED | MP_ARG_INT},
272+
{MP_QSTR_y2, MP_ARG_REQUIRED | MP_ARG_INT},
273+
{MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT},
274+
};
275+
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
276+
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
277+
278+
displayio_bitmap_t *destination = MP_OBJ_TO_PTR(args[ARG_dest_bitmap].u_obj); // the destination bitmap
279+
280+
uint32_t value, color_depth;
281+
value = args[ARG_value].u_int;
282+
color_depth = (1 << destination->bits_per_value);
283+
if (color_depth <= value) {
284+
mp_raise_ValueError(translate("out of range of target"));
285+
}
286+
287+
int16_t x1 = args[ARG_x1].u_int;
288+
int16_t y1 = args[ARG_y1].u_int;
289+
int16_t x2 = args[ARG_x2].u_int;
290+
int16_t y2 = args[ARG_y2].u_int;
291+
292+
// Ensure x1 < x2 and y1 < y2
293+
if (x1 > x2) {
294+
int16_t temp=x2;
295+
x2=x1;
296+
x1=temp;
297+
}
298+
if (y1 > y2) {
299+
int16_t temp=y2;
300+
y2=y1;
301+
y1=temp;
302+
}
303+
304+
// constrain to bitmap dimensions
305+
if (x1 < 0) {
306+
x1 = 0;
307+
} else if (x1 > destination->width) {
308+
x1 = destination->width;
309+
}
310+
if (x2 < 0) {
311+
x2 = 0;
312+
} else if (x2 > destination->width) {
313+
x2 = destination->width;
314+
}
315+
if (y1 < 0) {
316+
y1 = 0;
317+
} else if (y1 > destination->height) {
318+
y1 = destination->height;
319+
}
320+
if (y2 < 0) {
321+
y2 = 0;
322+
} else if (y2 > destination->height) {
323+
y2 = destination->height;
324+
}
325+
326+
common_hal_bitmaptools_fill_region(destination, x1, y1, x2, y2, value);
327+
328+
return mp_const_none;
329+
}
330+
331+
MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_fill_region_obj, 0, bitmaptools_obj_fill_region);
332+
// requires all 6 arguments
333+
334+
//|
335+
//| def draw_line(
336+
//| dest_bitmap: displayio.Bitmap,
337+
//| x1: int, y1: int,
338+
//| x2: int, y2: int,
339+
//| value: int) -> None:
340+
//| """Draws a line into a bitmap specified two endpoints (x1,y1) and (x2,y2).
341+
//|
342+
//| :param bitmap dest_bitmap: Destination bitmap that will be written into
343+
//| :param int x1: x-pixel position of the line's first endpoint
344+
//| :param int y1: y-pixel position of the line's first endpoint
345+
//| :param int x2: x-pixel position of the line's second endpoint
346+
//| :param int y2: y-pixel position of the line's second endpoint
347+
//| :param int value: Bitmap palette index that will be written into the
348+
//| line in the destination bitmap"""
349+
//| ...
350+
//|
351+
STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args){
352+
enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value};
353+
354+
static const mp_arg_t allowed_args[] = {
355+
{MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ},
356+
{MP_QSTR_x1, MP_ARG_REQUIRED | MP_ARG_INT},
357+
{MP_QSTR_y1, MP_ARG_REQUIRED | MP_ARG_INT},
358+
{MP_QSTR_x2, MP_ARG_REQUIRED | MP_ARG_INT},
359+
{MP_QSTR_y2, MP_ARG_REQUIRED | MP_ARG_INT},
360+
{MP_QSTR_value, MP_ARG_REQUIRED | MP_ARG_INT},
361+
};
362+
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
363+
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
364+
365+
displayio_bitmap_t *destination = MP_OBJ_TO_PTR(args[ARG_dest_bitmap].u_obj); // the destination bitmap
366+
367+
uint32_t value, color_depth;
368+
value = args[ARG_value].u_int;
369+
color_depth = (1 << destination->bits_per_value);
370+
if (color_depth <= value) {
371+
mp_raise_ValueError(translate("out of range of target"));
372+
}
373+
374+
int16_t x1 = args[ARG_x1].u_int;
375+
int16_t y1 = args[ARG_y1].u_int;
376+
int16_t x2 = args[ARG_x2].u_int;
377+
int16_t y2 = args[ARG_y2].u_int;
378+
379+
// verify points are within the bitmap boundary (inclusive)
380+
if ( (x1 < 0) || (x2 < 0) || (y1 < 0) || (y2 < 0) ||
381+
(x1 >= destination->width) || (x2 >= destination->width) ||
382+
(y1 >= destination->height) || (y2 >= destination->height) ) {
383+
mp_raise_ValueError(translate("out of range of target"));
384+
}
385+
386+
common_hal_bitmaptools_draw_line(destination, x1, y1, x2, y2, value);
387+
388+
return mp_const_none;
389+
}
390+
391+
MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_line);
392+
// requires all 6 arguments
246393

247394
STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = {
248395
{ MP_ROM_QSTR(MP_QSTR_rotozoom), MP_ROM_PTR(&bitmaptools_rotozoom_obj) },
396+
{ MP_ROM_QSTR(MP_QSTR_fill_region), MP_ROM_PTR(&bitmaptools_fill_region_obj) },
397+
{ MP_ROM_QSTR(MP_QSTR_draw_line), MP_ROM_PTR(&bitmaptools_draw_line_obj) },
249398
};
250399
STATIC MP_DEFINE_CONST_DICT(bitmaptools_module_globals, bitmaptools_module_globals_table);
251400

252-
253401
const mp_obj_module_t bitmaptools_module = {
254402
.base = {&mp_type_module },
255403
.globals = (mp_obj_dict_t*)&bitmaptools_module_globals,

‎shared-bindings/bitmaptools/__init__.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,14 @@ void common_hal_bitmaptools_rotozoom(displayio_bitmap_t *self, int16_t ox, int16
3939
float scale,
4040
uint32_t skip_index, bool skip_index_none);
4141

42+
void common_hal_bitmaptools_fill_region(displayio_bitmap_t *destination,
43+
int16_t x1, int16_t y1,
44+
int16_t x2, int16_t y2,
45+
uint32_t value);
46+
47+
void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
48+
int16_t x0, int16_t y0,
49+
int16_t x1, int16_t y1,
50+
uint32_t value);
51+
4252
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BITMAPTOOLS__INIT__H

‎shared-module/bitmaptools/__init__.c

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626

2727

2828
#include "shared-bindings/displayio/Bitmap.h"
29+
#include "shared-module/displayio/Bitmap.h"
2930

3031
#include "py/runtime.h"
3132

3233
#include "math.h"
34+
#include "stdlib.h"
3335

3436
void common_hal_bitmaptools_rotozoom(displayio_bitmap_t *self, int16_t ox, int16_t oy,
3537
int16_t dest_clip0_x, int16_t dest_clip0_y,
@@ -172,3 +174,147 @@ void common_hal_bitmaptools_rotozoom(displayio_bitmap_t *self, int16_t ox, int16
172174
rowv += dvCol;
173175
}
174176
}
177+
178+
void common_hal_bitmaptools_fill_region(displayio_bitmap_t *destination,
179+
int16_t x1, int16_t y1,
180+
int16_t x2, int16_t y2,
181+
uint32_t value) {
182+
// writes the value (a bitmap color index) into a bitmap in the specified rectangular region
183+
//
184+
// input checks should ensure that x1 < x2 and y1 < y2 and are within the bitmap region
185+
186+
if (destination->read_only) {
187+
mp_raise_RuntimeError(translate("Read-only object"));
188+
}
189+
190+
// update the dirty rectangle
191+
displayio_bitmap_set_dirty_area(destination, x1, y1, x2, y2);
192+
193+
int16_t x, y;
194+
for (x = x1; x < x2; x++) {
195+
for (y = y1; y < y2; y++ ) {
196+
displayio_bitmap_write_pixel(destination, x, y, value);
197+
}
198+
}
199+
}
200+
201+
int16_t constrain(int16_t input, int16_t min, int16_t max) {
202+
// constrain the input between the min and max values
203+
if (input < min) {
204+
return min;
205+
}
206+
if (input > max) {
207+
return max;
208+
}
209+
return input;
210+
}
211+
212+
void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
213+
int16_t x0, int16_t y0,
214+
int16_t x1, int16_t y1,
215+
uint32_t value) {
216+
217+
if (destination->read_only) {
218+
mp_raise_RuntimeError(translate("Read-only object"));
219+
}
220+
221+
//
222+
// adapted from Adafruit_CircuitPython_Display_Shapes.Polygon._line
223+
//
224+
225+
// update the dirty rectangle
226+
int16_t xbb0, xbb1, ybb0, ybb1;
227+
if (x0 < x1) {
228+
xbb0 = x0;
229+
xbb1 = x1 + 1;
230+
} else {
231+
xbb0 = x1;
232+
xbb1 = x0 + 1;
233+
}
234+
if (y0 < y1) {
235+
ybb0 = y0;
236+
ybb1 = y1 + 1;
237+
} else {
238+
ybb0 = y1;
239+
ybb1 = y0 + 1;
240+
}
241+
242+
xbb0 = constrain(xbb0, 0, destination->width);
243+
xbb1 = constrain(xbb1, 0, destination->width);
244+
ybb0 = constrain(ybb0, 0, destination->height);
245+
ybb1 = constrain(ybb1, 0, destination->height);
246+
247+
displayio_bitmap_set_dirty_area(destination, xbb0, ybb0, xbb1, ybb1);
248+
249+
int16_t temp, x, y;
250+
251+
if (x0 == x1) { // vertical line
252+
if (y0 > y1) { // ensure y1 > y0
253+
temp = y0;
254+
y0 = y1;
255+
y1 = temp;
256+
}
257+
for (y = y0; y < (y1 + 1); y++) { // write a horizontal line
258+
displayio_bitmap_write_pixel(destination, x0, y, value);
259+
}
260+
}
261+
else if (y0 == y1) { // horizontal line
262+
if (x0 > x1) { // ensure y1 > y0
263+
temp = x0;
264+
x0 = x1;
265+
x1 = temp;
266+
}
267+
for (x = x0; x < (x1 + 1); x++) { // write a horizontal line
268+
displayio_bitmap_write_pixel(destination, x, y0, value);
269+
}
270+
}
271+
else {
272+
bool steep;
273+
steep = ( abs(y1 - y0) > abs(x1 - x0) );
274+
275+
if ( steep ) { // flip x0<->y0 and x1<->y1
276+
temp = x0;
277+
x0 = y0;
278+
y0 = temp;
279+
temp = x1;
280+
x1 = y1;
281+
y1 = temp;
282+
}
283+
284+
if (x0 > x1) { // flip x0<->x1 and y0<->y1
285+
temp = x0;
286+
x0 = x1;
287+
x1 = temp;
288+
temp = y0;
289+
y0 = y1;
290+
y1 = temp;
291+
}
292+
293+
int16_t dx, dy, ystep;
294+
dx = x1 - x0;
295+
dy = abs(y1 - y0);
296+
297+
float err = dx / 2;
298+
299+
if (y0 < y1) {
300+
ystep = 1;
301+
}
302+
else {
303+
ystep = -1;
304+
}
305+
306+
for (x = x0; x < (x1 + 1); x++) {
307+
if (steep) {
308+
displayio_bitmap_write_pixel(destination, y0, x, value);
309+
}
310+
else {
311+
displayio_bitmap_write_pixel(destination, x, y0, value);
312+
}
313+
err -= dy;
314+
if (err < 0) {
315+
y0 += ystep;
316+
err += dx;
317+
}
318+
}
319+
}
320+
}

‎shared-module/displayio/Bitmap.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@ typedef struct {
4949

5050
void displayio_bitmap_finish_refresh(displayio_bitmap_t *self);
5151
displayio_area_t* displayio_bitmap_get_refresh_areas(displayio_bitmap_t *self, displayio_area_t* tail);
52+
void displayio_bitmap_set_dirty_area(displayio_bitmap_t *self, int16_t x1, int16_t y1, int16_t x2, int16_t y2);
53+
void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y, uint32_t value);
5254

5355
#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_BITMAP_H

0 commit comments

Comments
 (0)