Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix frequency_string_short and its usage #20

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Fix frequency_string_short and its usage #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions plot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void update_grid(void)
fspan = -frequency1;
fstart = frequency0 - fspan/2;
}

while (gdigit > 100) {
grid = 5 * gdigit;
if (fspan / grid >= 4)
Expand Down Expand Up @@ -229,7 +229,7 @@ smith_grid2(int x, int y, float scale)
// offset to center
x -= P_CENTER_X;
y -= P_CENTER_Y;

// outer circle
d = circle_inout(x, y, P_RADIUS);
if (d < 0)
Expand Down Expand Up @@ -325,7 +325,7 @@ smith_grid3(int x, int y)
// offset to center
x -= P_CENTER_X;
y -= P_CENTER_Y;

// outer circle
d = circle_inout(x, y, P_RADIUS);
if (d < 0)
Expand Down Expand Up @@ -1595,7 +1595,7 @@ cell_draw_marker_info(int x0, int y0)
cell_drawstring(buf, xpos, ypos);
xpos += 3*FONT_WIDTH + 3;
//trace_get_info(t, buf, sizeof buf);
int32_t freq = freqAt(markers[mk].index);
freqHz_t freq = freqAt(markers[mk].index);
if (uistat.marker_delta && mk != active_marker) {
freq -= freqAt(markers[active_marker].index);
frequency_string_short(buf, sizeof buf, freq, S_DELTA[0]);
Expand Down Expand Up @@ -1691,6 +1691,11 @@ cell_draw_marker_info(int x0, int y0)
}
}

/* Prints a full frequency:
* 500.000 Khz
* 10.000 000 Mhz
* 3000.000 000 Mhz
*/
void
frequency_string(char *buf, size_t len, freqHz_t freq)
{
Expand All @@ -1713,6 +1718,11 @@ frequency_string(char *buf, size_t len, freqHz_t freq)
}
}

/* Prints a shorter/compacter frequency:
* 500.000KHz
* 10.000000Mhz
* 3000.0000Mhz
*/
void
frequency_string_short(char *b, size_t len, freqHz_t freq, char prefix)
{
Expand All @@ -1732,12 +1742,28 @@ frequency_string_short(char *b, size_t len, freqHz_t freq, char prefix)
chsnprintf(buf, len, "%d.%03dkHz",
(int)(freq / 1000),
(int)(freq % 1000));
} else {
chsnprintf(buf, len, "%d.%06d",
(int)(freq / 1000000),
(int)(freq % 1000000));
strcpy(b+9, "MHz");
}
size_t wr = chsnprintf(buf, len, "%d.%06d",
(int)(freq / 1000000),
(int)(freq % 1000000));
// Note that wr is either:
// 8: 1 - 9 Mhz
// 9: 10 - 99 Mhz
// 10: 100 - 999 Mhz
// 11: 1000 - 4400 Mhz
// Do not add 'Mhz' if it would overwrite all characters
if (len < 4)
return;
// Overwrite last digits, if >= 10Mhz (aka 9 digits)
if (wr > 9) {
wr = 9;
}
// Make sure we have space left for 'Mhz'
if (wr > len - 4) {
wr = len - 4;
}

strcpy(buf + wr, "MHz");
}

void padString(char* s, int len, char c = ' ') {
Expand Down