X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdraw%2Flco-test.c;h=bb45e187cff14a4c2bec6bd384cbabc8161c89fb;hb=99b9f6386018ad201c5defc595b22bf6d5d825fe;hp=02d2b5decf0a4f926efad3ed0ccf5c9096da2f96;hpb=c2a21c0f6a770f989833d0bd35761e17f9843353;p=fw%2Faltos diff --git a/src/draw/lco-test.c b/src/draw/lco-test.c index 02d2b5de..bb45e187 100644 --- a/src/draw/lco-test.c +++ b/src/draw/lco-test.c @@ -21,14 +21,14 @@ #define PASS_KEYS #include "test-frame.c" -#define BIG_FONT FrutigerLT_Roman_64_font -#define VOLT_FONT FrutigerLT_Roman_64_font -#define SMALL_FONT NotoMono_12_font -#define TINY_FONT NotoMono_10_font +#define BIG_FONT BitstreamVeraSans_Roman_58_font +#define VOLT_FONT BitstreamVeraSans_Roman_58_font +#define SMALL_FONT BitstreamVeraSans_Roman_12_font +#define TINY_FONT BitstreamVeraSans_Roman_12_font #define LOGO_FONT BenguiatGothicStd_Bold_26_font #define LABEL_Y (int16_t) (SMALL_FONT.ascent) -#define VALUE_Y (int16_t) (LABEL_Y + BIG_FONT.ascent) +#define VALUE_Y (int16_t) (LABEL_Y + BIG_FONT.ascent + 3) #define BOX_X 2 #define PAD_X 90 #define BOX_LABEL_X 30 @@ -36,6 +36,12 @@ #define RSSI_LABEL_X 15 #define PAD_LABEL_X 95 #define SEP_X (PAD_X - 10) +#define SCAN_X (WIDTH - 100) / 2 +#define SCAN_Y 49 +#define SCAN_HEIGHT 4 +#define FOUND_Y 63 +#define FOUND_WIDTH 21 +#define MAX_VALID (WIDTH / FOUND_WIDTH) static int box_number = 1; static int pad_number = 1; @@ -80,13 +86,6 @@ static const struct ao_transform logo_transform = { .y_scale = 48, .y_off = 0, }; -#define SCAN_X (WIDTH - 100) / 2 -#define SCAN_Y 51 -#define SCAN_HEIGHT 4 -#define FOUND_Y 64 -#define FOUND_WIDTH 14 -#define MAX_VALID (WIDTH / FOUND_WIDTH) - static const struct ao_transform bowtie_transform = { .x_scale = 1, .x_off = 50, .y_scale = 1, .y_off = 20,