quit menu complete

[lttv.git] / ltt / branches / poly / lttv / modules / guiControlFlow / CFV.c

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
index 9a29ae1a901b6066022da0127723f2f93c65e0ce..aae13cf7aa9fe401900b7253d111a404eaf67b85 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
@@ -17,7 +17,6 @@ extern GSList *gControl_Flow_Data_List;
 
 struct _ControlFlowData {
 
-       GtkWidget *Drawing_Area_V;
        GtkWidget *Scrolled_Window_VC;
        
        ProcessList *Process_List;
@@ -34,7 +33,7 @@ struct _ControlFlowData {
        
        /* Shown events information */
        guint First_Event, Last_Event;
-       ltt_time Begin_Time, End_Time;
+       LttTime Begin_Time, End_Time;
        
        
        /* TEST DATA, TO BE READ FROM THE TRACE */
@@ -57,12 +56,15 @@ struct _ControlFlowData {
 ControlFlowData *
 GuiControlFlow(void)
 {
-       GtkWidget *Process_List_Widget;
+       GtkWidget *Process_List_Widget, *Drawing_Widget;
 
        ControlFlowData* Control_Flow_Data = g_new(ControlFlowData,1) ;
 
        /* Create the Drawing */
-       //Control_Flow_Data->Drawing = Drawing();
+       Control_Flow_Data->Drawing = Drawing_construct();
+       
+       Drawing_Widget = 
+               Drawing_getWidget(Control_Flow_Data->Drawing);
        
        /* TEST DATA, TO BE READ FROM THE TRACE */
        Control_Flow_Data->Number_Of_Events = 1000 ;
@@ -75,19 +77,19 @@ GuiControlFlow(void)
 
 
        /* Create the Process list */
-       //Control_Flow_Data->Process_List = ProcessList_contruct();
+       Control_Flow_Data->Process_List = ProcessList_construct();
        
-       //Process_List_Widget = 
-       //      ProcessList_getWidget(Control_Flow_Data->Process_List);
+       Process_List_Widget = 
+               ProcessList_getWidget(Control_Flow_Data->Process_List);
        
        Control_Flow_Data->Inside_HBox_V = gtk_hbox_new(0, 0);
 
-       //gtk_box_pack_start(
-       //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
-       //      Process_List_Widget, FALSE, TRUE, 0);
-       //gtk_box_pack_start(
-       //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
-       //      Control_Flow_Data->Drawing_Area_V, TRUE, TRUE, 0);
+       gtk_box_pack_start(
+               GTK_BOX(Control_Flow_Data->Inside_HBox_V),
+               Process_List_Widget, FALSE, TRUE, 0); // FALSE TRUE
+       gtk_box_pack_start(
+               GTK_BOX(Control_Flow_Data->Inside_HBox_V),
+               Drawing_Widget, TRUE, TRUE, 0);
 
 
        Control_Flow_Data->VAdjust_C = 
@@ -132,8 +134,8 @@ GuiControlFlow(void)
        //Control_Flow_Data->Trace_Statistics = get_trace_statistics(Trace);
 
 
-       //gtk_widget_show(Control_Flow_Data->Drawing_Area_V);
-       //gtk_widget_show(Process_List_Widget);
+       gtk_widget_show(Drawing_Widget);
+       gtk_widget_show(Process_List_Widget);
        gtk_widget_show(Control_Flow_Data->Inside_HBox_V);
        gtk_widget_show(Control_Flow_Data->Scrolled_Window_VC);
        
@@ -145,6 +147,13 @@ GuiControlFlow(void)
                        
        g_slist_append(gControl_Flow_Data_List,Control_Flow_Data);
 
+       //FIXME : data sent too fast. The widget must be 
+       //inserted in the main window before the Drawing area
+       //can be configured (and this must happend bedore sending
+       //data)
+       send_test_data(Control_Flow_Data->Process_List,
+                       Control_Flow_Data->Drawing);
+       
        return Control_Flow_Data;
 
 }
@@ -164,7 +173,8 @@ void
 GuiControlFlow_Destructor(ControlFlowData *Control_Flow_Data)
 {
        guint index;
-
+       
+       /* Process List is removed with it's widget */
        //ProcessList_destroy(Control_Flow_Data->Process_List);
        
        g_slist_remove(gControl_Flow_Data_List,Control_Flow_Data);