Commit f4cfeb08 authored by winckel's avatar winckel

Created a function to check if a message should be displayed.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4326 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 6126c0ad
...@@ -49,7 +49,7 @@ int ui_init_filters(int reset, int clear_ids) ...@@ -49,7 +49,7 @@ int ui_init_filters(int reset, int clear_ids)
ui_init_filter (&ui_filters.origin_tasks, reset, clear_ids, "origin_tasks"); ui_init_filter (&ui_filters.origin_tasks, reset, clear_ids, "origin_tasks");
ui_init_filter (&ui_filters.destination_tasks, reset, clear_ids, "destination_tasks"); ui_init_filter (&ui_filters.destination_tasks, reset, clear_ids, "destination_tasks");
ui_destroy_filter_menus(); ui_destroy_filter_menus ();
return (RC_OK); return (RC_OK);
} }
...@@ -69,6 +69,21 @@ static int ui_search_name(ui_filter_t *filter, char *name) ...@@ -69,6 +69,21 @@ static int ui_search_name(ui_filter_t *filter, char *name)
return (item); return (item);
} }
static int ui_search_id(ui_filter_t *filter, uint32_t value)
{
int item;
for (item = 0; item < filter->used; item++)
{
if (filter->items[item].id == value)
{
return (item);
}
}
return (item);
}
static int ui_filter_add(ui_filter_t *filter, uint32_t value, char *name) static int ui_filter_add(ui_filter_t *filter, uint32_t value, char *name)
{ {
int item = ui_search_name (filter, name); int item = ui_search_name (filter, name);
...@@ -84,7 +99,7 @@ static int ui_filter_add(ui_filter_t *filter, uint32_t value, char *name) ...@@ -84,7 +99,7 @@ static int ui_filter_add(ui_filter_t *filter, uint32_t value, char *name)
if (item >= filter->used) if (item >= filter->used)
{ {
/* New entry */ /* New entry */
strncpy(filter->items[item].name, name, SIGNAL_NAME_LENGTH); strncpy (filter->items[item].name, name, SIGNAL_NAME_LENGTH);
filter->items[item].enabled = TRUE; filter->items[item].enabled = TRUE;
filter->used++; filter->used++;
...@@ -115,6 +130,28 @@ void ui_filters_add(ui_filter_e filter, uint32_t value, char *name) ...@@ -115,6 +130,28 @@ void ui_filters_add(ui_filter_e filter, uint32_t value, char *name)
} }
} }
static gboolean ui_item_enabled(ui_filter_t *filter, uint32_t value)
{
int item = ui_search_id (filter, value);
if (item < filter->used)
{
return (filter->items[item].enabled ? TRUE : FALSE);
}
return (FALSE);
}
gboolean ui_filters_message_enabled(uint32_t message, uint32_t origin_task, uint32_t destination_task)
{
gboolean result;
result = ui_item_enabled (&ui_filters.messages, message) && ui_item_enabled (&ui_filters.origin_tasks, origin_task)
&& ui_item_enabled (&ui_filters.destination_tasks, destination_task);
return result;
}
static void write_filter(FILE *filter_file, ui_filter_t *filter) static void write_filter(FILE *filter_file, ui_filter_t *filter)
{ {
int item; int item;
...@@ -122,7 +159,7 @@ static void write_filter(FILE *filter_file, ui_filter_t *filter) ...@@ -122,7 +159,7 @@ static void write_filter(FILE *filter_file, ui_filter_t *filter)
fprintf (filter_file, " <%s>\n", filter->name); fprintf (filter_file, " <%s>\n", filter->name);
for (item = 0; item < filter->used; item++) for (item = 0; item < filter->used; item++)
{ {
fprintf (filter_file, " %s=\"%d\"\n", filter->items[item].name, filter->items[item].enabled ? 1 :0); fprintf (filter_file, " %s=\"%d\"\n", filter->items[item].name, filter->items[item].enabled ? 1 : 0);
} }
fprintf (filter_file, " </%s>\n", filter->name); fprintf (filter_file, " </%s>\n", filter->name);
} }
......
...@@ -38,6 +38,8 @@ int ui_init_filters(int reset, int clear_ids); ...@@ -38,6 +38,8 @@ int ui_init_filters(int reset, int clear_ids);
void ui_filters_add(ui_filter_e filter, uint32_t value, char *name); void ui_filters_add(ui_filter_e filter, uint32_t value, char *name);
gboolean ui_filters_message_enabled(uint32_t message, uint32_t origin_task, uint32_t destination_task);
int ui_write_filters_file(char *file_name); int ui_write_filters_file(char *file_name);
void ui_destroy_filter_menus(void); void ui_destroy_filter_menus(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment