X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=bc2297ca8da4228134b1e5991832f02d3503c78e;hb=0c56e138e63986d8a8c0d7fc3e2c7230a020289e;hp=6edf56684bb6f326599170d31721709871651c76;hpb=d52cfc847728d135b0b8dc288b1a18ac1203e947;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index 6edf5668..bc2297ca 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -19,8 +19,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include <lttv/processTrace.h>
-#include <lttv/gtktraceset.h>
+#include <lttv/lttv.h>
+#include <lttv/tracecontext.h>
+#include <lttvgui/gtktraceset.h>
 #include <lttv/hook.h>
 
 #include "drawing.h"
@@ -87,13 +88,13 @@ void drawing_data_request(Drawing_t *drawing,
   LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
                         control_flow_data->time_window.start_time);
 
-  g_critical("req : window_end : %u, %u", window_end.tv_sec, 
+  g_debug("req : window_end : %u, %u", window_end.tv_sec, 
                                       window_end.tv_nsec);
 
-  g_critical("req : time width : %u, %u", control_flow_data->time_window.time_width.tv_sec, 
+  g_debug("req : time width : %u, %u", control_flow_data->time_window.time_width.tv_sec, 
                                 control_flow_data->time_window.time_width.tv_nsec);
   
-  g_critical("x is : %i, x+width is : %i", x, x+width);
+  g_debug("x is : %i, x+width is : %i", x, x+width);
 
   convert_pixels_to_time(drawing->drawing_area->allocation.width, x,
         &control_flow_data->time_window.start_time,
@@ -108,7 +109,7 @@ void drawing_data_request(Drawing_t *drawing,
   LttvTracesetContext * tsc =
         get_traceset_context(control_flow_data->mw);
   LttvTracesetState * tss =
-        LTTV_TRACESET_STATE(tsc);
+        (LttvTracesetState*)tsc;
   
     //send_test_process(
   //guicontrolflow_get_process_list(drawing->control_flow_data),
@@ -125,10 +126,10 @@ void drawing_data_request(Drawing_t *drawing,
   event_request.x_begin = x;
   event_request.x_end = x+width;
 
-  g_critical("req : start : %u, %u", event_request.time_begin.tv_sec, 
+  g_debug("req : start : %u, %u", event_request.time_begin.tv_sec, 
                                       event_request.time_begin.tv_nsec);
 
-  g_critical("req : end : %u, %u", event_request.time_end.tv_sec, 
+  g_debug("req : end : %u, %u", event_request.time_end.tv_sec, 
                                       event_request.time_end.tv_nsec);
   
   LttvHooks *event = lttv_hooks_new();
@@ -145,15 +146,15 @@ void drawing_data_request(Drawing_t *drawing,
   // FIXME : would like to place the after_traceset hook after the traceset,
   // but the traceset context state is not valid anymore.
   lttv_traceset_context_add_hooks(tsc,
-  //    NULL, after_traceset, NULL, NULL, NULL, NULL,
-      NULL, NULL, NULL, NULL, NULL, NULL,
-      NULL, after_traceset, NULL, event, after_event);
+      NULL, after_traceset, NULL, NULL, NULL, NULL,
+      //NULL, NULL, NULL, NULL, NULL, NULL,
+      NULL, NULL, NULL, event, after_event);
   lttv_process_traceset(tsc, end, G_MAXULONG);
   //after_data_request((void*)&event_request,(void*)tsc);
   lttv_traceset_context_remove_hooks(tsc,
-      //NULL, after_traceset, NULL, NULL, NULL, NULL,
-      NULL, NULL, NULL, NULL, NULL, NULL,
-      NULL, after_traceset, NULL, event, after_event);
+      NULL, after_traceset, NULL, NULL, NULL, NULL,
+     // NULL, NULL, NULL, NULL, NULL, NULL,
+      NULL, NULL, NULL, event, after_event);
   //Modified by xiangxiu: state update hooks are removed by the main window
   //state_remove_event_hooks_api(control_flow_data->mw);
 
@@ -192,8 +193,8 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
   //      widget->allocation.height + SAFETY,
   //      -1);
   
-  g_critical("drawing configure event");
-  g_critical("New draw size : %i by %i",widget->allocation.width, widget->allocation.height);
+  g_debug("drawing configure event");
+  g_debug("New draw size : %i by %i",widget->allocation.width, widget->allocation.height);
   
     
   if (drawing->pixmap)
@@ -309,7 +310,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
                 G_OBJECT(widget),
                 "control_flow_data");
 
-  g_critical("drawing expose event");
+  g_debug("drawing expose event");
   
   guint x=0;
   LttTime* current_time = 
@@ -366,7 +367,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   Drawing_t *drawing = control_flow_data->drawing;
 
 
-  g_critical("click");
+  g_debug("click");
   if(event->button == 1)
   {
     LttTime time;
@@ -376,7 +377,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
 
 
     /* left mouse button click */
-    g_critical("x click is : %f", event->x);
+    g_debug("x click is : %f", event->x);
 
     convert_pixels_to_time(widget->allocation.width, (guint)event->x,
         &control_flow_data->time_window.start_time,
@@ -386,6 +387,8 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
     set_current_time(control_flow_data->mw, &time);
 
   }
+
+  set_focused_pane(control_flow_data->mw, gtk_widget_get_parent(control_flow_data->scrolled_window));
   
   return FALSE;
 }
@@ -754,7 +757,7 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   LttTime window_middle =
     ltt_time_add(half_width,
                  drawing->control_flow_data->time_window.start_time);
-  g_critical("ruler expose event");
+  g_debug("ruler expose event");
  
   gdk_draw_rectangle (drawing->ruler->window,
           drawing->ruler->style->white_gc,
@@ -880,6 +883,6 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 static gboolean
 motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data)
 {
-  //g_critical("motion");
+  //g_debug("motion");
   //eventually follow mouse and show time here
 }