add single trace command, fix failure on changing polar to rect

This commit is contained in:
TT 2017-01-01 22:54:12 +09:00
parent 74cfdb93a3
commit ef63476219
2 changed files with 20 additions and 2 deletions

4
main.c
View file

@ -935,9 +935,11 @@ void set_trace_type(int t, int type)
if (polar) if (polar)
force = TRUE; force = TRUE;
} }
if (force) if (force) {
plot_into_index(measured);
//force_draw_cells(); //force_draw_cells();
force_set_markmap(); force_set_markmap();
}
} }
void set_trace_channel(int t, int channel) void set_trace_channel(int t, int channel)

18
ui.c
View file

@ -444,6 +444,21 @@ choose_active_marker(void)
active_marker = -1; active_marker = -1;
} }
static void
menu_single_trace_cb(int item)
{
(void)item;
int t;
for (t = 0; t < 4; t++)
if (uistat.current_trace != t) {
trace[t].enabled = FALSE;
}
ui_mode_normal();
redraw();
force_set_markmap();
draw_cell_all();
}
static void static void
menu_scale_cb(int item) menu_scale_cb(int item)
{ {
@ -538,7 +553,7 @@ const menuitem_t menu_format[] = {
{ MT_CALLBACK, "SMITH", menu_format_cb }, { MT_CALLBACK, "SMITH", menu_format_cb },
{ MT_CALLBACK, "ADMIT", menu_format_cb }, { MT_CALLBACK, "ADMIT", menu_format_cb },
{ MT_CALLBACK, "POLAR", menu_format_cb }, { MT_CALLBACK, "POLAR", menu_format_cb },
{ MT_SUBMENU, "NEXT", menu_format2 }, { MT_SUBMENU, "MORE", menu_format2 },
//{ MT_CALLBACK, "LINEAR", menu_format_cb }, //{ MT_CALLBACK, "LINEAR", menu_format_cb },
//{ MT_CALLBACK, "SWR", menu_format_cb }, //{ MT_CALLBACK, "SWR", menu_format_cb },
{ MT_CANCEL, "BACK", NULL }, { MT_CANCEL, "BACK", NULL },
@ -553,6 +568,7 @@ const menuitem_t menu_channel[] = {
}; };
const menuitem_t menu_display[] = { const menuitem_t menu_display[] = {
{ MT_CALLBACK, "SGL TRC", menu_single_trace_cb },
{ MT_SUBMENU, "TRACE", menu_trace }, { MT_SUBMENU, "TRACE", menu_trace },
{ MT_SUBMENU, "FORMAT", menu_format }, { MT_SUBMENU, "FORMAT", menu_format },
{ MT_CALLBACK, "SCALE", menu_scale_cb }, { MT_CALLBACK, "SCALE", menu_scale_cb },