Draw_Item.h attribute name change

git-svn-id: http://ltt.polymtl.ca/svn@391 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h
index 591d1aded20ac2ce66614ceccff4ab0298f155ae..d830b7cb7892ba717d5f6bfd840828e0a1596088 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h
@@ -19,7 +19,7 @@ struct _ControlFlowData {
   TimeWindow time_window;
   LttTime current_time;
   
-  //guint Currently_Selected_Event  ;
+  //guint currently_Selected_Event  ;
   guint number_of_process;
 
 } ;

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
index a8ea21dc023e332a4228e8b912ae8d8db90ae099..19abf8e11116c7b54516c5a3790acad3759202d4 100644 (file)
--- 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);
+  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);
 
   /* 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
   //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;
 }
 
 

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.h b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.h
index fa59641322975d838190195c74084c5b039a6111..208cbf7ed5efe98a5c464a9b41d6ca41cb3078fc 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.h
@@ -11,13 +11,13 @@ typedef struct _ControlFlowData ControlFlowData;
 /* Control Flow Data constructor */
 ControlFlowData *guicontrolflow(void);
 void
-guicontrolflow_destructor_full(ControlFlowData *Control_Flow_Data);
+guicontrolflow_destructor_full(ControlFlowData *control_flow_data);
 void
-guicontrolflow_destructor(ControlFlowData *Control_Flow_Data);
-GtkWidget *guicontrolflow_get_widget(ControlFlowData *Control_Flow_Data);
-ProcessList *guicontrolflow_get_process_list(ControlFlowData *Control_Flow_Data);
-TimeWindow *guicontrolflow_get_time_window(ControlFlowData *Control_Flow_Data);
-LttTime *guicontrolflow_get_current_time(ControlFlowData *Control_Flow_Data);
+guicontrolflow_destructor(ControlFlowData *control_flow_data);
+GtkWidget *guicontrolflow_get_widget(ControlFlowData *control_flow_data);
+ProcessList *guicontrolflow_get_process_list(ControlFlowData *control_flow_data);
+TimeWindow *guicontrolflow_get_time_window(ControlFlowData *control_flow_data);
+LttTime *guicontrolflow_get_current_time(ControlFlowData *control_flow_data);
 
 
 #endif // _CFV_H

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c
index 35be232b3d04594ed06bbcfa62683705cdc474de..0725917a4a6c69f7c6c6e0a404b06a68a3a15814 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c
@@ -111,33 +111,33 @@ gboolean draw_text( void *hook_data, void *call_data)
   pango_font_description_set_size(FontDesc, Properties->size*PANGO_SCALE);
   pango_layout_context_changed(layout);
 
-  pango_layout_set_text(layout, Properties->Text, -1);
+  pango_layout_set_text(layout, Properties->text, -1);
   pango_layout_get_pixel_extents(layout, &ink_rect, NULL);
   switch(Properties->position) {
     case OVER:
               gdk_draw_layout_with_colors(Draw_Context->drawable,
                 Draw_Context->gc,
-                Draw_Context->Current->modify_over->x,
-                Draw_Context->Current->modify_over->y,
+                Draw_Context->current->modify_over->x,
+                Draw_Context->current->modify_over->y,
                 layout, Properties->foreground, Properties->background);
-              Draw_Context->Current->modify_over->x += ink_rect.width;
+              Draw_Context->current->modify_over->x += ink_rect.width;
 
       break;
     case MIDDLE:
               gdk_draw_layout_with_colors(Draw_Context->drawable,
                 Draw_Context->gc,
-                Draw_Context->Current->modify_middle->x,
-                Draw_Context->Current->modify_middle->y,
+                Draw_Context->current->modify_middle->x,
+                Draw_Context->current->modify_middle->y,
                 layout, Properties->foreground, Properties->background);
-              Draw_Context->Current->modify_middle->x += ink_rect.width;
+              Draw_Context->current->modify_middle->x += ink_rect.width;
       break;
     case UNDER:
               gdk_draw_layout_with_colors(Draw_Context->drawable,
                 Draw_Context->gc,
-                Draw_Context->Current->modify_under->x,
-                Draw_Context->Current->modify_under->y,
+                Draw_Context->current->modify_under->x,
+                Draw_Context->current->modify_under->y,
                 layout, Properties->foreground, Properties->background);
-              Draw_Context->Current->modify_under->x += ink_rect.width;
+              Draw_Context->current->modify_under->x += ink_rect.width;
       break;
   }
 
@@ -180,48 +180,48 @@ gboolean draw_icon( void *hook_data, void *call_data)
     case OVER:
               gdk_gc_set_clip_origin(
                   Draw_Context->gc,
-                  Draw_Context->Current->modify_over->x,
-                  Draw_Context->Current->modify_over->y);
+                  Draw_Context->current->modify_over->x,
+                  Draw_Context->current->modify_over->y);
               gdk_draw_drawable(Draw_Context->drawable, 
                   Draw_Context->gc,
                   icon_info->pixmap,
                   0, 0,
-                  Draw_Context->Current->modify_over->x,
-                  Draw_Context->Current->modify_over->y,
+                  Draw_Context->current->modify_over->x,
+                  Draw_Context->current->modify_over->y,
                   Properties->width, Properties->height);
 
-              Draw_Context->Current->modify_over->x += Properties->width;
+              Draw_Context->current->modify_over->x += Properties->width;
 
       break;
     case MIDDLE:
               gdk_gc_set_clip_origin(
                   Draw_Context->gc,
-                  Draw_Context->Current->modify_middle->x,
-                  Draw_Context->Current->modify_middle->y);
+                  Draw_Context->current->modify_middle->x,
+                  Draw_Context->current->modify_middle->y);
               gdk_draw_drawable(Draw_Context->drawable, 
                   Draw_Context->gc,
                   icon_info->pixmap,
                   0, 0,
-                  Draw_Context->Current->modify_middle->x,
-                  Draw_Context->Current->modify_middle->y,
+                  Draw_Context->current->modify_middle->x,
+                  Draw_Context->current->modify_middle->y,
                   Properties->width, Properties->height);
 
-              Draw_Context->Current->modify_middle->x += Properties->width;
+              Draw_Context->current->modify_middle->x += Properties->width;
       break;
     case UNDER:
               gdk_gc_set_clip_origin(
                   Draw_Context->gc,
-                  Draw_Context->Current->modify_under->x,
-                  Draw_Context->Current->modify_under->y);
+                  Draw_Context->current->modify_under->x,
+                  Draw_Context->current->modify_under->y);
               gdk_draw_drawable(Draw_Context->drawable, 
                   Draw_Context->gc,
                   icon_info->pixmap,
                   0, 0,
-                  Draw_Context->Current->modify_under->x,
-                  Draw_Context->Current->modify_under->y,
+                  Draw_Context->current->modify_under->x,
+                  Draw_Context->current->modify_under->y,
                   Properties->width, Properties->height);
 
-              Draw_Context->Current->modify_under->x += Properties->width;
+              Draw_Context->current->modify_under->x += Properties->width;
       break;
   }
 
@@ -250,28 +250,28 @@ gboolean draw_line( void *hook_data, void *call_data)
     case OVER:
               drawing_draw_line(
                 NULL, Draw_Context->drawable,
-                Draw_Context->Previous->over->x,
-                Draw_Context->Previous->over->y,
-                Draw_Context->Current->over->x,
-                Draw_Context->Current->over->y,
+                Draw_Context->previous->over->x,
+                Draw_Context->previous->over->y,
+                Draw_Context->current->over->x,
+                Draw_Context->current->over->y,
                 Draw_Context->gc);
       break;
     case MIDDLE:
               drawing_draw_line(
                 NULL, Draw_Context->drawable,
-                Draw_Context->Previous->middle->x,
-                Draw_Context->Previous->middle->y,
-                Draw_Context->Current->middle->x,
-                Draw_Context->Current->middle->y,
+                Draw_Context->previous->middle->x,
+                Draw_Context->previous->middle->y,
+                Draw_Context->current->middle->x,
+                Draw_Context->current->middle->y,
                 Draw_Context->gc);
       break;
     case UNDER:
               drawing_draw_line(
                 NULL, Draw_Context->drawable,
-                Draw_Context->Previous->under->x,
-                Draw_Context->Previous->under->y,
-                Draw_Context->Current->under->x,
-                Draw_Context->Current->under->y,
+                Draw_Context->previous->under->x,
+                Draw_Context->previous->under->y,
+                Draw_Context->current->under->x,
+                Draw_Context->current->under->y,
                 Draw_Context->gc);
 
       break;
