- itti_analyzer v0.2:
* Moved all GUI calls to main thread * Refine socket interface * Added origin/destination task id on message display list git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4258 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -5,21 +5,16 @@
|
||||
|
||||
#include "rc.h"
|
||||
|
||||
#include "buffers.h"
|
||||
|
||||
#include "ui_main_screen.h"
|
||||
#include "ui_tree_view.h"
|
||||
#include "ui_callbacks.h"
|
||||
|
||||
#include "ui_signal_dissect_view.h"
|
||||
|
||||
enum
|
||||
{
|
||||
COL_MSG_NUM = 0,
|
||||
COL_SIGNAL,
|
||||
NUM_COLS
|
||||
} ;
|
||||
|
||||
static void
|
||||
init_list(GtkWidget *list)
|
||||
ui_tree_view_init_list(GtkWidget *list)
|
||||
{
|
||||
GtkCellRenderer *renderer;
|
||||
GtkTreeViewColumn *column;
|
||||
@@ -27,22 +22,40 @@ init_list(GtkWidget *list)
|
||||
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes(
|
||||
"Message Number", renderer, "text", COL_MSG_NUM, NULL);
|
||||
"MN", renderer, "text", COL_MSG_NUM, NULL);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
||||
|
||||
column = gtk_tree_view_column_new_with_attributes(
|
||||
"Signal", renderer, "text", COL_SIGNAL, NULL);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
||||
|
||||
store = gtk_list_store_new(NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
|
||||
column = gtk_tree_view_column_new_with_attributes(
|
||||
"From", renderer, "text", COL_FROM_TASK, NULL);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
||||
|
||||
column = gtk_tree_view_column_new_with_attributes(
|
||||
"To", renderer, "text", COL_TO_TASK, NULL);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
||||
|
||||
store = gtk_list_store_new(NUM_COLS,
|
||||
G_TYPE_STRING,
|
||||
G_TYPE_STRING,
|
||||
G_TYPE_STRING,
|
||||
G_TYPE_STRING,
|
||||
/* HACK: add a reference to the buffer here
|
||||
* to avoid maintining multiple lists.
|
||||
* The reference is not displayed
|
||||
*/
|
||||
G_TYPE_POINTER);
|
||||
|
||||
gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store));
|
||||
|
||||
g_object_unref(store);
|
||||
}
|
||||
|
||||
static void
|
||||
add_to_list(GtkWidget *list, const gchar *message_number, const gchar *signal_name)
|
||||
static void ui_tree_view_add_to_list(GtkWidget *list, const gchar *message_number,
|
||||
const gchar *signal_name, const char *origin_task,
|
||||
const char *to_task, gpointer buffer)
|
||||
{
|
||||
GtkListStore *store;
|
||||
GtkTreeIter iter;
|
||||
@@ -51,8 +64,15 @@ add_to_list(GtkWidget *list, const gchar *message_number, const gchar *signal_na
|
||||
(GTK_TREE_VIEW(list)));
|
||||
|
||||
gtk_list_store_append(store, &iter);
|
||||
gtk_list_store_set(store, &iter, COL_MSG_NUM, message_number,
|
||||
COL_SIGNAL, signal_name, -1);
|
||||
gtk_list_store_set(store, &iter,
|
||||
/* Columns */
|
||||
COL_MSG_NUM , message_number,
|
||||
COL_SIGNAL , signal_name,
|
||||
COL_FROM_TASK , origin_task,
|
||||
COL_TO_TASK , to_task,
|
||||
COL_BUFFER , buffer,
|
||||
/* End of columns */
|
||||
-1);
|
||||
}
|
||||
|
||||
void ui_tree_view_destroy_list(GtkWidget *list)
|
||||
@@ -92,7 +112,7 @@ int ui_tree_view_create(GtkWidget *window, GtkWidget *vbox)
|
||||
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
|
||||
ui_main_data.signalslist);
|
||||
|
||||
init_list(ui_main_data.signalslist);
|
||||
ui_tree_view_init_list(ui_main_data.signalslist);
|
||||
|
||||
// gtk_widget_get_size_request(GTK_WIDGET(ui_main_data.signalslist), &width, NULL);
|
||||
gtk_widget_set_size_request(GTK_WIDGET(scrolled_window), 350, -1);
|
||||
@@ -110,13 +130,15 @@ int ui_tree_view_create(GtkWidget *window, GtkWidget *vbox)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ui_tree_view_new_signal_ind(const uint32_t message_number, const char *signal_name)
|
||||
int ui_tree_view_new_signal_ind(const uint32_t message_number, const char *signal_name,
|
||||
const char *origin_task, const char *to_task, gpointer buffer)
|
||||
{
|
||||
gchar message_number_str[11];
|
||||
|
||||
sprintf(message_number_str, "%u", message_number);
|
||||
|
||||
add_to_list(ui_main_data.signalslist, message_number_str, signal_name);
|
||||
ui_tree_view_add_to_list(ui_main_data.signalslist, message_number_str, signal_name,
|
||||
origin_task, to_task, (buffer_t *)buffer);
|
||||
|
||||
return RC_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user