Show the Display filter in Protocol Hierarchy Statistics.

svn path=/trunk/; revision=23686

diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 747139bee67c191b0bfb26ebdf0c0b0427b4737d..7a7d1037ffe4af3efef45843886f5c14bea4ac7d 100644 (file)
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -315,6 +315,8 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 {
        ph_stats_t      *ps;
        GtkWidget       *dlg, *ok_bt, *help_bt, *vbox, *bbox;
+       GtkWidget       *label;
+       char             title[256];
 
        /* Get the statistics. */
        ps = ph_stats_new();
@@ -330,31 +332,39 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
        gtk_container_border_width(GTK_CONTAINER(vbox), 5);
        gtk_container_add(GTK_CONTAINER(dlg), vbox);
 
+       if (ps->dfilter) {
+               g_snprintf(title, 255, "Display filter: %s", ps->dfilter);
+       } else {
+               g_snprintf(title, 255, "Display filter: none");
+       }
+       label = gtk_label_new(title);
+       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
        /* Data section */
        create_tree(vbox, ps);
 
        ph_stats_free(ps);
 
        /* Button row. */
-    if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
-           bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_HELP, NULL);
-    } else {
-           bbox = dlg_button_row_new(GTK_STOCK_OK, NULL);
-    }
+       if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
+               bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_HELP, NULL);
+       } else {
+               bbox = dlg_button_row_new(GTK_STOCK_OK, NULL);
+       }
        gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
        gtk_widget_show(bbox);
 
        ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
-    window_set_cancel_button(dlg, ok_bt, window_cancel_button_cb);
+       window_set_cancel_button(dlg, ok_bt, window_cancel_button_cb);
 
-    if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
-        help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
-        SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_PROTO_HIERARCHY_DIALOG);
-    }
+       if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
+               help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+               SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_PROTO_HIERARCHY_DIALOG);
+       }
 
        SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
 
        gtk_widget_show_all(dlg);
-    window_present(dlg);
+       window_present(dlg);
 }
 

diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index d402492098ae93a47b57a9b05d4afb559f2e00f9..231182d3480c5620d6ca0727f2fe86af6fc711f0 100644 (file)
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -191,6 +191,7 @@ ph_stats_new(void)
        ps->stats_tree = g_node_new(NULL);
        ps->first_time = 0.0;
        ps->last_time = 0.0;
+       ps->dfilter = cfile.dfilter;
 
        /* Update the progress bar when it gets to this value. */
        progbar_nextstep = 0;

diff --git a/proto_hier_stats.h b/proto_hier_stats.h
index 5d5aac2510a070c71c4b12a20972e006966f202a..d98d1a0a994e2da8f1770a4bc67080ab82049ace 100644 (file)
--- a/proto_hier_stats.h
+++ b/proto_hier_stats.h
@@ -41,6 +41,7 @@ typedef struct {
        GNode   *stats_tree;
        double  first_time;     /* seconds (msec resolution) of first packet */
        double  last_time;      /* seconds (msec resolution) of last packet  */
+       const char *dfilter;    /* display filter */
 } ph_stats_t;