diff --git a/c/libs/Fonts/font40.c b/c/libs/Fonts/font40.c new file mode 100644 index 0000000..24168d7 --- /dev/null +++ b/c/libs/Fonts/font40.c @@ -0,0 +1,11 @@ +// +// Created by steven on 11/22/2024. +// +#include "fonts.h" +const unsigned char Font40_Table[] = {}; + +sFONT Font40 = { + Font40_Table, + 22, /* Width */ + 40, /* Height */ +}; \ No newline at end of file diff --git a/c/libs/Fonts/font56.c b/c/libs/Fonts/font56.c new file mode 100644 index 0000000..025738a --- /dev/null +++ b/c/libs/Fonts/font56.c @@ -0,0 +1,11 @@ +// +// Created by steven on 11/22/2024. +// +#include "fonts.h" +const unsigned char Font56_Table[] = {}; + +sFONT Font56 = { + Font56_Table, + 30, /* Width */ + 56, /* Height */ +}; \ No newline at end of file diff --git a/c/libs/Fonts/font36.c b/c/libs/Fonts/font65.c similarity index 99% rename from c/libs/Fonts/font36.c rename to c/libs/Fonts/font65.c index 9244ab8..7e632bc 100644 --- a/c/libs/Fonts/font36.c +++ b/c/libs/Fonts/font65.c @@ -1,6 +1,6 @@ #include "fonts.h" -const unsigned char Font36_Table[] = { +const unsigned char Font65_Table[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // Character 0x00 (0) 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // Character 0x01 (1) 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x07,0x80,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x7E,0x0F,0xC0,0x00,0x00,0x3C,0x07,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // Character 0x02 (2) @@ -99,8 +99,8 @@ const unsigned char Font36_Table[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // Character 0x5F (95) }; -sFONT Font36 = { - Font36_Table, +sFONT Font65 = { + Font65_Table, 36, /* Width */ 65, /* Height */ }; \ No newline at end of file diff --git a/c/libs/Fonts/fonts.h b/c/libs/Fonts/fonts.h index 8462b9f..e38bbca 100644 --- a/c/libs/Fonts/fonts.h +++ b/c/libs/Fonts/fonts.h @@ -39,7 +39,6 @@ #ifndef __FONTS_H #define __FONTS_H -/*最大字体微软雅黑24 (32x41) */ #define MAX_HEIGHT_FONT 65 #define MAX_WIDTH_FONT 36 #define OFFSET_BITMAP @@ -60,26 +59,9 @@ typedef struct _tFont } sFONT; - -//GB2312 -// typedef struct // 汉字字模数据结构 -// { -// const char index[2]; // 汉字内码索引 -// const char matrix[MAX_HEIGHT_FONT*MAX_WIDTH_FONT/8+2]; // 点阵码数据 -// }CH_CN; - - -//typedef struct -//{ -// const CH_CN *table; -// uint16_t size; -// uint16_t ASCII_Width; -// uint16_t Width; -// uint16_t Height; - -//}cFONT; - -extern sFONT Font36; +extern sFONT Font65; +extern sFONT Font56; +extern sFONT Font40; extern sFONT Font24; extern sFONT Font20; extern sFONT Font16; diff --git a/c/pic/nums/0.bmp b/c/pic/nums/0.bmp deleted file mode 100644 index a472302..0000000 Binary files a/c/pic/nums/0.bmp and /dev/null differ diff --git a/c/pic/nums/1.bmp b/c/pic/nums/1.bmp deleted file mode 100644 index 6362772..0000000 Binary files a/c/pic/nums/1.bmp and /dev/null differ diff --git a/c/pic/nums/2.bmp b/c/pic/nums/2.bmp deleted file mode 100644 index ec37825..0000000 Binary files a/c/pic/nums/2.bmp and /dev/null differ diff --git a/c/pic/nums/3.bmp b/c/pic/nums/3.bmp deleted file mode 100644 index 3b276d5..0000000 Binary files a/c/pic/nums/3.bmp and /dev/null differ diff --git a/c/pic/nums/4.bmp b/c/pic/nums/4.bmp deleted file mode 100644 index 88e54fd..0000000 Binary files a/c/pic/nums/4.bmp and /dev/null differ diff --git a/c/pic/nums/5.bmp b/c/pic/nums/5.bmp deleted file mode 100644 index 5605930..0000000 Binary files a/c/pic/nums/5.bmp and /dev/null differ diff --git a/c/pic/nums/6.bmp b/c/pic/nums/6.bmp deleted file mode 100644 index 253bda1..0000000 Binary files a/c/pic/nums/6.bmp and /dev/null differ diff --git a/c/pic/nums/7.bmp b/c/pic/nums/7.bmp deleted file mode 100644 index 83c20c5..0000000 Binary files a/c/pic/nums/7.bmp and /dev/null differ diff --git a/c/pic/nums/8.bmp b/c/pic/nums/8.bmp deleted file mode 100644 index 73cb479..0000000 Binary files a/c/pic/nums/8.bmp and /dev/null differ diff --git a/c/pic/nums/9.bmp b/c/pic/nums/9.bmp deleted file mode 100644 index 3c3ee37..0000000 Binary files a/c/pic/nums/9.bmp and /dev/null differ diff --git a/c/pic/nums/template22x40.png b/c/pic/nums/template22x40.png new file mode 100644 index 0000000..0c5eab3 Binary files /dev/null and b/c/pic/nums/template22x40.png differ diff --git a/c/pic/nums/template22x40.psd b/c/pic/nums/template22x40.psd new file mode 100644 index 0000000..9586096 Binary files /dev/null and b/c/pic/nums/template22x40.psd differ diff --git a/c/pic/nums/template30x56.png b/c/pic/nums/template30x56.png new file mode 100644 index 0000000..2991eb2 Binary files /dev/null and b/c/pic/nums/template30x56.png differ diff --git a/c/pic/nums/template30x56.psd b/c/pic/nums/template30x56.psd new file mode 100644 index 0000000..b66c9f6 Binary files /dev/null and b/c/pic/nums/template30x56.psd differ diff --git a/c/src/p2fa.c b/c/src/p2fa.c index b0c15e3..7c4ed95 100644 --- a/c/src/p2fa.c +++ b/c/src/p2fa.c @@ -54,7 +54,14 @@ void code(UWORD *blackImage, char* confName) { GoString confStr = {confName, strlen(confName)}; const char *code = getCode(confStr); - Paint_DrawString(5, 20, code, &Font36, WHITE, BLACK); + int codeLength = strlen(code); + if (codeLength <= 6) { + Paint_DrawString(5, 20, code, &Font65, WHITE, BLACK); + } else if (codeLength > 6) { + Paint_DrawString(5, 20, code, &Font56, WHITE, BLACK); + } else if (codeLength > 8) { + Paint_DrawString(5, 20, code, &Font40, WHITE, BLACK); + } Paint_DrawString(8, 5, confName, &Font12, WHITE, BLACK); Paint_DrawRectangle(10, 114, 240, 94, BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);