@@ -294,27 +294,27 @@ gboolean draw_arc( void *hook_data, void *call_data)
     case OVER:
       gdk_draw_arc(Draw_Context->drawable, Draw_Context->gc,
               Properties->filled,
-              Draw_Context->Current->modify_over->x,
-              Draw_Context->Current->modify_over->y,
+              Draw_Context->current->modify_over->x,
+              Draw_Context->current->modify_over->y,
               Properties->size, Properties->size, 0, 360*64);
-      Draw_Context->Current->modify_over->x += Properties->size;
+      Draw_Context->current->modify_over->x += Properties->size;
       break;
     case MIDDLE:
       gdk_draw_arc(Draw_Context->drawable, Draw_Context->gc,
               Properties->filled,
-              Draw_Context->Current->modify_middle->x,
-              Draw_Context->Current->modify_middle->y,
+              Draw_Context->current->modify_middle->x,
+              Draw_Context->current->modify_middle->y,
               Properties->size, Properties->size, 0, 360*64);
-      Draw_Context->Current->modify_middle->x += Properties->size;
+      Draw_Context->current->modify_middle->x += Properties->size;
       
       break;
     case UNDER:
       gdk_draw_arc(Draw_Context->drawable, Draw_Context->gc,
               Properties->filled,
-              Draw_Context->Current->modify_under->x,
-              Draw_Context->Current->modify_under->y,
+              Draw_Context->current->modify_under->x,
+              Draw_Context->current->modify_under->y,
               Properties->size, Properties->size, 0, 360*64);
-      Draw_Context->Current->modify_under->x += Properties->size;
+      Draw_Context->current->modify_under->x += Properties->size;
   
       break;
   }
@@ -334,10 +334,10 @@ gboolean draw_bg( void *hook_data, void *call_data)
 
   gdk_draw_rectangle(Draw_Context->drawable, Draw_Context->gc,
           TRUE,
-          Draw_Context->Previous->over->x,
-          Draw_Context->Previous->over->y,
-          Draw_Context->Current->over->x - Draw_Context->Previous->over->x,
-          Draw_Context->Previous->under->y);
+          Draw_Context->previous->over->x,
+          Draw_Context->previous->over->y,
+          Draw_Context->current->over->x - Draw_Context->previous->over->x,
+          Draw_Context->previous->under->y);
 
   return 0;
 }

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.h
index 0a36ddfc6a1fca2a435838a75feb3aeb906c3aba..9f3420522df5d1a2a1ee3623ad6f4edc02ea75f2 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.h
@@ -48,8 +48,8 @@ struct _DrawContext {
   GdkGC   *gc;
   PangoLayout *pango_layout;
 
-  DrawInfo  *Current;
-  DrawInfo  *Previous;
+  DrawInfo  *current;
+  DrawInfo  *previous;
 };
 
 /* LttvExecutionState is accessible through the LttvTracefileState. Is has
@@ -98,8 +98,8 @@ struct _IconStruct {
  * During drawing, only the Hook is needed.
  */
 struct _DrawOperation {
-  DrawableItems Item;
-  LttvHooks *Hook;
+  DrawableItems item;
+  LttvHooks *hook;
 };
 
 /*
@@ -131,7 +131,7 @@ struct _PropertiesText {
   GdkColor  *foreground;
   GdkColor  *background;
   gint    size;
-  gchar   *Text;
+  gchar   *text;
   RelPos    position;
 };
 
@@ -196,7 +196,7 @@ void draw_item( GdkDrawable *drawable,
  */
 void add_operation( LttvIAttribute *attributes,
       gchar *pathname,
-      DrawOperation *Operation);
+      DrawOperation *operation);
 
 /* 
  * The del_operation seeks the array present at pathname (if any) and
@@ -205,7 +205,7 @@ void add_operation( LttvIAttribute *attributes,
  */
 gint del_operation( LttvIAttribute *attributes,
       gchar *pathname,
-      DrawOperation *Operation);
+      DrawOperation *operation);
 
 /* 
  * The clean_operations removes all operations present at a pathname.
@@ -221,7 +221,7 @@ gint clean_operations(  LttvIAttribute *attributes,
  */
 void list_operations( LttvIAttribute *attributes,
       gchar *pathname,
-      GArray **Operation);
+      GArray **operation);
 
 
 
@@ -241,7 +241,7 @@ PropertiesText *properties_text_create(
   GdkColor  *foreground,
   GdkColor  *background,
   gint    size,
-  gchar   *Text,
+  gchar   *text,
   RelPos    position);
 
 PropertiesIcon *properties_icon_create(

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
index 7a116cb933adfb997066d49ccaf73782ba5ddb78..22081aa26ba28d5884bf9cb8225ba35e1c4821fe 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
@@ -57,7 +57,7 @@ void drawing_data_request(Drawing_t *Drawing,
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(
                     Drawing->Drawing_Area_V),
-                "Control_Flow_Data");
+                "control_flow_data");
 
   LttTime start, end;
   LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
@@ -85,15 +85,15 @@ void drawing_data_request(Drawing_t *Drawing,
         get_traceset_context(control_flow_data->mw);
   
     //send_test_process(
-  //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
+  //guicontrolflow_get_process_list(Drawing->control_flow_data),
   //Drawing);
   //send_test_drawing(
-  //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
+  //guicontrolflow_get_process_list(Drawing->control_flow_data),
   //Drawing, *Pixmap, x, y, width, height);
   
   // Let's call processTrace() !!
   EventRequest event_request; // Variable freed at the end of the function.
-  event_request.Control_Flow_Data = control_flow_data;
+  event_request.control_flow_data = control_flow_data;
   event_request.time_begin = start;
   event_request.time_end = end;
   event_request.x_begin = x;
@@ -156,8 +156,8 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
    * has updated the time interval before this configure gets
    * executed.
    */
-  get_time_window(Drawing->Control_Flow_Data->mw,
-        &Drawing->Control_Flow_Data->time_window);
+  get_time_window(Drawing->control_flow_data->mw,
+        &Drawing->control_flow_data->time_window);
   
   /* New Pixmap, size of the configure event */
   //GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
@@ -180,7 +180,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
     widget->allocation.width + SAFETY,
     widget->allocation.height + SAFETY,
     //ProcessList_get_height
-    // (GuiControlFlow_get_process_list(Drawing->Control_Flow_Data)),
+    // (GuiControlFlow_get_process_list(Drawing->control_flow_data)),
     -1);
     Drawing->width = widget->allocation.width;
     Drawing->height = widget->allocation.height;
@@ -280,7 +280,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "Control_Flow_Data");
+                "control_flow_data");
 
   g_critical("drawing expose event");
   
@@ -326,7 +326,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "Control_Flow_Data");
+                "control_flow_data");
   Drawing_t *Drawing = control_flow_data->Drawing;
 
 
@@ -357,12 +357,12 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
 
 
 
-Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data)
+Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
 {
   Drawing_t *Drawing = g_new(Drawing_t, 1);
     
   Drawing->Drawing_Area_V = gtk_drawing_area_new ();
-  Drawing->Control_Flow_Data = Control_Flow_Data;
+  Drawing->control_flow_data = control_flow_data;
 
   Drawing->pango_layout =
     gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, NULL);

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
index 01e906be478b73ed0c824d4c9dd8e20c9b0e9ffd..4f2f509daaa4df709595a0bf18af094152c95e90 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
@@ -38,7 +38,7 @@ typedef struct _Drawing_t Drawing_t;
 struct _Drawing_t {
   GtkWidget *Drawing_Area_V;
   GdkPixmap *Pixmap;
-  ControlFlowData *Control_Flow_Data;
+  ControlFlowData *control_flow_data;
   
   PangoLayout *pango_layout;
 
@@ -46,7 +46,7 @@ struct _Drawing_t {
   
 };
 
-Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data);
+Drawing_t *drawing_construct(ControlFlowData *control_flow_data);
 void drawing_destroy(Drawing_t *Drawing);
 
 GtkWidget *drawing_get_widget(Drawing_t *Drawing);

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
index 6de44ffb055132e41b62e5bd7d65768c13a83da2..f16ed511f21f466ae956948c20645067b26c5c8a 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
@@ -47,16 +47,16 @@ GtkWidget *
 h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * key)
 {
   g_info("h_guicontrolflow, %p, %p, %s", pmParentWindow, s, key);
-  ControlFlowData *Control_Flow_Data = guicontrolflow() ;
+  ControlFlowData *control_flow_data = guicontrolflow() ;
   
-  Control_Flow_Data->mw = pmParentWindow;
-  TimeWindow *time_window = guicontrolflow_get_time_window(Control_Flow_Data);
+  control_flow_data->mw = pmParentWindow;
+  TimeWindow *time_window = guicontrolflow_get_time_window(control_flow_data);
   time_window->start_time.tv_sec = 0;
   time_window->start_time.tv_nsec = 0;
   time_window->time_width.tv_sec = 0;
   time_window->time_width.tv_nsec = 0;
 
-  LttTime *current_time = guicontrolflow_get_current_time(Control_Flow_Data);
+  LttTime *current_time = guicontrolflow_get_current_time(control_flow_data);
   current_time->tv_sec = 0;
   current_time->tv_nsec = 0;
   
@@ -69,25 +69,25 @@ h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * ke
 
   //g_critical("time width2 : %u",time_window->time_width);
   // Unreg done in the GuiControlFlow_Destructor
-  reg_update_time_window(update_time_window_hook, Control_Flow_Data,
+  reg_update_time_window(update_time_window_hook, control_flow_data,
         pmParentWindow);
-  reg_update_current_time(update_current_time_hook, Control_Flow_Data,
+  reg_update_current_time(update_current_time_hook, control_flow_data,
         pmParentWindow);
-  return guicontrolflow_get_widget(Control_Flow_Data) ;
+  return guicontrolflow_get_widget(control_flow_data) ;
   
 }
 
 int event_selected_hook(void *hook_data, void *call_data)
 {
-  ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data;
+  ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
   guint *Event_Number = (guint*) call_data;
 
   g_critical("DEBUG : event selected by main window : %u", *Event_Number);
   
-//  Control_Flow_Data->Currently_Selected_Event = *Event_Number;
-//  Control_Flow_Data->Selected_Event = TRUE ;
+//  control_flow_data->currently_Selected_Event = *Event_Number;
+//  control_flow_data->Selected_Event = TRUE ;
   
-//  tree_v_set_cursor(Control_Flow_Data);
+//  tree_v_set_cursor(control_flow_data);
 
 }
 
@@ -127,7 +127,7 @@ int draw_before_hook(void *hook_data, void *call_data)
 int draw_event_hook(void *hook_data, void *call_data)
 {
   EventRequest *Event_Request = (EventRequest*)hook_data;
-  ControlFlowData *control_flow_data = Event_Request->Control_Flow_Data;
+  ControlFlowData *control_flow_data = Event_Request->control_flow_data;
 
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
@@ -149,7 +149,7 @@ int draw_event_hook(void *hook_data, void *call_data)
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
     ProcessList *process_list =
-      guicontrolflow_get_process_list(Event_Request->Control_Flow_Data);
+      guicontrolflow_get_process_list(Event_Request->control_flow_data);
 
 
     LttField *f = ltt_event_field(e);
@@ -189,7 +189,7 @@ int draw_event_hook(void *hook_data, void *call_data)
             &y_out,
             &height,
             &Hashed_Process_Data_out);
-    drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_out, height);
+    drawing_insert_square( Event_Request->control_flow_data->Drawing, y_out, height);
     }
 
     g_free(name);
@@ -223,7 +223,7 @@ int draw_event_hook(void *hook_data, void *call_data)
             &height,
             &Hashed_Process_Data_in);
 
-      drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_in, height);
+      drawing_insert_square( Event_Request->control_flow_data->Drawing, y_in, height);
     }
     g_free(name);
 
@@ -251,8 +251,8 @@ int draw_event_hook(void *hook_data, void *call_data)
     /* draw what represents the event for outgoing process. */
 
     DrawContext *draw_context_out = Hashed_Process_Data_out->draw_context;
-    draw_context_out->Current->modify_over->x = x;
-    draw_context_out->Current->modify_over->y = y_out;
+    draw_context_out->current->modify_over->x = x;
+    draw_context_out->current->modify_over->y = y_out;
     draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V;
@@ -274,33 +274,33 @@ int draw_event_hook(void *hook_data, void *call_data)
 
     /* Print status of the process : U, WF, WC, E, W, R */
     if(process_out->state->s == LTTV_STATE_UNNAMED)
-      prop_text_out.Text = "U";
+      prop_text_out.text = "U";
     else if(process_out->state->s == LTTV_STATE_WAIT_FORK)
-      prop_text_out.Text = "WF";
+      prop_text_out.text = "WF";
     else if(process_out->state->s == LTTV_STATE_WAIT_CPU)
-      prop_text_out.Text = "WC";
+      prop_text_out.text = "WC";
     else if(process_out->state->s == LTTV_STATE_EXIT)
-      prop_text_out.Text = "E";
+      prop_text_out.text = "E";
     else if(process_out->state->s == LTTV_STATE_WAIT)
-      prop_text_out.Text = "W";
+      prop_text_out.text = "W";
     else if(process_out->state->s == LTTV_STATE_RUN)
-      prop_text_out.Text = "R";
+      prop_text_out.text = "R";
     else
-      prop_text_out.Text = "U";
+      prop_text_out.text = "U";
     
     draw_text((void*)&prop_text_out, (void*)draw_context_out);
     gdk_gc_unref(draw_context_out->gc);
 
     /* Draw the line of the out process */
-    if(draw_context_out->Previous->middle->x == -1)
+    if(draw_context_out->previous->middle->x == -1)
     {
-      draw_context_out->Previous->middle->x = Event_Request->x_begin;
+      draw_context_out->previous->middle->x = Event_Request->x_begin;
       g_critical("out middle x_beg : %u",Event_Request->x_begin);
     }
   
-    draw_context_out->Current->middle->x = x;
-    draw_context_out->Current->middle->y = y_out + height/2;
-    draw_context_out->Previous->middle->y = y_out + height/2;
+    draw_context_out->current->middle->x = x;
+    draw_context_out->current->middle->y = y_out + height/2;
+    draw_context_out->previous->middle->y = y_out + height/2;
     draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     //draw_context_out->gc = widget->style->black_gc;
@@ -365,8 +365,8 @@ int draw_event_hook(void *hook_data, void *call_data)
     /* Finally, update the drawing context of the pid_in. */
 
     DrawContext *draw_context_in = Hashed_Process_Data_in->draw_context;
-    draw_context_in->Current->modify_over->x = x;
-    draw_context_in->Current->modify_over->y = y_in;
+    draw_context_in->current->modify_over->x = x;
+    draw_context_in->current->modify_over->y = y_in;
     draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     widget = control_flow_data->Drawing->Drawing_Area_V;
