mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-27 20:57:01 +08:00
refactor(btn, img): rename btn to button and img to image
This commit is contained in:
@@ -6,10 +6,10 @@
|
||||
*/
|
||||
void lv_example_bmp_1(void)
|
||||
{
|
||||
lv_obj_t * img = lv_img_create(lv_scr_act());
|
||||
lv_obj_t * img = lv_image_create(lv_scr_act());
|
||||
/* Assuming a File system is attached to letter 'A'
|
||||
* E.g. set LV_USE_FS_STDIO 'A' in lv_conf.h */
|
||||
lv_img_set_src(img, "A:lvgl/examples/libs/bmp/example_32bit.bmp");
|
||||
lv_image_set_src(img, "A:lvgl/examples/libs/bmp/example_32bit.bmp");
|
||||
lv_obj_center(img);
|
||||
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
void lv_example_ffmpeg_1(void)
|
||||
{
|
||||
lv_obj_t * img = lv_img_create(lv_scr_act());
|
||||
lv_img_set_src(img, "./lvgl/examples/libs/ffmpeg/ffmpeg.png");
|
||||
lv_obj_t * img = lv_image_create(lv_scr_act());
|
||||
lv_image_set_src(img, "./lvgl/examples/libs/ffmpeg/ffmpeg.png");
|
||||
lv_obj_center(img);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ try:
|
||||
#
|
||||
# Open an image from a file
|
||||
#
|
||||
img = lv.img(lv.scr_act())
|
||||
img.set_src("ffmpeg.png")
|
||||
img.center()
|
||||
image = lv.image(lv.scr_act())
|
||||
image.set_src("ffmpeg.png")
|
||||
image.center()
|
||||
except Exception as e:
|
||||
print(e)
|
||||
# TODO
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#define LV_ATTRIBUTE_MEM_ALIGN
|
||||
#endif
|
||||
|
||||
#ifndef LV_ATTRIBUTE_IMG_BULB_GIF
|
||||
#define LV_ATTRIBUTE_IMG_BULB_GIF
|
||||
#ifndef LV_ATTRIBUTE_IMAGE_BULB_GIF
|
||||
#define LV_ATTRIBUTE_IMAGE_BULB_GIF
|
||||
#endif
|
||||
|
||||
static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_BULB_GIF uint8_t img_blub_gif_map[] = {
|
||||
static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_BULB_GIF uint8_t img_blub_gif_map[] = {
|
||||
0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x3c, 0x00, 0x50, 0x00, 0xf7, 0x00, 0x00, 0xfa, 0xfb, 0xfb,
|
||||
0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xd9, 0xec, 0xfe, 0x1e, 0x93, 0xfe, 0x23, 0x95, 0xfd, 0x5f,
|
||||
0xb2, 0xff, 0x52, 0xac, 0xfe, 0xb1, 0xd8, 0xff, 0xce, 0xe7, 0xff, 0xa3, 0xd2, 0xff, 0x80, 0xc0,
|
||||
@@ -1118,7 +1118,7 @@ static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_BU
|
||||
0x34, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x84, 0x0b, 0x00, 0x3b,
|
||||
};
|
||||
|
||||
const lv_img_dsc_t img_bulb_gif = {
|
||||
const lv_image_dsc_t img_bulb_gif = {
|
||||
.header.always_zero = 0,
|
||||
.header.w = 0,
|
||||
.header.h = 0,
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
void lv_example_gif_1(void)
|
||||
{
|
||||
LV_IMG_DECLARE(img_bulb_gif);
|
||||
LV_IMAGE_DECLARE(img_bulb_gif);
|
||||
lv_obj_t * img;
|
||||
|
||||
img = lv_gif_create(lv_scr_act());
|
||||
|
||||
@@ -9,19 +9,19 @@ fs_driver.fs_register(fs_drv, 'S')
|
||||
#
|
||||
# Open a GIF image from a file and a variable
|
||||
#
|
||||
img_bulb_gif = lv.img_dsc_t(
|
||||
image_bulb_gif = lv.image_dsc_t(
|
||||
{
|
||||
"header": {"always_zero": 0, "w": 0, "h": 0, "cf": lv.COLOR_FORMAT.RAW},
|
||||
"data_size": 0,
|
||||
"data": img_bulb_gif_map,
|
||||
}
|
||||
)
|
||||
img1 = lv.gif(lv.scr_act())
|
||||
img1.set_src(img_bulb_gif)
|
||||
img1.align(lv.ALIGN.RIGHT_MID, -150, 0)
|
||||
image1 = lv.gif(lv.scr_act())
|
||||
image1.set_src(image_bulb_gif)
|
||||
image1.align(lv.ALIGN.RIGHT_MID, -150, 0)
|
||||
|
||||
img2 = lv.gif(lv.scr_act())
|
||||
image2 = lv.gif(lv.scr_act())
|
||||
# The File system is attached to letter 'S'
|
||||
|
||||
img2.set_src("S:bulb.gif")
|
||||
img2.align(lv.ALIGN.RIGHT_MID, -250, 0)
|
||||
image2.set_src("S:bulb.gif")
|
||||
image2.align(lv.ALIGN.RIGHT_MID, -250, 0)
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
#define LV_ATTRIBUTE_MEM_ALIGN
|
||||
#endif
|
||||
|
||||
#ifndef LV_ATTRIBUTE_IMG_PNG_DECODER_TEST
|
||||
#define LV_ATTRIBUTE_IMG_PNG_DECODER_TEST
|
||||
#ifndef LV_ATTRIBUTE_IMAGE_PNG_DECODER_TEST
|
||||
#define LV_ATTRIBUTE_IMAGE_PNG_DECODER_TEST
|
||||
#endif
|
||||
|
||||
const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_PNG_DECODER_TEST uint8_t img_wink_png_map[] = {
|
||||
const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_PNG_DECODER_TEST uint8_t img_wink_png_map[] = {
|
||||
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
|
||||
0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x32, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1e, 0x3f, 0x88,
|
||||
0xb1, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
|
||||
@@ -336,7 +336,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_PNG_DECOD
|
||||
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
|
||||
};
|
||||
|
||||
const lv_img_dsc_t img_wink_png = {
|
||||
const lv_image_dsc_t img_wink_png = {
|
||||
.header.always_zero = 0,
|
||||
.header.w = 50,
|
||||
.header.h = 50,
|
||||
|
||||
@@ -325,13 +325,13 @@ img_wink_png_map = bytes([
|
||||
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
|
||||
])
|
||||
'''
|
||||
const lv_img_dsc_t img_wink_png = {
|
||||
const lv_image_dsc_t image_wink_png = {
|
||||
.header.always_zero = 0,
|
||||
.header.w = 50,
|
||||
.header.h = 50,
|
||||
.data_size = 5158,
|
||||
.header.cf = LV_IMG_CF_RAW_ALPHA,
|
||||
.data = img_wink_png_map,
|
||||
.header.cf = LV_IMAGE_CF_RAW_ALPHA,
|
||||
.data = image_wink_png_map,
|
||||
};
|
||||
|
||||
'''
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
*/
|
||||
void lv_example_png_1(void)
|
||||
{
|
||||
LV_IMG_DECLARE(img_wink_png);
|
||||
LV_IMAGE_DECLARE(img_wink_png);
|
||||
lv_obj_t * img;
|
||||
|
||||
img = lv_img_create(lv_scr_act());
|
||||
lv_img_set_src(img, &img_wink_png);
|
||||
img = lv_image_create(lv_scr_act());
|
||||
lv_image_set_src(img, &img_wink_png);
|
||||
lv_obj_align(img, LV_ALIGN_LEFT_MID, 20, 0);
|
||||
|
||||
img = lv_img_create(lv_scr_act());
|
||||
img = lv_image_create(lv_scr_act());
|
||||
/* Assuming a File system is attached to letter 'A'
|
||||
* E.g. set LV_USE_FS_STDIO 'A' in lv_conf.h */
|
||||
lv_img_set_src(img, "A:lvgl/examples/libs/png/wink.png");
|
||||
lv_image_set_src(img, "A:lvgl/examples/libs/png/wink.png");
|
||||
lv_obj_align(img, LV_ALIGN_RIGHT_MID, -20, 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,16 +3,16 @@ import lvgl as lv
|
||||
import display_driver
|
||||
from img_wink_png import img_wink_png_map
|
||||
|
||||
img_wink_png = lv.img_dsc_t(
|
||||
image_wink_png = lv.image_dsc_t(
|
||||
{
|
||||
"header": {"always_zero": 0, "w": 50, "h": 50, "cf": lv.COLOR_FORMAT.RAW_ALPHA},
|
||||
"data_size": 5158,
|
||||
"data": img_wink_png_map,
|
||||
}
|
||||
)
|
||||
img1 = lv.img(lv.scr_act())
|
||||
img1.set_src(img_wink_png)
|
||||
img1.align(lv.ALIGN.RIGHT_MID, -250, 0)
|
||||
image1 = lv.image(lv.scr_act())
|
||||
image1.set_src(image_wink_png)
|
||||
image1.align(lv.ALIGN.RIGHT_MID, -250, 0)
|
||||
|
||||
# Create an image from the png file
|
||||
try:
|
||||
@@ -22,11 +22,11 @@ except:
|
||||
print("Could not find wink.png")
|
||||
sys.exit()
|
||||
|
||||
wink_argb = lv.img_dsc_t({
|
||||
wink_argb = lv.image_dsc_t({
|
||||
'data_size': len(png_data),
|
||||
'data': png_data
|
||||
})
|
||||
|
||||
img2 = lv.img(lv.scr_act())
|
||||
img2.set_src(wink_argb)
|
||||
img2.align(lv.ALIGN.RIGHT_MID, -150, 0)
|
||||
image2 = lv.image(lv.scr_act())
|
||||
image2.set_src(wink_argb)
|
||||
image2.align(lv.ALIGN.RIGHT_MID, -150, 0)
|
||||
|
||||
@@ -8,10 +8,10 @@ void lv_example_sjpg_1(void)
|
||||
{
|
||||
lv_obj_t * wp;
|
||||
|
||||
wp = lv_img_create(lv_scr_act());
|
||||
wp = lv_image_create(lv_scr_act());
|
||||
/* Assuming a File system is attached to letter 'A'
|
||||
* E.g. set LV_USE_FS_STDIO 'A' in lv_conf.h */
|
||||
lv_img_set_src(wp, "A:lvgl/examples/libs/sjpg/small_image.sjpg");
|
||||
lv_image_set_src(wp, "A:lvgl/examples/libs/sjpg/small_image.sjpg");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,7 +6,7 @@ import fs_driver
|
||||
fs_drv = lv.fs_drv_t()
|
||||
fs_driver.fs_register(fs_drv, 'S')
|
||||
|
||||
wp = lv.img(lv.scr_act())
|
||||
wp = lv.image(lv.scr_act())
|
||||
# The File system is attached to letter 'S'
|
||||
|
||||
wp.set_src("S:small_image.sjpg")
|
||||
|
||||
Reference in New Issue
Block a user