#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 <lttvwindow/viewer.h>
+#include <lttv/state.h>
#include <lttv/hook.h>
#include "drawing.h"
{
if(width < 0) return ;
if(height < 0) return ;
+
+ const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw);
+
ControlFlowData *control_flow_data =
(ControlFlowData*)g_object_get_data(
- G_OBJECT(
- drawing->drawing_area),
- "control_flow_data");
+ G_OBJECT(drawing->drawing_area), "control_flow_data");
LttTime start, end;
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ LttTime window_end = ltt_time_add(time_window->time_width,
+ time_window->start_time);
- g_critical("req : window_end : %u, %u", window_end.tv_sec,
- window_end.tv_nsec);
+ 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,
- control_flow_data->time_window.time_width.tv_nsec);
+ g_debug("req : time width : %u, %u", time_window->time_width.tv_sec,
+ 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,
- &window_end,
+ time_window->start_time,
+ window_end,
&start);
convert_pixels_to_time(drawing->drawing_area->allocation.width, x + width,
- &control_flow_data->time_window.start_time,
- &window_end,
+ time_window->start_time,
+ window_end,
&end);
LttvTracesetContext * tsc =
- get_traceset_context(control_flow_data->mw);
+ lttvwindow_get_traceset_context(control_flow_data->mw);
LttvTracesetState * tss =
(LttvTracesetState*)tsc;
- //send_test_process(
- //guicontrolflow_get_process_list(drawing->control_flow_data),
- //drawing);
- //send_test_drawing(
- //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.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();
lttv_hooks_add(after_traceset, after_data_request, &event_request);
lttv_hooks_add(event, draw_event_hook, &event_request);
//Modified by xiangxiu: state update hooks are added by the main window
- //state_add_event_hooks_api(control_flow_data->mw);
+ //lttv_state_add_event_hooks(tsc);
lttv_hooks_add(after_event, draw_after_hook, &event_request);
//lttv_process_traceset_seek_time(tsc, start);
// 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);
+ //lttv_state_remove_event_hooks(tsc);
lttv_hooks_destroy(after_traceset);
lttv_hooks_destroy(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);
+ //lttvwindow_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,
// 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)
expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
Drawing_t *drawing = (Drawing_t*)user_data;
+ const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw);
+ const LttTime* current_time =
+ lttvwindow_get_current_time(drawing->control_flow_data->mw);
+
ControlFlowData *control_flow_data =
(ControlFlowData*)g_object_get_data(
G_OBJECT(widget),
"control_flow_data");
- g_critical("drawing expose event");
+ g_debug("drawing expose event");
guint x=0;
- LttTime* current_time =
- guicontrolflow_get_current_time(control_flow_data);
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ LttTime window_end = ltt_time_add(time_window->time_width,
+ time_window->start_time);
convert_time_to_pixels(
- control_flow_data->time_window.start_time,
+ time_window->start_time,
window_end,
*current_time,
widget->allocation.width,
G_OBJECT(widget),
"control_flow_data");
Drawing_t *drawing = control_flow_data->drawing;
+ const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw);
-
- g_critical("click");
+ g_debug("click");
if(event->button == 1)
{
LttTime time;
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ LttTime window_end = ltt_time_add(time_window->time_width,
+ time_window->start_time);
/* 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,
- &window_end,
+ time_window->start_time,
+ window_end,
&time);
- set_current_time(control_flow_data->mw, &time);
+ lttvwindow_report_current_time(control_flow_data->mw, &time);
}
+
+ lttvwindow_report_focus(control_flow_data->mw, gtk_widget_get_parent(control_flow_data->scrolled_window));
return FALSE;
}
void convert_pixels_to_time(
gint width,
guint x,
- LttTime *window_time_begin,
- LttTime *window_time_end,
+ LttTime window_time_begin,
+ LttTime window_time_end,
LttTime *time)
{
LttTime window_time_interval;
- window_time_interval = ltt_time_sub(*window_time_end,
- *window_time_begin);
+ window_time_interval = ltt_time_sub(window_time_end,
+ window_time_begin);
*time = ltt_time_mul(window_time_interval, (x/(float)width));
- *time = ltt_time_add(*window_time_begin, *time);
+ *time = ltt_time_add(window_time_begin, *time);
}
expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
Drawing_t *drawing = (Drawing_t*)user_data;
-
+ const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw);
gchar text[255];
PangoContext *context;
GdkColor background = { 0, 0xffff, 0xffff, 0xffff };
LttTime window_end =
- ltt_time_add(drawing->control_flow_data->time_window.time_width,
- drawing->control_flow_data->time_window.start_time);
+ ltt_time_add(time_window->time_width,
+ time_window->start_time);
LttTime half_width =
- ltt_time_div(drawing->control_flow_data->time_window.time_width,2.0);
+ ltt_time_div(time_window->time_width,2.0);
LttTime window_middle =
ltt_time_add(half_width,
- drawing->control_flow_data->time_window.start_time);
- g_critical("ruler expose event");
+ time_window->start_time);
+ g_debug("ruler expose event");
gdk_draw_rectangle (drawing->ruler->window,
drawing->ruler->style->white_gc,
snprintf(text, 255, "%lus\n%luns",
- drawing->control_flow_data->time_window.start_time.tv_sec,
- drawing->control_flow_data->time_window.start_time.tv_nsec);
+ time_window->start_time.tv_sec,
+ time_window->start_time.tv_nsec);
layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
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
}
projects / lttv.git / blobdiff