X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Ffilter%2Ffilter.c;h=893929b4ccb0be337cde5a0a1f63cdbad6b3f222;hb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;hp=74c2aff9e6189a25902308c80662143515178895;hpb=c2774e9d724c0a7bd19c7e68dd0f28cd1f6727dc;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/filter/filter.c b/ltt/branches/poly/lttv/modules/gui/filter/filter.c index 74c2aff9..893929b4 100644 --- a/ltt/branches/poly/lttv/modules/gui/filter/filter.c +++ b/ltt/branches/poly/lttv/modules/gui/filter/filter.c @@ -1,5 +1,5 @@ /* This file is part of the Linux Trace Toolkit viewer - * Copyright (C) 2003-2004 Simon Bouvier-Zappa + * Copyright (C) 2005 Simon Bouvier-Zappa * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -16,6 +16,10 @@ * MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -31,9 +35,19 @@ #include "hGuiFilterInsert.xpm" -/* - * TODO - * - connect the gui filter to the core filter +/*! \file lttv/modules/gui/filter/filter.c + * \brief Graphic filter interface. + * + * The gui filter facility gives the user an easy to use + * basic interface to construct and modify at will a filter + * expression. User may either decide to write it himself in + * expression text entry or add simple expressions using the + * many choices boxes. + * + * \note The version of gtk-2.0 currently installed on + * my desktop misses some function of the newer + * gtk+ api. For the time being, I'll use the older api + * to keep compatibility with most systems. */ typedef struct _FilterViewerData FilterViewerData; @@ -48,8 +62,6 @@ void gui_filter_destructor(FilterViewerData *fvd); FilterViewerDataLine* gui_filter_add_line(FilterViewerData *fvd); void gui_filter_line_set_visible(FilterViewerDataLine *fvdl, gboolean v); void gui_filter_line_reset(FilterViewerDataLine *fvdl); -gboolean filter_traceset_changed(void * hook_data, void * call_data); -gboolean filter_viewer_data(void * hook_data, void * call_data); GtkWidget* h_guifilter(Tab *tab); void filter_destroy_walk(gpointer data, gpointer user_data); @@ -61,66 +73,79 @@ void callback_add_button(GtkWidget *widget, gpointer data); void callback_logical_op_box(GtkWidget *widget, gpointer data); void callback_expression_field(GtkWidget *widget, gpointer data); +/** + * @struct _FilterViewerDataLine + * + * @brief Defines a simple expression + * This structures defines a simple + * expression whithin the main filter + * viewer data + */ struct _FilterViewerDataLine { - int row; - gboolean visible; - GtkWidget *f_logical_op_box; - GtkWidget *f_struct_box; - GtkWidget *f_subfield_box; - GtkWidget *f_math_op_box; - GtkWidget *f_value_field; + int row; /**< row number */ + gboolean visible; /**< visible state */ + GtkWidget *f_not_op_box; /**< '!' operator (GtkComboBox) */ + GtkWidget *f_logical_op_box; /**< '&,|,^' operators (GtkComboBox) */ + GtkWidget *f_field_box; /**< field types (GtkComboBox) */ + GtkWidget *f_math_op_box; /**< '>,>=,<,<=,=,!=' operators (GtkComboBox) */ + GtkWidget *f_value_field; /**< expression's value (GtkComboBox) */ }; /** - * @struct _FilterViewerData - * Main struct for the filter gui module + * @struct _FilterViewerData + * + * @brief Main structure of gui filter + * Main struct for the filter gui module */ struct _FilterViewerData { - Tab *tab; + Tab *tab; /**< current tab of module */ - GtkWidget *f_main_box; + GtkWidget *f_main_box; /**< main container */ - GtkWidget *f_hbox1; - GtkWidget *f_hbox2; - - GtkWidget *f_expression_field; - GtkWidget *f_process_button; + GtkWidget *f_expression_field; /**< entire expression (GtkEntry) */ + GtkWidget *f_process_button; /**< process expression button (GtkButton) */ - GtkWidget *f_logical_op_junction_box; + GtkWidget *f_logical_op_junction_box; /**< linking operator box (GtkComboBox) */ - int rows; - GPtrArray *f_lines; - - GtkWidget *f_add_button; + int rows; /**< number of rows */ + GPtrArray *f_lines; /**< array of FilterViewerDataLine */ + + GPtrArray *f_not_op_options; /**< array of operators types for not_op box */ + GPtrArray *f_logical_op_options; /**< array of operators types for logical_op box */ + GPtrArray *f_field_options; /**< array of field types for field box */ + GPtrArray *f_math_op_options; /**< array of operators types for math_op box */ - GtkWidget *f_textwnd; - GtkWidget *f_selectwnd; - GtkWidget *f_treewnd; + GtkWidget *f_add_button; /**< add expression to current expression (GtkButton) */ }; /** + * @fn GtkWidget* guifilter_get_widget(FilterViewerData*) + * * This function returns the current main widget * used by this module * @param fvd the module struct * @return The main widget */ -GtkWidget -*guifilter_get_widget(FilterViewerData *fvd) +GtkWidget* +guifilter_get_widget(FilterViewerData *fvd) { return fvd->f_main_box; } /** - * Constructor is used to create FilterViewerData data structure. - * @param the tab structure used by the widget - * @return The Filter viewer data created. + * @fn FilterViewerData* gui_filter(Tab*) + * + * Constructor is used to create FilterViewerData data structure. + * @param tab The tab structure used by the widget + * @return The Filter viewer data created. */ FilterViewerData* gui_filter(Tab *tab) { g_print("filter::gui_filter()"); - + + unsigned i; GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -128,17 +153,62 @@ gui_filter(Tab *tab) fvd->tab = tab; - lttvwindow_register_traceset_notify(fvd->tab, - filter_traceset_changed, - filter_viewer_data); +// lttvwindow_register_traceset_notify(fvd->tab, +// filter_traceset_changed, +// filter_viewer_data); // request_background_data(filter_viewer_data); + /* + * Initiating items for + * combo boxes + */ + fvd->f_not_op_options = g_ptr_array_new(); + g_ptr_array_add(fvd->f_not_op_options,(gpointer) g_string_new("")); + g_ptr_array_add(fvd->f_not_op_options,(gpointer) g_string_new("!")); + + fvd->f_logical_op_options = g_ptr_array_new(); //g_array_new(FALSE,FALSE,sizeof(gchar)); + g_ptr_array_add(fvd->f_logical_op_options,(gpointer) g_string_new("")); + g_ptr_array_add(fvd->f_logical_op_options,(gpointer) g_string_new("&")); + g_ptr_array_add(fvd->f_logical_op_options,(gpointer) g_string_new("|")); + g_ptr_array_add(fvd->f_logical_op_options,(gpointer) g_string_new("!")); + g_ptr_array_add(fvd->f_logical_op_options,(gpointer) g_string_new("^")); + + fvd->f_field_options = g_ptr_array_new(); //g_array_new(FALSE,FALSE,16); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.name")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.category")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.time")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.tsc")); + /* + * TODO: Add core.xml fields here ! + */ + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("tracefile.name")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("trace.name")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.pid")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.ppid")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.creation_time")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.insertion_time")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.execution_mode")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.execution_submode")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.process_status")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.cpu")); + + fvd->f_math_op_options = g_ptr_array_new(); //g_array_new(FALSE,FALSE,7); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new("")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new("=")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new("!=")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new("<")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new("<=")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new(">")); + g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new(">=")); + + /* * Initiating GtkTable layout * starts with 2 rows and 5 columns and * expands when expressions added */ - fvd->f_main_box = gtk_table_new(3,6,FALSE); + fvd->f_main_box = gtk_table_new(3,7,FALSE); gtk_table_set_row_spacings(GTK_TABLE(fvd->f_main_box),5); gtk_table_set_col_spacings(GTK_TABLE(fvd->f_main_box),5); @@ -160,8 +230,8 @@ gui_filter(Tab *tab) g_signal_connect (G_OBJECT (fvd->f_process_button), "clicked", G_CALLBACK (callback_process_button), (gpointer) fvd); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_expression_field,0,5,0,1,GTK_FILL,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_process_button,5,6,0,1,GTK_FILL,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_expression_field,0,6,0,1,GTK_FILL,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_process_button,6,7,0,1,GTK_FILL,GTK_FILL,0,0); @@ -175,14 +245,15 @@ gui_filter(Tab *tab) g_signal_connect (G_OBJECT (fvd->f_add_button), "clicked", G_CALLBACK (callback_add_button), (gpointer) fvd); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_add_button,5,6,1,2,GTK_FILL,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_add_button,6,7,1,2,GTK_FILL,GTK_FILL,0,0); fvd->f_logical_op_junction_box = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvd->f_logical_op_junction_box), ""); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvd->f_logical_op_junction_box), "&"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvd->f_logical_op_junction_box), "|"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvd->f_logical_op_junction_box), "^"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvd->f_logical_op_junction_box), "!"); + for(i=0;if_logical_op_options->len;i++) { + GString* s = g_ptr_array_index(fvd->f_logical_op_options,i); + gtk_combo_box_append_text(GTK_COMBO_BOX(fvd->f_logical_op_junction_box), s->str); + } + gtk_combo_box_set_active(GTK_COMBO_BOX(fvd->f_logical_op_junction_box),0); + //gtk_widget_show(fvd->f_logical_op_box); gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvd->f_logical_op_junction_box,0,1,1,2,GTK_SHRINK,GTK_FILL,0,0); @@ -210,6 +281,8 @@ gui_filter(Tab *tab) } /** + * @fn FilterViewerDataLine* gui_filter_add_line(FilterViewerData*) + * * Adds a filter option line on the module tab * @param fvd The filter module structure * @return The line structure @@ -219,55 +292,36 @@ gui_filter_add_line(FilterViewerData* fvd) { FilterViewerDataLine* fvdl = g_new(FilterViewerDataLine,1); + unsigned i; fvdl->row = fvd->rows; fvdl->visible = TRUE; + + fvdl->f_not_op_box = gtk_combo_box_new_text(); + for(i=0;if_not_op_options->len;i++) { + GString* s = g_ptr_array_index(fvd->f_not_op_options,i); + gtk_combo_box_append_text(GTK_COMBO_BOX(fvdl->f_not_op_box), s->str); + } + + fvdl->f_field_box = gtk_combo_box_new_text(); + for(i=0;if_field_options->len;i++) { + GString* s = g_ptr_array_index(fvd->f_field_options,i); +// g_print("String field: %s\n",s->str); + gtk_combo_box_append_text(GTK_COMBO_BOX(fvdl->f_field_box), s->str); + } - fvdl->f_struct_box = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_struct_box), ""); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_struct_box), "event"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_struct_box), "tracefile"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_struct_box), "trace"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_struct_box), "state"); - gtk_widget_show(fvdl->f_struct_box); - - fvdl->f_subfield_box = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), ""); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "name"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "category"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "time"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "tsc"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "pid"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "ppid"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "creation time"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "insertion time"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "process name"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "execution mode"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "execution submode"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "process status"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_subfield_box), "cpu"); - gtk_widget_show(fvdl->f_subfield_box); - fvdl->f_math_op_box = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), ""); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), "="); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), "!="); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), "<"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), "<="); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), ">"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_math_op_box), ">="); - gtk_widget_show(fvdl->f_math_op_box); - + for(i=0;if_math_op_options->len;i++) { + GString* s = g_ptr_array_index(fvd->f_math_op_options,i); + gtk_combo_box_append_text(GTK_COMBO_BOX(fvdl->f_math_op_box), s->str); + } + fvdl->f_value_field = gtk_entry_new(); - gtk_widget_show(fvdl->f_value_field); fvdl->f_logical_op_box = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_logical_op_box), ""); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_logical_op_box), "&"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_logical_op_box), "|"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_logical_op_box), "^"); - gtk_combo_box_append_text (GTK_COMBO_BOX (fvdl->f_logical_op_box), "!"); - gtk_widget_show(fvdl->f_logical_op_box); - + for(i=0;if_logical_op_options->len;i++) { + GString* s = g_ptr_array_index(fvd->f_logical_op_options,i); + gtk_combo_box_append_text(GTK_COMBO_BOX(fvdl->f_logical_op_box), s->str); + } gtk_widget_set_events(fvdl->f_logical_op_box, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | @@ -275,28 +329,39 @@ gui_filter_add_line(FilterViewerData* fvd) { g_signal_connect (G_OBJECT (fvdl->f_logical_op_box), "changed", G_CALLBACK (callback_logical_op_box), (gpointer) fvd); + + gui_filter_line_reset(fvdl); + gui_filter_line_set_visible(fvdl,TRUE); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_struct_box,0,1,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_subfield_box,1,2,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_math_op_box,2,3,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_value_field,3,4,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_logical_op_box,4,5,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_not_op_box,0,1,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_field_box,1,3,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_math_op_box,3,4,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_value_field,4,5,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(fvd->f_main_box),fvdl->f_logical_op_box,5,6,fvd->rows+1,fvd->rows+2,GTK_SHRINK,GTK_FILL,0,0); return fvdl; } -void gui_filter_line_set_visible(FilterViewerDataLine *fvdl, gboolean v) { +/** + * @fn void gui_filter_line_set_visible(FilterViewerDataLine*,gboolean) + * + * Change visible state of current FilterViewerDataLine + * @param fvdl pointer to the current FilterViewerDataLine + * @param v TRUE: sets visible, FALSE: sets invisible + */ +void +gui_filter_line_set_visible(FilterViewerDataLine *fvdl, gboolean v) { fvdl->visible = v; if(v) { - gtk_widget_show(fvdl->f_struct_box); - gtk_widget_show(fvdl->f_subfield_box); + gtk_widget_show(fvdl->f_not_op_box); + gtk_widget_show(fvdl->f_field_box); gtk_widget_show(fvdl->f_math_op_box); gtk_widget_show(fvdl->f_value_field); gtk_widget_show(fvdl->f_logical_op_box); } else { - gtk_widget_hide(fvdl->f_struct_box); - gtk_widget_hide(fvdl->f_subfield_box); + gtk_widget_hide(fvdl->f_not_op_box); + gtk_widget_hide(fvdl->f_field_box); gtk_widget_hide(fvdl->f_math_op_box); gtk_widget_hide(fvdl->f_value_field); gtk_widget_hide(fvdl->f_logical_op_box); @@ -304,16 +369,26 @@ void gui_filter_line_set_visible(FilterViewerDataLine *fvdl, gboolean v) { } -void gui_filter_line_reset(FilterViewerDataLine *fvdl) { +/** + * @fn void gui_filter_line_reset(FilterViewerDataLine*) + * + * Sets selections of all boxes in current FilterViewerDataLine + * to default value (0) + * @param fvdl pointer to current FilterViewerDataLine + */ +void +gui_filter_line_reset(FilterViewerDataLine *fvdl) { - gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_struct_box),0); - gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_subfield_box),0); + gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_not_op_box),0); + gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_field_box),0); gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_math_op_box),0); - gtk_entry_set_text(GTK_COMBO_BOX(fvdl->f_value_field),""); + gtk_entry_set_text(GTK_ENTRY(fvdl->f_value_field),""); gtk_combo_box_set_active(GTK_COMBO_BOX(fvdl->f_logical_op_box),0); } /** + * @fn void gui_filter_destructor(FilterViewerData*) + * * Destructor for the filter gui module * @param fvd The module structure */ @@ -326,54 +401,32 @@ gui_filter_destructor(FilterViewerData *fvd) if(GTK_IS_WIDGET(guifilter_get_widget(fvd))){ g_info("widget still exists"); } - if(tab != NULL) { - lttvwindow_unregister_traceset_notify(fvd->tab, - filter_traceset_changed, - filter_viewer_data); - } +// if(tab != NULL) { +// lttvwindow_unregister_traceset_notify(fvd->tab, +// filter_traceset_changed, +// filter_viewer_data); +// } lttvwindowtraces_background_notify_remove(fvd); g_free(fvd); } -/** - * Hook function - * @param hook_data The hook data - * @param call_data The call data - * @return Success/Failure of operation - */ -gboolean -filter_traceset_changed(void * hook_data, void * call_data) { - - return FALSE; -} - -/** - * Hook function - * @param hook_data The hook data - * @param call_data The call data - * @return Success/Failure of operation - */ -gboolean -filter_viewer_data(void * hook_data, void * call_data) { - - return FALSE; -} /** - * Filter Module's constructor hook + * @fn GtkWidget* h_guifilter(Tab*) + * + * Filter Module's constructor hook * - * This constructor is given as a parameter to the menuitem and toolbar button - * registration. It creates the list. - * @param tab A pointer to the parent window. - * @return The widget created. + * This constructor is given as a parameter to the menuitem and toolbar button + * registration. It creates the list. + * @param tab A pointer to the parent window. + * @return The widget created. */ GtkWidget * h_guifilter(Tab *tab) { FilterViewerData* f = gui_filter(tab) ; - g_print("FilterViewerData:%p\n",f); if(f) return guifilter_get_widget(f); else return NULL; @@ -381,8 +434,10 @@ h_guifilter(Tab *tab) } /** - * This function initializes the Filter Viewer functionnality through the - * gtkTraceSet API. + * @fn static void init() + * + * This function initializes the Filter Viewer functionnality through the + * gtkTraceSet API. */ static void init() { @@ -395,24 +450,29 @@ static void init() { } /** + * @fn void filter_destroy_walk(gpointer,gpointer) + * * Initiate the destruction of the current gui module * on the GTK Interface */ -void filter_destroy_walk(gpointer data, gpointer user_data) +void +filter_destroy_walk(gpointer data, gpointer user_data) { FilterViewerData *fvd = (FilterViewerData*)data; g_debug("CFV.c : filter_destroy_walk, %p", fvd); + /* May already have been done by GTK window closing */ if(GTK_IS_WIDGET(guifilter_get_widget(fvd))) gtk_widget_destroy(guifilter_get_widget(fvd)); } /** - * plugin's destroy function + * @fn static void destroy() + * @brief plugin's destroy function * - * This function releases the memory reserved by the module and unregisters - * everything that has been registered in the gtkTraceSet API. + * This function releases the memory reserved by the module and unregisters + * everything that has been registered in the gtkTraceSet API. */ static void destroy() { @@ -421,25 +481,38 @@ static void destroy() { } /** + * @fn void callback_process_button(GtkWidget*,gpointer) + * * The Process Button callback function * @param widget The Button widget passed to the callback function * @param data Data sent along with the callback function */ -void callback_process_button(GtkWidget *widget, gpointer data) { +void +callback_process_button(GtkWidget *widget, gpointer data) { + g_debug("callback_process_button(): Processing expression"); + FilterViewerData *fvd = (FilterViewerData*)data; - if(strlen(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))) !=0) - lttv_filter_new(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field)),NULL); + if(strlen(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))) !=0) { + LttvFilter* filter = lttv_filter_new(); + GString* s = g_string_new(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))); + lttv_filter_append_expression(filter,s->str); + g_string_free(s,TRUE); + SetFilter(fvd->tab,filter); + } } /** + * @fn void callback_expression_field(GtkWidget*,gpointer) + * * The Add Button callback function * @param widget The Button widget passed to the callback function * @param data Data sent along with the callback function */ -void callback_expression_field(GtkWidget *widget, gpointer data) { - +void +callback_expression_field(GtkWidget *widget, gpointer data) { + FilterViewerData *fvd = (FilterViewerData*)data; if(strlen(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))) !=0) { @@ -451,50 +524,85 @@ void callback_expression_field(GtkWidget *widget, gpointer data) { /** + * @fn void callback_add_button(GtkWidget*,gpointer) + * * The Add Button callback function * @param widget The Button widget passed to the callback function * @param data Data sent along with the callback function */ -void callback_add_button(GtkWidget *widget, gpointer data) { +void +callback_add_button(GtkWidget *widget, gpointer data) { - g_print("filter::callback_add_button()\n"); + g_debug("callback_add_button(): processing simple expressions"); + unsigned i; + FilterViewerData *fvd = (FilterViewerData*)data; FilterViewerDataLine *fvdl = NULL; GString* a_filter_string = g_string_new(""); - -// g_string_append(a_filter_string,gtk_combo_box_get_active_text(GTK_COMBO_BOX(fvd->f_logical_op_junction_box))); - gtk_combo_box_set_active(fvd->f_logical_op_junction_box,0); - g_string_append_c(a_filter_string,"("); - - int i; + /* + * adding linking operator to + * string + */ + GString* s; + s = g_ptr_array_index(fvd->f_logical_op_options,gtk_combo_box_get_active(GTK_COMBO_BOX(fvd->f_logical_op_junction_box))); + g_string_append(a_filter_string,s->str); + gtk_combo_box_set_active(GTK_COMBO_BOX(fvd->f_logical_op_junction_box),0); + + /* begin expression */ + g_string_append_c(a_filter_string,'('); + + /* + * For each simple expression, add the resulting string + * to the filter string + * + * Each simple expression takes the following schema + * [not operator '!',' '] [field type] [math operator '<','<=','>','>=','=','!='] [value] + */ for(i=0;if_lines->len;i++) { fvdl = (FilterViewerDataLine*)g_ptr_array_index(fvd->f_lines,i); -// g_string_append(a_filter_string,gtk_combo_box_get_active_text(GTK_COMBO_BOX(fvdl->f_struct_box))); - g_string_append_c(a_filter_string,"."); -// g_string_append(a_filter_string,gtk_combo_box_get_active_text(GTK_COMBO_BOX(fvdl->f_subfield_box))); -// g_string_append(a_filter_string,gtk_combo_box_get_active_text(GTK_COMBO_BOX(fvdl->f_math_op_box))); -// g_string_append(a_filter_string,gtk_entry_get_text(GTK_ENTRY(fvdl->f_value_field))); -// g_string_append(a_filter_string,gtk_combo_box_get_active_text(GTK_COMBO_BOX(fvdl->f_logical_op_box))); + + s = g_ptr_array_index(fvd->f_not_op_options,gtk_combo_box_get_active(GTK_COMBO_BOX(fvdl->f_not_op_box))); + g_string_append(a_filter_string,s->str); + + s = g_ptr_array_index(fvd->f_field_options,gtk_combo_box_get_active(GTK_COMBO_BOX(fvdl->f_field_box))); + g_string_append(a_filter_string,s->str); + + s = g_ptr_array_index(fvd->f_math_op_options,gtk_combo_box_get_active(GTK_COMBO_BOX(fvdl->f_math_op_box))); + g_string_append(a_filter_string,s->str); + + g_string_append(a_filter_string,gtk_entry_get_text(GTK_ENTRY(fvdl->f_value_field))); + + s = g_ptr_array_index(fvd->f_logical_op_options,gtk_combo_box_get_active(GTK_COMBO_BOX(fvdl->f_logical_op_box))); + g_string_append(a_filter_string,s->str); + + /* + * resetting simple expression lines + */ gui_filter_line_reset(fvdl); - if(i) gui_filter_line_set_visible(fvdl,FALSE); + if(i) gui_filter_line_set_visible(fvdl,FALSE); // Only keep the first line } - g_string_append(a_filter_string,")"); + /* end expression */ + g_string_append_c(a_filter_string,')'); - gtk_entry_set_text(GTK_ENTRY(fvdl->f_value_field),a_filter_string->str); + g_string_prepend(a_filter_string,gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))); + gtk_entry_set_text(GTK_ENTRY(fvd->f_expression_field),a_filter_string->str); } /** + * @fn void callback_logical_op_box(GtkWidget*,gpointer) + * * The logical op box callback function * @param widget The Button widget passed to the callback function * @param data Data sent along with the callback function */ -void callback_logical_op_box(GtkWidget *widget, gpointer data) { +void +callback_logical_op_box(GtkWidget *widget, gpointer data) { - g_print("filter::callback_logical_op_box()\n"); + g_debug("callback_logical_op_box(): adding new simple expression"); FilterViewerData *fvd = (FilterViewerData*)data; FilterViewerDataLine *fvdl = NULL; @@ -503,7 +611,7 @@ void callback_logical_op_box(GtkWidget *widget, gpointer data) { for(i=0;if_lines->len;i++) { fvdl = (FilterViewerDataLine*)g_ptr_array_index(fvd->f_lines,i); if(fvdl->f_logical_op_box == widget) { - if(gtk_combo_box_get_active(fvdl->f_logical_op_box) == 0) return; + if(gtk_combo_box_get_active(GTK_COMBO_BOX(fvdl->f_logical_op_box)) == 0) return; if(i==fvd->f_lines->len-1) { /* create a new line */ fvd->rows++; FilterViewerDataLine* fvdl2 = gui_filter_add_line(fvd);