@@ -388,33 +388,33 @@ int draw_event_hook(void *hook_data, void *call_data)
 
     /* Print status of the process : U, WF, WC, E, W, R */
     if(process_in->state->s == LTTV_STATE_UNNAMED)
-      prop_text_in.Text = "U";
+      prop_text_in.text = "U";
     else if(process_in->state->s == LTTV_STATE_WAIT_FORK)
-      prop_text_in.Text = "WF";
+      prop_text_in.text = "WF";
     else if(process_in->state->s == LTTV_STATE_WAIT_CPU)
-      prop_text_in.Text = "WC";
+      prop_text_in.text = "WC";
     else if(process_in->state->s == LTTV_STATE_EXIT)
-      prop_text_in.Text = "E";
+      prop_text_in.text = "E";
     else if(process_in->state->s == LTTV_STATE_WAIT)
-      prop_text_in.Text = "W";
+      prop_text_in.text = "W";
     else if(process_in->state->s == LTTV_STATE_RUN)
-      prop_text_in.Text = "R";
+      prop_text_in.text = "R";
     else
-      prop_text_in.Text = "U";
+      prop_text_in.text = "U";
     
     draw_text((void*)&prop_text_in, (void*)draw_context_in);
     gdk_gc_unref(draw_context_in->gc);
     
     /* Draw the line of the in process */
-    if(draw_context_in->Previous->middle->x == -1)
+    if(draw_context_in->previous->middle->x == -1)
     {
-      draw_context_in->Previous->middle->x = Event_Request->x_begin;
+      draw_context_in->previous->middle->x = Event_Request->x_begin;
       g_critical("in middle x_beg : %u",Event_Request->x_begin);
     }
   
-    draw_context_in->Current->middle->x = x;
-    draw_context_in->Previous->middle->y = y_in + height/2;
-    draw_context_in->Current->middle->y = y_in + height/2;
+    draw_context_in->current->middle->x = x;
+    draw_context_in->previous->middle->y = y_in + height/2;
+    draw_context_in->current->middle->y = y_in + height/2;
     draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     //draw_context_in->gc = widget->style->black_gc;
@@ -504,7 +504,7 @@ int draw_event_hook(void *hook_data, void *call_data)
 int draw_after_hook(void *hook_data, void *call_data)
 {
   EventRequest *Event_Request = (EventRequest*)hook_data;
-  ControlFlowData *control_flow_data = Event_Request->Control_Flow_Data;
+  ControlFlowData *control_flow_data = Event_Request->control_flow_data;
 
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
@@ -526,7 +526,7 @@ int draw_after_hook(void *hook_data, void *call_data)
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
     ProcessList *process_list =
-      guicontrolflow_get_process_list(Event_Request->Control_Flow_Data);
+      guicontrolflow_get_process_list(Event_Request->control_flow_data);
 
 
     LttField *f = ltt_event_field(e);
@@ -566,7 +566,7 @@ int draw_after_hook(void *hook_data, void *call_data)
             &y_out,
             &height,
             &Hashed_Process_Data_out);
-    drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_out, height);
+    drawing_insert_square( Event_Request->control_flow_data->Drawing, y_out, height);
     }
 
     g_free(name);
@@ -600,7 +600,7 @@ int draw_after_hook(void *hook_data, void *call_data)
             &height,
             &Hashed_Process_Data_in);
 
-      drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_in, height);
+      drawing_insert_square( Event_Request->control_flow_data->Drawing, y_in, height);
     }
     g_free(name);
 
@@ -628,8 +628,8 @@ int draw_after_hook(void *hook_data, void *call_data)
     /* draw what represents the event for outgoing process. */
 
     DrawContext *draw_context_out = Hashed_Process_Data_out->draw_context;
-    //draw_context_out->Current->modify_over->x = x;
-    draw_context_out->Current->modify_over->y = y_out;
+    //draw_context_out->current->modify_over->x = x;
+    draw_context_out->current->modify_over->y = y_out;
     draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V;
@@ -649,62 +649,62 @@ int draw_after_hook(void *hook_data, void *call_data)
 
     /* Print status of the process : U, WF, WC, E, W, R */
     if(process_out->state->s == LTTV_STATE_UNNAMED)
-      prop_text_out.Text = "U";
+      prop_text_out.text = "U";
     else if(process_out->state->s == LTTV_STATE_WAIT_FORK)
-      prop_text_out.Text = "WF";
+      prop_text_out.text = "WF";
     else if(process_out->state->s == LTTV_STATE_WAIT_CPU)
-      prop_text_out.Text = "WC";
+      prop_text_out.text = "WC";
     else if(process_out->state->s == LTTV_STATE_EXIT)
-      prop_text_out.Text = "E";
+      prop_text_out.text = "E";
     else if(process_out->state->s == LTTV_STATE_WAIT)
-      prop_text_out.Text = "W";
+      prop_text_out.text = "W";
     else if(process_out->state->s == LTTV_STATE_RUN)
-      prop_text_out.Text = "R";
+      prop_text_out.text = "R";
     else
-      prop_text_out.Text = "U";
+      prop_text_out.text = "U";
     
     draw_text((void*)&prop_text_out, (void*)draw_context_out);
 
-    draw_context_out->Current->middle->y = y_out+height/2;
-    draw_context_out->Current->status = process_out->state->s;
+    draw_context_out->current->middle->y = y_out+height/2;
+    draw_context_out->current->status = process_out->state->s;
     
-    /* for pid_out : remove Previous, Prev = Current, new Current (default) */
-    g_free(draw_context_out->Previous->modify_under);
-    g_free(draw_context_out->Previous->modify_middle);
-    g_free(draw_context_out->Previous->modify_over);
-    g_free(draw_context_out->Previous->under);
-    g_free(draw_context_out->Previous->middle);
-    g_free(draw_context_out->Previous->over);
-    g_free(draw_context_out->Previous);
-
-    draw_context_out->Previous = draw_context_out->Current;
+    /* for pid_out : remove previous, Prev = current, new current (default) */
+    g_free(draw_context_out->previous->modify_under);
+    g_free(draw_context_out->previous->modify_middle);
+    g_free(draw_context_out->previous->modify_over);
+    g_free(draw_context_out->previous->under);
+    g_free(draw_context_out->previous->middle);
+    g_free(draw_context_out->previous->over);
+    g_free(draw_context_out->previous);
+
+    draw_context_out->previous = draw_context_out->current;
     
-    draw_context_out->Current = g_new(DrawInfo,1);
-    draw_context_out->Current->over = g_new(ItemInfo,1);
-    draw_context_out->Current->over->x = -1;
-    draw_context_out->Current->over->y = -1;
-    draw_context_out->Current->middle = g_new(ItemInfo,1);
-    draw_context_out->Current->middle->x = -1;
-    draw_context_out->Current->middle->y = -1;
-    draw_context_out->Current->under = g_new(ItemInfo,1);
-    draw_context_out->Current->under->x = -1;
-    draw_context_out->Current->under->y = -1;
-    draw_context_out->Current->modify_over = g_new(ItemInfo,1);
-    draw_context_out->Current->modify_over->x = -1;
-    draw_context_out->Current->modify_over->y = -1;
-    draw_context_out->Current->modify_middle = g_new(ItemInfo,1);
-    draw_context_out->Current->modify_middle->x = -1;
-    draw_context_out->Current->modify_middle->y = -1;
-    draw_context_out->Current->modify_under = g_new(ItemInfo,1);
-    draw_context_out->Current->modify_under->x = -1;
-    draw_context_out->Current->modify_under->y = -1;
-    draw_context_out->Current->status = LTTV_STATE_UNNAMED;
+    draw_context_out->current = g_new(DrawInfo,1);
+    draw_context_out->current->over = g_new(ItemInfo,1);
+    draw_context_out->current->over->x = -1;
+    draw_context_out->current->over->y = -1;
+    draw_context_out->current->middle = g_new(ItemInfo,1);
+    draw_context_out->current->middle->x = -1;
+    draw_context_out->current->middle->y = -1;
+    draw_context_out->current->under = g_new(ItemInfo,1);
+    draw_context_out->current->under->x = -1;
+    draw_context_out->current->under->y = -1;
+    draw_context_out->current->modify_over = g_new(ItemInfo,1);
+    draw_context_out->current->modify_over->x = -1;
+    draw_context_out->current->modify_over->y = -1;
+    draw_context_out->current->modify_middle = g_new(ItemInfo,1);
+    draw_context_out->current->modify_middle->x = -1;
+    draw_context_out->current->modify_middle->y = -1;
+    draw_context_out->current->modify_under = g_new(ItemInfo,1);
+    draw_context_out->current->modify_under->x = -1;
+    draw_context_out->current->modify_under->y = -1;
+    draw_context_out->current->status = LTTV_STATE_UNNAMED;
       
     /* Finally, update the drawing context of the pid_in. */
 
     DrawContext *draw_context_in = Hashed_Process_Data_in->draw_context;
-    //draw_context_in->Current->modify_over->x = x;
-    draw_context_in->Current->modify_over->y = y_in;
+    //draw_context_in->current->modify_over->x = x;
+    draw_context_in->current->modify_over->y = y_in;
     draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     widget = control_flow_data->Drawing->Drawing_Area_V;
@@ -724,56 +724,56 @@ int draw_after_hook(void *hook_data, void *call_data)
 
     /* Print status of the process : U, WF, WC, E, W, R */
     if(process_in->state->s == LTTV_STATE_UNNAMED)
-      prop_text_in.Text = "U";
+      prop_text_in.text = "U";
     else if(process_in->state->s == LTTV_STATE_WAIT_FORK)
-      prop_text_in.Text = "WF";
+      prop_text_in.text = "WF";
     else if(process_in->state->s == LTTV_STATE_WAIT_CPU)
-      prop_text_in.Text = "WC";
+      prop_text_in.text = "WC";
     else if(process_in->state->s == LTTV_STATE_EXIT)
-      prop_text_in.Text = "E";
+      prop_text_in.text = "E";
     else if(process_in->state->s == LTTV_STATE_WAIT)
-      prop_text_in.Text = "W";
+      prop_text_in.text = "W";
     else if(process_in->state->s == LTTV_STATE_RUN)
-      prop_text_in.Text = "R";
+      prop_text_in.text = "R";
     else
-      prop_text_in.Text = "U";
+      prop_text_in.text = "U";
     
     draw_text((void*)&prop_text_in, (void*)draw_context_in);
     
-    draw_context_in->Current->middle->y = y_in+height/2;
-    draw_context_in->Current->status = process_in->state->s;
-
-    /* for pid_in : remove Previous, Prev = Current, new Current (default) */
-    g_free(draw_context_in->Previous->modify_under);
-    g_free(draw_context_in->Previous->modify_middle);
-    g_free(draw_context_in->Previous->modify_over);
-    g_free(draw_context_in->Previous->under);
-    g_free(draw_context_in->Previous->middle);
-    g_free(draw_context_in->Previous->over);
-    g_free(draw_context_in->Previous);
-
-    draw_context_in->Previous = draw_context_in->Current;
+    draw_context_in->current->middle->y = y_in+height/2;
+    draw_context_in->current->status = process_in->state->s;
+
+    /* for pid_in : remove previous, Prev = current, new current (default) */
+    g_free(draw_context_in->previous->modify_under);
+    g_free(draw_context_in->previous->modify_middle);
+    g_free(draw_context_in->previous->modify_over);
+    g_free(draw_context_in->previous->under);
+    g_free(draw_context_in->previous->middle);
+    g_free(draw_context_in->previous->over);
+    g_free(draw_context_in->previous);
+
+    draw_context_in->previous = draw_context_in->current;
     
-    draw_context_in->Current = g_new(DrawInfo,1);
-    draw_context_in->Current->over = g_new(ItemInfo,1);
-    draw_context_in->Current->over->x = -1;
-    draw_context_in->Current->over->y = -1;
-    draw_context_in->Current->middle = g_new(ItemInfo,1);
-    draw_context_in->Current->middle->x = -1;
-    draw_context_in->Current->middle->y = -1;
-    draw_context_in->Current->under = g_new(ItemInfo,1);
-    draw_context_in->Current->under->x = -1;
-    draw_context_in->Current->under->y = -1;
-    draw_context_in->Current->modify_over = g_new(ItemInfo,1);
-    draw_context_in->Current->modify_over->x = -1;
-    draw_context_in->Current->modify_over->y = -1;
-    draw_context_in->Current->modify_middle = g_new(ItemInfo,1);
-    draw_context_in->Current->modify_middle->x = -1;
-    draw_context_in->Current->modify_middle->y = -1;
-    draw_context_in->Current->modify_under = g_new(ItemInfo,1);
-    draw_context_in->Current->modify_under->x = -1;
-    draw_context_in->Current->modify_under->y = -1;
-    draw_context_in->Current->status = LTTV_STATE_UNNAMED;
+    draw_context_in->current = g_new(DrawInfo,1);
+    draw_context_in->current->over = g_new(ItemInfo,1);
+    draw_context_in->current->over->x = -1;
+    draw_context_in->current->over->y = -1;
+    draw_context_in->current->middle = g_new(ItemInfo,1);
+    draw_context_in->current->middle->x = -1;
+    draw_context_in->current->middle->y = -1;
+    draw_context_in->current->under = g_new(ItemInfo,1);
+    draw_context_in->current->under->x = -1;
+    draw_context_in->current->under->y = -1;
+    draw_context_in->current->modify_over = g_new(ItemInfo,1);
+    draw_context_in->current->modify_over->x = -1;
+    draw_context_in->current->modify_over->y = -1;
+    draw_context_in->current->modify_middle = g_new(ItemInfo,1);
+    draw_context_in->current->modify_middle->x = -1;
+    draw_context_in->current->modify_middle->y = -1;
+    draw_context_in->current->modify_under = g_new(ItemInfo,1);
+    draw_context_in->current->modify_under->x = -1;
+    draw_context_in->current->modify_under->y = -1;
+    draw_context_in->current->status = LTTV_STATE_UNNAMED;
   
   }
 
@@ -995,7 +995,7 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   LttTime trace_start = tsc->Time_Span->startTime;
   LttTime trace_end = tsc->Time_Span->endTime;
   
