ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: workaround overwrite issue

Browse source
This commit is contained in:
Dennis Real (DL9CAT) 2019-10-13 19:44:04 +02:00
parent d007b864bf
commit 0c5d88f3d9
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plot.c
View file

@ -1539,7 +1539,7 @@ cell_draw_marker_info(int m, int n, int w, int h)
continue; continue;
int xpos = 1 + (j%2)*160; int xpos = 1 + (j%2)*160;
int ypos = 1 + (j/2)*10; int ypos = 1 + (j/2)*8;
xpos -= m * CELLWIDTH - CELLOFFSETX; xpos -= m * CELLWIDTH - CELLOFFSETX;
ypos -= n * CELLHEIGHT; ypos -= n * CELLHEIGHT;
@ -1560,7 +1560,7 @@ cell_draw_marker_info(int m, int n, int w, int h)
// draw electrical delay // draw electrical delay
int xpos = 1; int xpos = 1;
int ypos = 1 + (j/2)*10; int ypos = 1 + (j/2)*8;
uint16_t slen = 0; uint16_t slen = 0;
xpos -= m * CELLWIDTH -CELLOFFSETX; xpos -= m * CELLWIDTH -CELLOFFSETX;
@ -1578,7 +1578,7 @@ cell_draw_marker_info(int m, int n, int w, int h)
// draw marker frequency // draw marker frequency
int xpos = 160; int xpos = 160;
int ypos = 1 + (j/2)*10; int ypos = 1 + (j/2)*8;
xpos -= m * CELLWIDTH - CELLOFFSETX; xpos -= m * CELLWIDTH - CELLOFFSETX;
ypos -= n * CELLHEIGHT; ypos -= n * CELLHEIGHT;
@ -1603,15 +1603,12 @@ cell_draw_marker_info(int m, int n, int w, int h)
int idx0 = markers[previous_marker].index; int idx0 = markers[previous_marker].index;
xpos = 160; xpos = 160;
xpos -= m * CELLWIDTH - CELLOFFSETX; xpos -= m * CELLWIDTH - CELLOFFSETX;
ypos += 10; ypos += 8;
chsnprintf(buf, sizeof buf, "%s%d:", S_DIAMOND, previous_marker+1); chsnprintf(buf, sizeof buf, "%s%d:", S_DIAMOND, previous_marker+1);
strwidthpx = cell_drawstring_8x8(w, h, buf, xpos, ypos, 0xffff, FALSE); strwidthpx = cell_drawstring_8x8(w, h, buf, xpos, ypos, 0xffff, FALSE);
xpos += strwidthpx + 4; xpos += strwidthpx + 4;
frequency_string(buf, sizeof buf, frequencies[idx] - frequencies[idx0]); frequency_string(buf, sizeof buf, frequencies[idx] - frequencies[idx0]);
cell_drawstring_8x8_var(w, h, buf, xpos, ypos, 0xffff, FALSE); cell_drawstring_8x8_var(w, h, buf, xpos, ypos, 0xffff, FALSE);
} }