From 654deb50a16cfcdfe8f0c4c4ffd6c2f48b8ac021 Mon Sep 17 00:00:00 2001 From: "Dennis Real (DL9CAT)" Date: Thu, 10 Oct 2019 18:20:04 +0200 Subject: [PATCH] merged upstream, compiles with 8px font --- plot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/plot.c b/plot.c index 168c682..af409a3 100644 --- a/plot.c +++ b/plot.c @@ -1562,19 +1562,22 @@ cell_draw_marker_info(int m, int n, int w, int h) if (electrical_delay != 0) { // draw electrical delay + + // fixme: adapt positions for 8px font + int xpos = 21; - int ypos = 1 + (j/2)*7; + int ypos = 1 + (j/2)*8; xpos -= m * CELLWIDTH -CELLOFFSETX; ypos -= n * CELLHEIGHT; chsnprintf(buf, sizeof buf, "Edelay"); - cell_drawstring_5x7(w, h, buf, xpos, ypos, 0xffff); - xpos += 7 * 5; + cell_drawstring_8x8(w, h, buf, xpos, ypos, 0xffff, FALSE); + xpos += 8 * 8; int n = string_value_with_prefix(buf, sizeof buf, electrical_delay * 1e-12, 's'); - cell_drawstring_5x7(w, h, buf, xpos, ypos, 0xffff); - xpos += n * 5 + 5; + cell_drawstring_8x8(w, h, buf, xpos, ypos, 0xffff, FALSE); + xpos += n * 8 + 8; float light_speed_ps = 299792458e-12; //(m/ps) string_value_with_prefix(buf, sizeof buf, electrical_delay * light_speed_ps * velocity_factor / 100.0, 'm'); - cell_drawstring_5x7(w, h, buf, xpos, ypos, 0xffff); + cell_drawstring_8x8(w, h, buf, xpos, ypos, 0xffff, FALSE); } // draw marker frequency