-  g_info("New Current time HOOK : %u, %u", current_time->tv_sec,
+  g_info("New current time HOOK : %u, %u", current_time->tv_sec,
               current_time->tv_nsec);
 
 
@@ -1054,7 +1054,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   ClosureData *closure_data = (ClosureData*)user_data;
     
   ControlFlowData *control_flow_data =
-    closure_data->event_request->Control_Flow_Data;
+    closure_data->event_request->control_flow_data;
   
   GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V;
 
@@ -1077,15 +1077,15 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   
   /* Draw the closing line */
   DrawContext *draw_context = hashed_process_data->draw_context;
-  if(draw_context->Previous->middle->x == -1)
+  if(draw_context->previous->middle->x == -1)
   {
-    draw_context->Previous->middle->x = closure_data->event_request->x_begin;
+    draw_context->previous->middle->x = closure_data->event_request->x_begin;
     g_critical("out middle x_beg : %u",closure_data->event_request->x_begin);
   }
 
-  draw_context->Current->middle->x = closure_data->event_request->x_end;
-  draw_context->Current->middle->y = y + height/2;
-  draw_context->Previous->middle->y = y + height/2;
+  draw_context->current->middle->x = closure_data->event_request->x_end;
+  draw_context->current->middle->y = y + height/2;
+  draw_context->previous->middle->y = y + height/2;
   draw_context->drawable = control_flow_data->Drawing->Pixmap;
   draw_context->pango_layout = control_flow_data->Drawing->pango_layout;
   //draw_context->gc = widget->style->black_gc;
@@ -1151,32 +1151,32 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   hashed_process_data->draw_context->drawable = NULL;
   hashed_process_data->draw_context->gc = NULL;
   hashed_process_data->draw_context->pango_layout = NULL;
-  hashed_process_data->draw_context->Current->over->x = -1;
-  hashed_process_data->draw_context->Current->over->y = -1;
-  hashed_process_data->draw_context->Current->middle->x = -1;
-  hashed_process_data->draw_context->Current->middle->y = -1;
-  hashed_process_data->draw_context->Current->under->x = -1;
-  hashed_process_data->draw_context->Current->under->y = -1;
-  hashed_process_data->draw_context->Current->modify_over->x = -1;
-  hashed_process_data->draw_context->Current->modify_over->y = -1;
-  hashed_process_data->draw_context->Current->modify_middle->x = -1;
-  hashed_process_data->draw_context->Current->modify_middle->y = -1;
-  hashed_process_data->draw_context->Current->modify_under->x = -1;
-  hashed_process_data->draw_context->Current->modify_under->y = -1;
-  hashed_process_data->draw_context->Current->status = LTTV_STATE_UNNAMED;
-  hashed_process_data->draw_context->Previous->over->x = -1;
-  hashed_process_data->draw_context->Previous->over->y = -1;
-  hashed_process_data->draw_context->Previous->middle->x = -1;
-  hashed_process_data->draw_context->Previous->middle->y = -1;
-  hashed_process_data->draw_context->Previous->under->x = -1;
-  hashed_process_data->draw_context->Previous->under->y = -1;
-  hashed_process_data->draw_context->Previous->modify_over->x = -1;
-  hashed_process_data->draw_context->Previous->modify_over->y = -1;
-  hashed_process_data->draw_context->Previous->modify_middle->x = -1;
-  hashed_process_data->draw_context->Previous->modify_middle->y = -1;
-  hashed_process_data->draw_context->Previous->modify_under->x = -1;
-  hashed_process_data->draw_context->Previous->modify_under->y = -1;
-  hashed_process_data->draw_context->Previous->status = LTTV_STATE_UNNAMED;
+  hashed_process_data->draw_context->current->over->x = -1;
+  hashed_process_data->draw_context->current->over->y = -1;
+  hashed_process_data->draw_context->current->middle->x = -1;
+  hashed_process_data->draw_context->current->middle->y = -1;
+  hashed_process_data->draw_context->current->under->x = -1;
+  hashed_process_data->draw_context->current->under->y = -1;
+  hashed_process_data->draw_context->current->modify_over->x = -1;
+  hashed_process_data->draw_context->current->modify_over->y = -1;
+  hashed_process_data->draw_context->current->modify_middle->x = -1;
+  hashed_process_data->draw_context->current->modify_middle->y = -1;
+  hashed_process_data->draw_context->current->modify_under->x = -1;
+  hashed_process_data->draw_context->current->modify_under->y = -1;
+  hashed_process_data->draw_context->current->status = LTTV_STATE_UNNAMED;
+  hashed_process_data->draw_context->previous->over->x = -1;
+  hashed_process_data->draw_context->previous->over->y = -1;
+  hashed_process_data->draw_context->previous->middle->x = -1;
+  hashed_process_data->draw_context->previous->middle->y = -1;
+  hashed_process_data->draw_context->previous->under->x = -1;
+  hashed_process_data->draw_context->previous->under->y = -1;
+  hashed_process_data->draw_context->previous->modify_over->x = -1;
+  hashed_process_data->draw_context->previous->modify_over->y = -1;
+  hashed_process_data->draw_context->previous->modify_middle->x = -1;
+  hashed_process_data->draw_context->previous->modify_middle->y = -1;
+  hashed_process_data->draw_context->previous->modify_under->x = -1;
+  hashed_process_data->draw_context->previous->modify_under->y = -1;
+  hashed_process_data->draw_context->previous->status = LTTV_STATE_UNNAMED;
   
 
 }
