use hpaned for control flow viewer

[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 d49bd13112102cfd1821c020268b66b9a1c2aeb4..2996a35764e5273abb074e168f861dad158a7a60 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
@@ -10,6 +10,9 @@
 #include "CFV-private.h"
 
 
+#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;
 
 /*****************************************************************************
@@ -24,17 +27,17 @@ extern GSList *gControl_Flow_Data_List;
  * @return The widget created.
  */
 ControlFlowData *
-GuiControlFlow(void)
+guicontrolflow(void)
 {
        GtkWidget *Process_List_Widget, *Drawing_Widget;
 
        ControlFlowData* Control_Flow_Data = g_new(ControlFlowData,1) ;
 
        /* Create the Drawing */
-       Control_Flow_Data->Drawing = Drawing_construct(Control_Flow_Data);
+       Control_Flow_Data->Drawing = drawing_construct(Control_Flow_Data);
        
        Drawing_Widget = 
-               Drawing_getWidget(Control_Flow_Data->Drawing);
+               drawing_get_widget(Control_Flow_Data->Drawing);
        
        /* TEST DATA, TO BE READ FROM THE TRACE */
        Control_Flow_Data->Number_Of_Events = 1000 ;
@@ -47,20 +50,22 @@ GuiControlFlow(void)
 
 
        /* Create the Process list */
-       Control_Flow_Data->Process_List = ProcessList_construct();
+       Control_Flow_Data->Process_List = processlist_construct();
        
        Process_List_Widget = 
-               ProcessList_getWidget(Control_Flow_Data->Process_List);
+               processlist_get_widget(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); // FALSE TRUE
-       gtk_box_pack_start(
-               GTK_BOX(Control_Flow_Data->Inside_HBox_V),
-               Drawing_Widget, TRUE, TRUE, 0);
-
+       //Control_Flow_Data->Inside_HBox_V = gtk_hbox_new(0, 0);
+       Control_Flow_Data->HPaned = gtk_hpaned_new();
+               
+       //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);
+       gtk_paned_pack1(GTK_PANED(Control_Flow_Data->HPaned), Process_List_Widget, FALSE, TRUE);
+       gtk_paned_pack2(GTK_PANED(Control_Flow_Data->HPaned), Drawing_Widget, TRUE, TRUE);
 
        Control_Flow_Data->VAdjust_C = 
                GTK_ADJUSTMENT(gtk_adjustment_new(      0.0,    /* Value */
@@ -81,8 +86,8 @@ GuiControlFlow(void)
 
        gtk_scrolled_window_add_with_viewport(
                GTK_SCROLLED_WINDOW(Control_Flow_Data->Scrolled_Window_VC),
-               Control_Flow_Data->Inside_HBox_V);
-       
+               //Control_Flow_Data->Inside_HBox_V);
+               Control_Flow_Data->HPaned);
        
        //g_signal_connect (G_OBJECT (Control_Flow_Data->Drawing_Area_V),
        //              "expose_event",
@@ -106,15 +111,21 @@ GuiControlFlow(void)
 
        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->Inside_HBox_V);
+       gtk_widget_show(Control_Flow_Data->HPaned);
        gtk_widget_show(Control_Flow_Data->Scrolled_Window_VC);
        
        g_object_set_data_full(
                        G_OBJECT(Control_Flow_Data->Scrolled_Window_VC),
                        "Control_Flow_Data",
                        Control_Flow_Data,
-                       (GDestroyNotify)GuiControlFlow_Destructor);
-                       
+                       (GDestroyNotify)guicontrolflow_destructor);
+               
+       g_object_set_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);
@@ -130,50 +141,60 @@ GuiControlFlow(void)
 
 /* 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);
        /* May already have been done by GTK window closing */
        if(GTK_IS_WIDGET(Control_Flow_Data->Scrolled_Window_VC))
                gtk_widget_destroy(Control_Flow_Data->Scrolled_Window_VC);
-
-       GuiControlFlow_Destructor(Control_Flow_Data);
+       //Control_Flow_Data->Parent_Window = 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->Parent_Window);
+       if(GTK_IS_WIDGET(Control_Flow_Data->Scrolled_Window_VC))
+               g_info("widget still exists");
+       
        /* Process List is removed with it's widget */
        //ProcessList_destroy(Control_Flow_Data->Process_List);
-       unreg_update_time_window(Update_Time_Window_Hook,
+       if(Control_Flow_Data->Parent_Window != NULL)
+       {
+               unreg_update_time_window(update_time_window_hook,
                                Control_Flow_Data,
-                               Control_Flow_Data->Scrolled_Window_VC->parent);
+                               Control_Flow_Data->Parent_Window);
        
-       unreg_update_current_time(Update_Current_Time_Hook,
+               unreg_update_current_time(update_current_time_hook,
                                Control_Flow_Data,
-                               Control_Flow_Data->Scrolled_Window_VC->parent);
-       
+                               Control_Flow_Data->Parent_Window);
+       }
+       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);
 }
 
-GtkWidget *GuiControlFlow_get_Widget(ControlFlowData *Control_Flow_Data)
+GtkWidget *guicontrolflow_get_widget(ControlFlowData *Control_Flow_Data)
 {
        return Control_Flow_Data->Scrolled_Window_VC ;
 }
 
-ProcessList *GuiControlFlow_get_Process_List
+ProcessList *guicontrolflow_get_process_list
                (ControlFlowData *Control_Flow_Data)
 {
                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;
 }
-LttTime *GuiControlFlow_get_Current_Time(ControlFlowData *Control_Flow_Data)
+LttTime *guicontrolflow_get_current_time(ControlFlowData *Control_Flow_Data)
 {
        return &Control_Flow_Data->Current_Time;
 }