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

Always update marker info

Browse source
This commit is contained in:
DiSlord 2020-03-09 22:28:05 +03:00
parent 04fb661b1a
commit eebb625b9d
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nanovna.h
View file

@ -261,7 +261,7 @@ void redraw_frame(void);
//void redraw_all(void); //void redraw_all(void);
void request_to_draw_cells_behind_menu(void); void request_to_draw_cells_behind_menu(void);
void request_to_draw_cells_behind_numeric_input(void); void request_to_draw_cells_behind_numeric_input(void);
void redraw_marker(int marker, int update_info); void redraw_marker(int marker);
void plot_into_index(float measured[2][POINTS_COUNT][2]); void plot_into_index(float measured[2][POINTS_COUNT][2]);
void force_set_markmap(void); void force_set_markmap(void);
void draw_frequencies(void); void draw_frequencies(void);

5
plot.c
View file

@ -1387,7 +1387,7 @@ draw_all(bool flush)
} }
void void
redraw_marker(int marker, int update_info) redraw_marker(int marker)
{ {
if (marker < 0) if (marker < 0)
return; return;
@ -1395,8 +1395,7 @@ redraw_marker(int marker, int update_info)
markmap_marker(marker); markmap_marker(marker);
// mark cells on marker info // mark cells on marker info
if (update_info) markmap_upperarea();
markmap_upperarea();
draw_all_cells(TRUE); draw_all_cells(TRUE);
} }

18
ui.c
View file

@ -767,7 +767,7 @@ menu_marker_search_cb(int item, uint8_t data)
if (i != -1) if (i != -1)
markers[active_marker].index = i; markers[active_marker].index = i;
draw_menu(); draw_menu();
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
select_lever_mode(LM_SEARCH); select_lever_mode(LM_SEARCH);
} }
@ -776,7 +776,7 @@ menu_marker_smith_cb(int item, uint8_t data)
{ {
(void)item; (void)item;
marker_smith_format = data; marker_smith_format = data;
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
draw_menu(); draw_menu();
} }
@ -822,7 +822,7 @@ menu_marker_sel_cb(int item, uint8_t data)
} else if (item == 5) { /* marker delta */ } else if (item == 5) { /* marker delta */
uistat.marker_delta = !uistat.marker_delta; uistat.marker_delta = !uistat.marker_delta;
} }
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
draw_menu(); draw_menu();
} }
@ -1639,18 +1639,18 @@ lever_move_marker(int status)
if ((status & EVT_DOWN) && markers[active_marker].index > 0) { if ((status & EVT_DOWN) && markers[active_marker].index > 0) {
markers[active_marker].index--; markers[active_marker].index--;
markers[active_marker].frequency = frequencies[markers[active_marker].index]; markers[active_marker].frequency = frequencies[markers[active_marker].index];
redraw_marker(active_marker, FALSE); redraw_marker(active_marker);
} }
if ((status & EVT_UP) && markers[active_marker].index < 100) { if ((status & EVT_UP) && markers[active_marker].index < 100) {
markers[active_marker].index++; markers[active_marker].index++;
markers[active_marker].frequency = frequencies[markers[active_marker].index]; markers[active_marker].frequency = frequencies[markers[active_marker].index];
redraw_marker(active_marker, FALSE); redraw_marker(active_marker);
} }
} }
status = btn_wait_release(); status = btn_wait_release();
} while (status != 0); } while (status != 0);
if (active_marker >= 0) if (active_marker >= 0)
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
} }
static void static void
@ -1664,7 +1664,7 @@ lever_search_marker(int status)
i = marker_search_right(markers[active_marker].index); i = marker_search_right(markers[active_marker].index);
if (i != -1) if (i != -1)
markers[active_marker].index = i; markers[active_marker].index = i;
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
} }
} }
@ -2067,7 +2067,7 @@ drag_marker(int t, int m)
if (index >= 0) { if (index >= 0) {
markers[m].index = index; markers[m].index = index;
markers[m].frequency = frequencies[index]; markers[m].frequency = frequencies[index];
redraw_marker(m, TRUE); redraw_marker(m);
} }
} while(touch_check()!=EVT_TOUCH_RELEASED); } while(touch_check()!=EVT_TOUCH_RELEASED);
} }
@ -2097,7 +2097,7 @@ touch_pickup_marker(void)
if (active_marker != m) { if (active_marker != m) {
previous_marker = active_marker; previous_marker = active_marker;
active_marker = m; active_marker = m;
redraw_marker(active_marker, TRUE); redraw_marker(active_marker);
} }
// select trace // select trace
uistat.current_trace = t; uistat.current_trace = t;