X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FCFV.c;h=ac371adc569527a9c58fc8db2b09d37000d07260;hb=a7e6e8284bcc732f7db90354f8e3282b1d8b4629;hp=a8ea21dc023e332a4228e8b912ae8d8db90ae099;hpb=ba90bc77f7ef2ffc59cc08b6234c61274cdd4396;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c index a8ea21dc..ac371adc 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c @@ -13,7 +13,7 @@ #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) #define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) -extern GSList *gControl_Flow_Data_List; +extern GSList *g_control_flow_data_list; /***************************************************************************** * Control Flow Viewer class implementation * @@ -29,31 +29,31 @@ extern GSList *gControl_Flow_Data_List; ControlFlowData * guicontrolflow(void) { - GtkWidget *process_list_Widget, *Drawing_Widget;//, *button; + GtkWidget *process_list_widget, *drawing_widget; - ControlFlowData* Control_Flow_Data = g_new(ControlFlowData,1) ; + ControlFlowData* control_flow_data = g_new(ControlFlowData,1) ; - /* Create the Drawing */ - Control_Flow_Data->Drawing = drawing_construct(Control_Flow_Data); + /* Create the drawing */ + control_flow_data->drawing = drawing_construct(control_flow_data); - Drawing_Widget = - drawing_get_widget(Control_Flow_Data->Drawing); + drawing_widget = + drawing_get_widget(control_flow_data->drawing); - Control_Flow_Data->number_of_process = 0; + control_flow_data->number_of_process = 0; /* Create the Process list */ - Control_Flow_Data->process_list = processlist_construct(); + control_flow_data->process_list = processlist_construct(); - process_list_Widget = - processlist_get_widget(Control_Flow_Data->process_list); + process_list_widget = + processlist_get_widget(control_flow_data->process_list); - //Control_Flow_Data->Inside_HBox_V = gtk_hbox_new(0, 0); - Control_Flow_Data->h_paned = gtk_hpaned_new(); + //control_flow_data->Inside_HBox_V = gtk_hbox_new(0, 0); + control_flow_data->h_paned = gtk_hpaned_new(); - gtk_paned_pack1(GTK_PANED(Control_Flow_Data->h_paned), process_list_Widget, FALSE, TRUE); - gtk_paned_pack2(GTK_PANED(Control_Flow_Data->h_paned), Drawing_Widget, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(control_flow_data->h_paned), process_list_widget, FALSE, TRUE); + gtk_paned_pack2(GTK_PANED(control_flow_data->h_paned), drawing_widget, TRUE, TRUE); - Control_Flow_Data->v_adjust = + control_flow_data->v_adjust = GTK_ADJUSTMENT(gtk_adjustment_new( 0.0, /* Value */ 0.0, /* Lower */ 0.0, /* Upper */ @@ -61,113 +61,113 @@ guicontrolflow(void) 0.0, /* Page inc. */ 0.0)); /* page size */ - Control_Flow_Data->scrolled_window = + control_flow_data->scrolled_window = gtk_scrolled_window_new (NULL, - Control_Flow_Data->v_adjust); + control_flow_data->v_adjust); gtk_scrolled_window_set_policy( - GTK_SCROLLED_WINDOW(Control_Flow_Data->scrolled_window) , + GTK_SCROLLED_WINDOW(control_flow_data->scrolled_window) , GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport( - GTK_SCROLLED_WINDOW(Control_Flow_Data->scrolled_window), - Control_Flow_Data->h_paned); + GTK_SCROLLED_WINDOW(control_flow_data->scrolled_window), + control_flow_data->h_paned); /* Set the size of the drawing area */ - //Drawing_Resize(Drawing, h, w); + //drawing_Resize(drawing, h, w); /* Get trace statistics */ - //Control_Flow_Data->Trace_Statistics = get_trace_statistics(Trace); + //control_flow_data->Trace_Statistics = get_trace_statistics(Trace); - gtk_widget_show(Drawing_Widget); - gtk_widget_show(process_list_Widget); - gtk_widget_show(Control_Flow_Data->h_paned); - gtk_widget_show(Control_Flow_Data->scrolled_window); + gtk_widget_show(drawing_widget); + gtk_widget_show(process_list_widget); + gtk_widget_show(control_flow_data->h_paned); + gtk_widget_show(control_flow_data->scrolled_window); g_object_set_data_full( - G_OBJECT(Control_Flow_Data->scrolled_window), - "Control_Flow_Data", - Control_Flow_Data, + G_OBJECT(control_flow_data->scrolled_window), + "control_flow_data", + control_flow_data, (GDestroyNotify)guicontrolflow_destructor); g_object_set_data( - G_OBJECT(Drawing_Widget), - "Control_Flow_Data", - Control_Flow_Data); + G_OBJECT(drawing_widget), + "control_flow_data", + control_flow_data); - gControl_Flow_Data_List = g_slist_append( - gControl_Flow_Data_List, - Control_Flow_Data); + g_control_flow_data_list = g_slist_append( + g_control_flow_data_list, + control_flow_data); //WARNING : The widget must be - //inserted in the main window before the Drawing area + //inserted in the main window before the drawing area //can be configured (and this must happend bedore sending //data) - return Control_Flow_Data; + return control_flow_data; } /* Destroys widget also */ void -guicontrolflow_destructor_full(ControlFlowData *Control_Flow_Data) +guicontrolflow_destructor_full(ControlFlowData *control_flow_data) { - g_info("CFV.c : guicontrolflow_destructor_full, %p", Control_Flow_Data); + g_info("CFV.c : guicontrolflow_destructor_full, %p", control_flow_data); /* May already have been done by GTK window closing */ - if(GTK_IS_WIDGET(Control_Flow_Data->scrolled_window)) - gtk_widget_destroy(Control_Flow_Data->scrolled_window); - //Control_Flow_Data->mw = NULL; - //FIXME guicontrolflow_destructor(Control_Flow_Data); + if(GTK_IS_WIDGET(control_flow_data->scrolled_window)) + gtk_widget_destroy(control_flow_data->scrolled_window); + //control_flow_data->mw = NULL; + //FIXME guicontrolflow_destructor(control_flow_data); } /* When this destructor is called, the widgets are already disconnected */ void -guicontrolflow_destructor(ControlFlowData *Control_Flow_Data) +guicontrolflow_destructor(ControlFlowData *control_flow_data) { guint index; - g_info("CFV.c : guicontrolflow_destructor, %p", Control_Flow_Data); - g_info("%p, %p, %p", update_time_window_hook, Control_Flow_Data, Control_Flow_Data->mw); - if(GTK_IS_WIDGET(Control_Flow_Data->scrolled_window)) + g_info("CFV.c : guicontrolflow_destructor, %p", control_flow_data); + g_info("%p, %p, %p", update_time_window_hook, control_flow_data, control_flow_data->mw); + if(GTK_IS_WIDGET(control_flow_data->scrolled_window)) g_info("widget still exists"); /* Process List is removed with it's widget */ - //ProcessList_destroy(Control_Flow_Data->process_list); - if(Control_Flow_Data->mw != NULL) + //ProcessList_destroy(control_flow_data->process_list); + if(control_flow_data->mw != NULL) { unreg_update_time_window(update_time_window_hook, - Control_Flow_Data, - Control_Flow_Data->mw); + control_flow_data, + control_flow_data->mw); unreg_update_current_time(update_current_time_hook, - Control_Flow_Data, - Control_Flow_Data->mw); + control_flow_data, + control_flow_data->mw); } - g_info("CFV.c : guicontrolflow_destructor, %p", Control_Flow_Data); - g_slist_remove(gControl_Flow_Data_List,Control_Flow_Data); - g_free(Control_Flow_Data); + g_info("CFV.c : guicontrolflow_destructor, %p", control_flow_data); + g_slist_remove(g_control_flow_data_list,control_flow_data); + g_free(control_flow_data); } -GtkWidget *guicontrolflow_get_widget(ControlFlowData *Control_Flow_Data) +GtkWidget *guicontrolflow_get_widget(ControlFlowData *control_flow_data) { - return Control_Flow_Data->scrolled_window ; + return control_flow_data->scrolled_window ; } ProcessList *guicontrolflow_get_process_list - (ControlFlowData *Control_Flow_Data) + (ControlFlowData *control_flow_data) { - return Control_Flow_Data->process_list ; + return control_flow_data->process_list ; } -TimeWindow *guicontrolflow_get_time_window(ControlFlowData *Control_Flow_Data) +TimeWindow *guicontrolflow_get_time_window(ControlFlowData *control_flow_data) { - return &Control_Flow_Data->time_window; + return &control_flow_data->time_window; } -LttTime *guicontrolflow_get_current_time(ControlFlowData *Control_Flow_Data) +LttTime *guicontrolflow_get_current_time(ControlFlowData *control_flow_data) { - return &Control_Flow_Data->current_time; + return &control_flow_data->current_time; }