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=2d05906c87c42ec8a5c7ef90c21a523c671df494;hpb=d287af9a8d4fd8f6d1937483c165aa52a7788d27;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 2d05906c..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 #include -#include -#include +#include +#include +#include #include #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, @@ -107,6 +108,8 @@ void drawing_data_request(Drawing_t *drawing, LttvTracesetContext * tsc = get_traceset_context(control_flow_data->mw); + LttvTracesetState * tss = + (LttvTracesetState*)tsc; //send_test_process( //guicontrolflow_get_process_list(drawing->control_flow_data), @@ -123,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(); @@ -138,19 +141,20 @@ void drawing_data_request(Drawing_t *drawing, //state_add_event_hooks_api(control_flow_data->mw); lttv_hooks_add(after_event, draw_after_hook, &event_request); - lttv_process_traceset_seek_time(tsc, start); + //lttv_process_traceset_seek_time(tsc, start); + lttv_state_traceset_seek_time_closest(tss, start); // 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); @@ -189,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) @@ -306,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 = @@ -363,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; @@ -373,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, @@ -383,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; } @@ -751,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, @@ -877,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 }