@@ -1189,10 +1189,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
 int  after_data_request(void *hook_data, void *call_data)
 {
   EventRequest *Event_Request = (EventRequest*)hook_data;
-  ControlFlowData *control_flow_data = Event_Request->Control_Flow_Data;
+  ControlFlowData *control_flow_data = Event_Request->control_flow_data;
   
   ProcessList *process_list =
-    guicontrolflow_get_process_list(Event_Request->Control_Flow_Data);
+    guicontrolflow_get_process_list(Event_Request->control_flow_data);
 
   ClosureData closure_data;
   closure_data.event_request = (EventRequest*)hook_data;

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h
index 8d615a4710d807b1d0f78826f72aa961d05609bc..d7ca7453f6c85828593d5d0f609e361bbb0dce50 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h
@@ -22,7 +22,7 @@
  */
 typedef struct _EventRequest
 {
-  ControlFlowData *Control_Flow_Data;
+  ControlFlowData *control_flow_data;
   LttTime time_begin, time_end;
   gint  x_begin, x_end;
   /* Fill the Events_Context during the initial expose, before calling for

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
index 1ae7db4ef9cfbf562ffffee81deeb7e0826f9196..d86c2ddff443c874feb694aa1d864974f51f0f75 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
@@ -315,46 +315,46 @@ int processlist_add(  ProcessList *process_list,
   Hashed_Process_Data->draw_context->drawable = NULL;
   Hashed_Process_Data->draw_context->gc = NULL;
   Hashed_Process_Data->draw_context->pango_layout = NULL;
-  Hashed_Process_Data->draw_context->Current = g_new(DrawInfo,1);
-  Hashed_Process_Data->draw_context->Current->over = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->over->x = -1;
-  Hashed_Process_Data->draw_context->Current->over->y = -1;
-  Hashed_Process_Data->draw_context->Current->middle = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->middle->x = -1;
-  Hashed_Process_Data->draw_context->Current->middle->y = -1;
-  Hashed_Process_Data->draw_context->Current->under = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->under->x = -1;
-  Hashed_Process_Data->draw_context->Current->under->y = -1;
-  Hashed_Process_Data->draw_context->Current->modify_over = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->modify_over->x = -1;
-  Hashed_Process_Data->draw_context->Current->modify_over->y = -1;
-  Hashed_Process_Data->draw_context->Current->modify_middle = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->modify_middle->x = -1;
-  Hashed_Process_Data->draw_context->Current->modify_middle->y = -1;
-  Hashed_Process_Data->draw_context->Current->modify_under = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Current->modify_under->x = -1;
-  Hashed_Process_Data->draw_context->Current->modify_under->y = -1;
-  Hashed_Process_Data->draw_context->Current->status = LTTV_STATE_UNNAMED;
-  Hashed_Process_Data->draw_context->Previous = g_new(DrawInfo,1);
-  Hashed_Process_Data->draw_context->Previous->over = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->over->x = -1;
-  Hashed_Process_Data->draw_context->Previous->over->y = -1;
-  Hashed_Process_Data->draw_context->Previous->middle = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->middle->x = -1;
-  Hashed_Process_Data->draw_context->Previous->middle->y = -1;
-  Hashed_Process_Data->draw_context->Previous->under = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->under->x = -1;
-  Hashed_Process_Data->draw_context->Previous->under->y = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_over = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->modify_over->x = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_over->y = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_middle = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->modify_middle->x = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_middle->y = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_under = g_new(ItemInfo,1);
-  Hashed_Process_Data->draw_context->Previous->modify_under->x = -1;
-  Hashed_Process_Data->draw_context->Previous->modify_under->y = -1;
-  Hashed_Process_Data->draw_context->Previous->status = LTTV_STATE_UNNAMED;
+  Hashed_Process_Data->draw_context->current = g_new(DrawInfo,1);
+  Hashed_Process_Data->draw_context->current->over = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->over->x = -1;
+  Hashed_Process_Data->draw_context->current->over->y = -1;
+  Hashed_Process_Data->draw_context->current->middle = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->middle->x = -1;
+  Hashed_Process_Data->draw_context->current->middle->y = -1;
+  Hashed_Process_Data->draw_context->current->under = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->under->x = -1;
+  Hashed_Process_Data->draw_context->current->under->y = -1;
+  Hashed_Process_Data->draw_context->current->modify_over = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->modify_over->x = -1;
+  Hashed_Process_Data->draw_context->current->modify_over->y = -1;
+  Hashed_Process_Data->draw_context->current->modify_middle = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->modify_middle->x = -1;
+  Hashed_Process_Data->draw_context->current->modify_middle->y = -1;
+  Hashed_Process_Data->draw_context->current->modify_under = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->current->modify_under->x = -1;
+  Hashed_Process_Data->draw_context->current->modify_under->y = -1;
+  Hashed_Process_Data->draw_context->current->status = LTTV_STATE_UNNAMED;
+  Hashed_Process_Data->draw_context->previous = g_new(DrawInfo,1);
+  Hashed_Process_Data->draw_context->previous->over = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->over->x = -1;
+  Hashed_Process_Data->draw_context->previous->over->y = -1;
+  Hashed_Process_Data->draw_context->previous->middle = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->middle->x = -1;
+  Hashed_Process_Data->draw_context->previous->middle->y = -1;
+  Hashed_Process_Data->draw_context->previous->under = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->under->x = -1;
+  Hashed_Process_Data->draw_context->previous->under->y = -1;
+  Hashed_Process_Data->draw_context->previous->modify_over = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->modify_over->x = -1;
+  Hashed_Process_Data->draw_context->previous->modify_over->y = -1;
+  Hashed_Process_Data->draw_context->previous->modify_middle = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->modify_middle->x = -1;
+  Hashed_Process_Data->draw_context->previous->modify_middle->y = -1;
+  Hashed_Process_Data->draw_context->previous->modify_under = g_new(ItemInfo,1);
+  Hashed_Process_Data->draw_context->previous->modify_under->x = -1;
+  Hashed_Process_Data->draw_context->previous->modify_under->y = -1;
+  Hashed_Process_Data->draw_context->previous->status = LTTV_STATE_UNNAMED;
   
   /* Add a new row to the model */
   gtk_list_store_append ( process_list->Store_M, &iter);
@@ -418,20 +418,20 @@ int processlist_remove( ProcessList *process_list,
 
     gtk_list_store_remove (process_list->Store_M, &iter);
     
-    g_free(Hashed_Process_Data->draw_context->Previous->modify_under);
-    g_free(Hashed_Process_Data->draw_context->Previous->modify_middle);
-    g_free(Hashed_Process_Data->draw_context->Previous->modify_over);
-    g_free(Hashed_Process_Data->draw_context->Previous->under);
-    g_free(Hashed_Process_Data->draw_context->Previous->middle);
-    g_free(Hashed_Process_Data->draw_context->Previous->over);
-    g_free(Hashed_Process_Data->draw_context->Previous);
-    g_free(Hashed_Process_Data->draw_context->Current->modify_under);
-    g_free(Hashed_Process_Data->draw_context->Current->modify_middle);
-    g_free(Hashed_Process_Data->draw_context->Current->modify_over);
-    g_free(Hashed_Process_Data->draw_context->Current->under);
-    g_free(Hashed_Process_Data->draw_context->Current->middle);
-    g_free(Hashed_Process_Data->draw_context->Current->over);
-    g_free(Hashed_Process_Data->draw_context->Current);
+    g_free(Hashed_Process_Data->draw_context->previous->modify_under);
+    g_free(Hashed_Process_Data->draw_context->previous->modify_middle);
+    g_free(Hashed_Process_Data->draw_context->previous->modify_over);
+    g_free(Hashed_Process_Data->draw_context->previous->under);
+    g_free(Hashed_Process_Data->draw_context->previous->middle);
+    g_free(Hashed_Process_Data->draw_context->previous->over);
+    g_free(Hashed_Process_Data->draw_context->previous);
+    g_free(Hashed_Process_Data->draw_context->current->modify_under);
+    g_free(Hashed_Process_Data->draw_context->current->modify_middle);
+    g_free(Hashed_Process_Data->draw_context->current->modify_over);
+    g_free(Hashed_Process_Data->draw_context->current->under);
+    g_free(Hashed_Process_Data->draw_context->current->middle);
+    g_free(Hashed_Process_Data->draw_context->current->over);
+    g_free(Hashed_Process_Data->draw_context->current);
     g_free(Hashed_Process_Data->draw_context);
     g_free(Hashed_Process_Data);
 

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old b/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old
index 11250b2edf692993478ae0637439002cd52a2c02..9f61f02ea3a508647a16ba75ef9bb4b61351fb97 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old
@@ -3,17 +3,17 @@
  *****************************************************************************/
 void expose_event_cb (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
 {
-       ControlFlowData *Control_Flow_Data = (ControlFlowData*)data;
+       ControlFlowData *control_flow_data = (ControlFlowData*)data;
 
        EventRequest *Event_Request = g_new(sizeof(EventRequest));
        
-       Event_Request->Control_Flow_Data = Control_Flow_Data;
+       Event_Request->control_flow_data = control_flow_data;
        
        /* Calculate, from pixels in expose, the time interval to get data */
        
        get_time_from_pixels(expose->area.x, expose->area.width,
-                                                                                                       Control_Flow_Data->Drawing_Area_Info.width,
-                                                                                                       &Control_Flow_Data->Begin_Time, &Control_Flow_Data->End_Time,
+                                                                                                       control_flow_data->Drawing_Area_Info.width,
+                                                                                                       &control_flow_data->Begin_Time, &control_flow_data->End_Time,
                                                                                                        &Event_Request->time_begin, &Event_Request->time_end)
        
        /* Look in statistics of the trace the processes present during the
@@ -23,7 +23,7 @@ void expose_event_cb (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
         */
        
        /* Call the reading API to have events sent to drawing hooks */
-       lttv_trace_set_process( Control_Flow_Data->Trace_Set,
+       lttv_trace_set_process( control_flow_data->Trace_Set,
                                                                                                        Draw_Before_Hooks,
                                                                                                        Draw_Event_Hooks,
                                                                                                        Draw_After_Hooks,
@@ -36,13 +36,13 @@ void expose_event_cb (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
 
 void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
 {
-       ControlFlowData *Control_Flow_Data = (ControlFlowData*)data;
+       ControlFlowData *control_flow_data = (ControlFlowData*)data;
        GtkTreePath *Tree_Path;
 
        g_critical("DEBUG : scroll signal, value : %f", adjustment->value);
        
-       //get_test_data((int)adjustment->value, Control_Flow_Data->Num_Visible_Events, 
-       //                                                               Control_Flow_Data);
+       //get_test_data((int)adjustment->value, control_flow_data->Num_Visible_Events, 
+       //                                                               control_flow_data);
        
        
 

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old b/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old
index 6bdb9531411e7769e8f7175bb0f8694ef2df488c..20fa275f90f5ce481efeb87d6a2604cba9ecf52b 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old
@@ -39,7 +39,7 @@ typedef struct _ltt_time_interval
  */
 typedef struct _EventRequest
 {
-       ControlFlowData *Control_Flow_Data;
+       ControlFlowData *control_flow_data;
        ltt_time time_begin, time_end;
        /* Fill the Events_Context during the initial expose, before calling for
         * events.
@@ -57,7 +57,7 @@ GtkWidget *hGuiControlFlow(GtkWidget *pmParentWindow);
 //! Control Flow Viewer's constructor
 ControlFlowData *GuiControlFlow(void);
 //! Control Flow Viewer's destructor
-void GuiControlFlow_Destructor(ControlFlowData *Control_Flow_Data);
+void GuiControlFlow_Destructor(ControlFlowData *control_flow_data);
 
 
 static int Event_Selected_Hook(void *hook_data, void *call_data);
@@ -72,8 +72,8 @@ Draw_Event_Hook(void *hook_data, void *call_data)
 Draw_After_Hook(void *hook_data, void *call_data)
 
 
-//void Tree_V_set_cursor(ControlFlowData *Control_Flow_Data);
-//void Tree_V_get_cursor(ControlFlowData *Control_Flow_Data);
+//void Tree_V_set_cursor(ControlFlowData *control_flow_data);
+//void Tree_V_get_cursor(ControlFlowData *control_flow_data);
 
 /* Prototype for selection handler callback */
 //static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data);
@@ -85,15 +85,15 @@ static void v_scroll_cb (GtkAdjustment *adjustment, gpointer data);
 
 static void expose_event_cb (GtkWidget *widget, GdkEventExpose *expose, gpointer data);
 
-void add_test_process(ControlFlowData *Control_Flow_Data);
+void add_test_process(ControlFlowData *control_flow_data);
 
 static void get_test_data(guint Event_Number, guint List_Height, 
-                                                                        ControlFlowData *Control_Flow_Data);
+                                                                        ControlFlowData *control_flow_data);
 
-void add_test_data(ControlFlowData *Control_Flow_Data);
-void test_draw(ControlFlowData *Control_Flow_Data);
+void add_test_data(ControlFlowData *control_flow_data);
+void test_draw(ControlFlowData *control_flow_data);
 
-void Drawing_Area_Init(ControlFlowData *Control_Flow_Data);
+void Drawing_Area_Init(ControlFlowData *control_flow_data);
 
 
 /*\@}*/

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
index 7e5ab92ec2ab172bdfa7fae0b6364607090f02b2..216688fb380bc19e8f5395472c5820811f6c6858 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c
@@ -34,7 +34,7 @@ static LttvModule *Main_Win_Module;
 
 
 /** Array containing instanced objects. Used when module is unloaded */
-GSList *gControl_Flow_Data_List = NULL ;
+GSList *g_control_flow_data_list = NULL ;
 
 
 
@@ -87,9 +87,9 @@ G_MODULE_EXPORT void destroy() {
   g_info("GUI Control Flow Viewer destroy()");
   int i;
 
-  g_slist_foreach(gControl_Flow_Data_List, destroy_walk, NULL );
+  g_slist_foreach(g_control_flow_data_list, destroy_walk, NULL );
   
-  g_slist_free(gControl_Flow_Data_List);
+  g_slist_free(g_control_flow_data_list);
 
   /* Unregister the toolbar insert button */
   toolbar_item_unreg(h_guicontrolflow);

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/test.c b/ltt/branches/poly/lttv/modules/guiControlFlow/test.c
index 4fb61eb4e1991d0b2a6ee7df466d2bfa5c22675e..7fcd2fcd3ba1a559624dfe85d811a0c3ea378280 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/test.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/test.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv)
        GtkWidget *CF_Viewer;
        GtkWidget *VBox_V;
        GtkWidget *HScroll_VC;
-       ControlFlowData *Control_Flow_Data;
+       ControlFlowData *control_flow_data;
        guint ev_sel = 444 ;
        /* Horizontal scrollbar and it's adjustment */
        GtkWidget *VScroll_VC;
@@ -44,8 +44,8 @@ int main(int argc, char **argv)
   //ListViewer = hGuiEvents(Window);
   //gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, FALSE, TRUE, 0);
        
-       Control_Flow_Data = guicontrolflow();
-       CF_Viewer = Control_Flow_Data->scrolled_window;
+       control_flow_data = guicontrolflow();
+       CF_Viewer = control_flow_data->scrolled_window;
   gtk_box_pack_start(GTK_BOX(VBox_V), CF_Viewer, TRUE, TRUE, 0);
 
   /* Create horizontal scrollbar and pack it */
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
   gtk_widget_show (VBox_V);
        gtk_widget_show (Window);
 
-       //Event_Selected_Hook(Control_Flow_Data, &ev_sel);
+       //Event_Selected_Hook(control_flow_data, &ev_sel);
        
        gtk_main ();
 
@@ -73,17 +73,17 @@ int main(int argc, char **argv)
 
 
 
-void add_test_process(ControlFlowData *Control_Flow_Data)
+void add_test_process(ControlFlowData *control_flow_data)
 {
        GtkTreeIter iter;
        int i;
        gchar *process[] = { "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten" };
 
-       for(i=0; i<Control_Flow_Data->number_of_process; i++)
+       for(i=0; i<control_flow_data->number_of_process; i++)
        {
          /* Add a new row to the model */
-               gtk_list_store_append (Control_Flow_Data->Store_M, &iter);
-               gtk_list_store_set (    Control_Flow_Data->Store_M, &iter,
+               gtk_list_store_append (control_flow_data->Store_M, &iter);
+               gtk_list_store_set (    control_flow_data->Store_M, &iter,
                                        PROCESS_COLUMN, process[i],
                                        -1);
        }
@@ -95,7 +95,7 @@ void add_test_process(ControlFlowData *Control_Flow_Data)
 
 
 
-void test_draw(ControlFlowData *Control_Flow_Data)
+void test_draw(ControlFlowData *control_flow_data)
 {
        /* Draw event states using available height, Number of process, cell height
         * (don't forget to remove two pixels at beginning and end).
@@ -103,14 +103,14 @@ void test_draw(ControlFlowData *Control_Flow_Data)
         * This function calls the reading library to get the draw_hook called 
         * for the desired period of time. */
        
-       DrawingAreaInfo *Drawing_Area_Info = &Control_Flow_Data->Drawing_Area_Info;
+       DrawingAreaInfo *Drawing_Area_Info = &control_flow_data->Drawing_Area_Info;
 
        
 }
 
 #ifdef DEBUG
 void test_draw() {
-       gint cell_height = get_cell_height(GTK_TREE_VIEW(Control_Flow_Data->process_list_VC));
+       gint cell_height = get_cell_height(GTK_TREE_VIEW(control_flow_data->process_list_VC));
        GdkGC *GC = gdk_gc_new(widget->window);
        GdkColor color = CF_Colors[GREEN];
        
@@ -120,9 +120,9 @@ void test_draw() {
 
        /* When redrawing, use widget->allocation.width to get the width of
         * drawable area. */
-       Control_Flow_Data->Drawing_Area_Info.width = widget->allocation.width;
+       control_flow_data->Drawing_Area_Info.width = widget->allocation.width;
        
-       test_draw(Control_Flow_Data);
+       test_draw(control_flow_data);
        
        gdk_gc_copy(GC,widget->style->white_gc);
        gdk_gc_set_foreground(GC,&color);
@@ -132,11 +132,11 @@ void test_draw() {
   //              TRUE,
   //              //0, 0, widget->allocation.width, widget->allocation.height,
   //              0, 0, widget->allocation.width,
-       //                                                      Control_Flow_Data->Drawing_Area_Info.height,
+       //                                                      control_flow_data->Drawing_Area_Info.height,
   //              0, 64 * 360);
 
        
-       //Drawing_Area_Init(Control_Flow_Data);
+       //Drawing_Area_Init(control_flow_data);
        
        // 2 pixels for the box around the drawing area, 1 pixel for off-by-one
        // (starting from 0)
@@ -209,8 +209,8 @@ void test_draw_item(Drawing_t *Drawing,
                        draw_context.drawable = Pixmap;
                        draw_context.gc = Drawing->Drawing_Area_V->style->black_gc;
 
-                       draw_context.Current = &current;
-                       draw_context.Previous = NULL;
+                       draw_context.current = &current;
+                       draw_context.previous = NULL;
        
                        properties_icon.icon_name = g_new(char, MAX_PATH_LEN);
                        strncpy(properties_icon.icon_name,