Lephenixnoir
/
PythonExtra
1
0
Fork 2
Code Issues 9 Pull Requests 3 Projects Releases 2 Wiki Activity

modgint: add dcircle(), dellipse(), and [cg50] C_RGB()

This commit is contained in:
Lephenixnoir 2024-01-04 12:56:29 +01:00
parent 8823d1f473
commit c3dc438b82
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
2 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ports/sh/examples/gint_circle.py Normal file
View File

@ -0,0 +1,44 @@
from gint import *
if DWIDTH==128:
C_RGB = lambda r, g, b: 0
_ = lambda x, y: x
else:
_ = lambda x, y: y
dclear(C_WHITE)
fill1 = _(C_NONE, C_RGB(24, 24, 24))
fill2 = _(C_BLACK, C_RGB(24, 24, 24))
x1 = _(5,20)
x2 = _(40,90)
x3 = _(64,120)
x4 = _(97,220)
y1 = _(2,20)
y2 = _(19,60)
w1 = _(26,60)
h1 = _(15,30)
dellipse(x1, y1, x1+w1, y1+h1, fill=fill1, border=C_BLACK)
dellipse(x1, y2, x1+w1, y2+4, fill=fill1, border=C_BLACK)
dellipse(x1, y2+_(6,10), x1+w1, y2+_(6,10), fill=fill1, border=C_BLACK)
dellipse(x2, y1, x2+4, y1+h1, fill=fill1, border=C_BLACK)
dellipse(x2+10, y1, x2+20, y1+h1, fill=fill1, border=C_BLACK)
dellipse(x3, y1, x3+w1, y1+h1, border=C_BLACK)
dellipse(x4, y1, x4+w1, y1+h1, fill=fill2)
y3 = _(40,135)
y4 = _(55,170)
r = _(10,20)
x1 += w1 // 2
dcircle(x1, y3, w1//2, fill=fill1, border=C_BLACK)
dcircle(x1, y4+2, 2, fill=fill1, border=C_BLACK)
dcircle(x1, y4+_(6,10), 0, fill=fill1, border=C_BLACK)
dcircle(x2+r, y3, r, fill=fill1, border=C_BLACK)
dcircle(x3+w1//2, y3, r, border=C_BLACK)
dcircle(x4+w1//2, y3, r, fill=fill2)
dupdate()
getkey()

62
ports/sh/modgint.c
View File

@ -157,6 +157,16 @@ FUN_1(keycode_digit);
/* <gint/display.h> */
#ifdef FXCG50
STATIC mp_obj_t modgint_C_RGB(mp_obj_t arg1, mp_obj_t arg2, mp_obj_t arg3)
{
mp_int_t r = mp_obj_get_int(arg1);
mp_int_t g = mp_obj_get_int(arg2);
mp_int_t b = mp_obj_get_int(arg3);
return MP_OBJ_NEW_SMALL_INT(C_RGB(r, g, b));
}
#endif
STATIC mp_obj_t modgint_dclear(mp_obj_t arg1)
{
mp_int_t color = mp_obj_get_int(arg1);
@ -238,6 +248,49 @@ STATIC mp_obj_t modgint_dvline(mp_obj_t arg1, mp_obj_t arg2)
return mp_const_none;
}
/* dellipse(x, y, r, *, fill=C_NONE, border=C_NONE) */
STATIC mp_obj_t modgint_dcircle(
size_t n_args, const mp_obj_t *pargs, mp_map_t *kwargs)
{
static mp_arg_t const allowed_args[] = {
{ MP_QSTR_x, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_y, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_r, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_fill, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int=C_NONE} },
{ MP_QSTR_border, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int=C_NONE} },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pargs, kwargs, MP_ARRAY_SIZE(allowed_args),
allowed_args, args);
dcircle(args[0].u_int, args[1].u_int, args[2].u_int, args[3].u_int,
args[4].u_int);
return mp_const_none;
}
/* dellipse(x1, y1, x2, y2, *, fill=C_NONE, border=C_NONE) */
STATIC mp_obj_t modgint_dellipse(
size_t n_args, const mp_obj_t *pargs, mp_map_t *kwargs)
{
static mp_arg_t const allowed_args[] = {
{ MP_QSTR_x1, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_y1, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_x2, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_y2, MP_ARG_INT | MP_ARG_REQUIRED, {.u_rom_obj=MP_ROM_NONE} },
{ MP_QSTR_fill, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int=C_NONE} },
{ MP_QSTR_border, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int=C_NONE} },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pargs, kwargs, MP_ARRAY_SIZE(allowed_args),
allowed_args, args);
dellipse(args[0].u_int, args[1].u_int, args[2].u_int, args[3].u_int,
args[4].u_int, args[5].u_int);
return mp_const_none;
}
// TODO: modgint: Font management?
STATIC mp_obj_t modgint_dtext_opt(size_t n, mp_obj_t const *args)
@ -265,6 +318,10 @@ STATIC mp_obj_t modgint_dtext(size_t n, mp_obj_t const *args)
}
FUN_0(__init__);
#ifdef FXCG50
FUN_3(C_RGB);
#endif
FUN_1(dclear);
FUN_0(dupdate);
FUN_BETWEEN(drect, 5, 5);
@ -274,6 +331,8 @@ FUN_2(dgetpixel);
FUN_BETWEEN(dline, 5, 5);
FUN_2(dhline);
FUN_2(dvline);
MP_DEFINE_CONST_FUN_OBJ_KW(modgint_dcircle_obj, 3, modgint_dcircle);
MP_DEFINE_CONST_FUN_OBJ_KW(modgint_dellipse_obj, 4, modgint_dellipse);
FUN_BETWEEN(dtext_opt, 8, 8);
FUN_BETWEEN(dtext, 4, 4);
@ -415,6 +474,7 @@ STATIC const mp_rom_map_elem_t modgint_module_globals_table[] = {
INT(C_RED),
INT(C_GREEN),
INT(C_BLUE),
OBJ(C_RGB),
#endif
OBJ(dclear),
@ -426,6 +486,8 @@ STATIC const mp_rom_map_elem_t modgint_module_globals_table[] = {
OBJ(dline),
OBJ(dhline),
OBJ(dvline),
OBJ(dcircle),
OBJ(dellipse),
OBJ(dtext_opt),
OBJ(dtext),
};