From 501d540508a62829ff7958daa56497b9edbd009a Mon Sep 17 00:00:00 2001 From: compudj Date: Sat, 17 Jan 2004 04:44:47 +0000 Subject: [PATCH] Drawing to drawing name change git-svn-id: http://ltt.polymtl.ca/svn@397 04897980-b3bd-0310-b5e0-8ef037075253 --- .../lttv/modules/guiControlFlow/CFV-private.h | 2 +- .../poly/lttv/modules/guiControlFlow/CFV.c | 10 +- .../lttv/modules/guiControlFlow/Draw_Item.c | 2 +- .../lttv/modules/guiControlFlow/Drawing.c | 268 +++++++++--------- .../lttv/modules/guiControlFlow/Drawing.h | 16 +- .../lttv/modules/guiControlFlow/Event_Hooks.c | 170 +++++------ .../lttv/modules/guiControlFlow/Event_Hooks.h | 4 +- .../guiControlFlow/Widget_Callbacks.c.old | 2 +- .../guiControlFlow/guiControlFlow.c.old | 2 +- .../poly/lttv/modules/guiControlFlow/test.c | 76 ++--- 10 files changed, 276 insertions(+), 276 deletions(-) diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h index d830b7cb..2903a281 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV-private.h @@ -9,7 +9,7 @@ struct _ControlFlowData { MainWindow *mw; ProcessList *process_list; - Drawing_t *Drawing; + Drawing_t *drawing; GtkWidget *h_paned; diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c index 19abf8e1..ac371adc 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c @@ -33,11 +33,11 @@ guicontrolflow(void) ControlFlowData* control_flow_data = g_new(ControlFlowData,1) ; - /* Create the Drawing */ - control_flow_data->Drawing = drawing_construct(control_flow_data); + /* Create the drawing */ + control_flow_data->drawing = drawing_construct(control_flow_data); drawing_widget = - drawing_get_widget(control_flow_data->Drawing); + drawing_get_widget(control_flow_data->drawing); control_flow_data->number_of_process = 0; @@ -75,7 +75,7 @@ guicontrolflow(void) control_flow_data->h_paned); /* Set the size of the drawing area */ - //Drawing_Resize(Drawing, h, w); + //drawing_Resize(drawing, h, w); /* Get trace statistics */ //control_flow_data->Trace_Statistics = get_trace_statistics(Trace); @@ -102,7 +102,7 @@ guicontrolflow(void) control_flow_data); //WARNING : The widget must be - //inserted in the main window before the Drawing area + //inserted in the main window before the drawing area //can be configured (and this must happend bedore sending //data) diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c index 0725917a..7c929c82 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Draw_Item.c @@ -90,7 +90,7 @@ #define MAX_PATH_LEN 256 -/* Drawing hook functions */ +/* drawing hook functions */ gboolean draw_text( void *hook_data, void *call_data) { PropertiesText *Properties = (PropertiesText*)hook_data; diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c index 8c34ba85..85d2efcb 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c @@ -15,7 +15,7 @@ #define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) /***************************************************************************** - * Drawing functions * + * drawing functions * *****************************************************************************/ //FIXME Colors will need to be dynamic. Graphic context part not done so far. @@ -45,7 +45,7 @@ static GdkColor CF_Colors [] = * Note : this function cannot clear the background, because it may * erase drawing already present (SAFETY). */ -void drawing_data_request(Drawing_t *Drawing, +void drawing_data_request(Drawing_t *drawing, GdkPixmap **pixmap, gint x, gint y, gint width, @@ -56,7 +56,7 @@ void drawing_data_request(Drawing_t *Drawing, ControlFlowData *control_flow_data = (ControlFlowData*)g_object_get_data( G_OBJECT( - Drawing->drawing_area), + drawing->drawing_area), "control_flow_data"); LttTime start, end; @@ -71,12 +71,12 @@ void drawing_data_request(Drawing_t *Drawing, g_critical("x is : %i, x+width is : %i", x, x+width); - convert_pixels_to_time(Drawing->drawing_area->allocation.width, x, + convert_pixels_to_time(drawing->drawing_area->allocation.width, x, &control_flow_data->time_window.start_time, &window_end, &start); - convert_pixels_to_time(Drawing->drawing_area->allocation.width, x + width, + convert_pixels_to_time(drawing->drawing_area->allocation.width, x + width, &control_flow_data->time_window.start_time, &window_end, &end); @@ -85,11 +85,11 @@ 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), - //Drawing); + //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); + //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. @@ -148,7 +148,7 @@ static gboolean configure_event( GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) { - Drawing_t *Drawing = (Drawing_t*)user_data; + Drawing_t *drawing = (Drawing_t*)user_data; /* First, get the new time interval of the main window */ @@ -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, @@ -169,25 +169,25 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, g_critical("New draw size : %i by %i",widget->allocation.width, widget->allocation.height); - if (Drawing->pixmap) - gdk_pixmap_unref(Drawing->pixmap); + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); /* If no old pixmap present */ - //if(Drawing->pixmap == NULL) + //if(drawing->pixmap == NULL) { - Drawing->pixmap = gdk_pixmap_new( + drawing->pixmap = gdk_pixmap_new( widget->window, 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; + drawing->width = widget->allocation.width; + drawing->height = widget->allocation.height; // Clear the image - gdk_draw_rectangle (Drawing->pixmap, + gdk_draw_rectangle (drawing->pixmap, widget->style->white_gc, TRUE, 0, 0, @@ -200,12 +200,12 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, /* Initial data request */ // Do not need to ask for data of 1 pixel : not synchronized with // main window time at this moment. - drawing_data_request(Drawing, &Drawing->pixmap, 0, 0, + drawing_data_request(drawing, &drawing->pixmap, 0, 0, widget->allocation.width, widget->allocation.height); - Drawing->width = widget->allocation.width; - Drawing->height = widget->allocation.height; + drawing->width = widget->allocation.width; + drawing->height = widget->allocation.height; return TRUE; @@ -224,48 +224,48 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, /* Copy old data to new pixmap */ gdk_draw_drawable (pixmap, widget->style->white_gc, - Drawing->pixmap, + drawing->pixmap, 0, 0, 0, 0, -1, -1); - if (Drawing->pixmap) - gdk_pixmap_unref(Drawing->pixmap); + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); - Drawing->pixmap = pixmap; + drawing->pixmap = pixmap; // Clear the bottom part of the image (SAFETY) gdk_draw_rectangle (pixmap, widget->style->white_gc, TRUE, - 0, Drawing->height+SAFETY, - Drawing->width+SAFETY, // do not overlap - (widget->allocation.height) - Drawing->height); + 0, drawing->height+SAFETY, + drawing->width+SAFETY, // do not overlap + (widget->allocation.height) - drawing->height); // Clear the right part of the image (SAFETY) gdk_draw_rectangle (pixmap, widget->style->white_gc, TRUE, - Drawing->width+SAFETY, 0, - (widget->allocation.width) - Drawing->width, // do not overlap - Drawing->height+SAFETY); + drawing->width+SAFETY, 0, + (widget->allocation.width) - drawing->width, // do not overlap + drawing->height+SAFETY); /* Clear the backgound for data request, but not SAFETY */ gdk_draw_rectangle (pixmap, - Drawing->drawing_area->style->white_gc, + drawing->drawing_area->style->white_gc, TRUE, - Drawing->width + SAFETY, 0, - widget->allocation.width - Drawing->width, // do not overlap + drawing->width + SAFETY, 0, + widget->allocation.width - drawing->width, // do not overlap widget->allocation.height+SAFETY); /* Request data for missing space */ g_info("missing data request"); - drawing_data_request(Drawing, &pixmap, Drawing->width, 0, - widget->allocation.width - Drawing->width, + drawing_data_request(drawing, &pixmap, drawing->width, 0, + widget->allocation.width - drawing->width, widget->allocation.height); - Drawing->width = widget->allocation.width; - Drawing->height = widget->allocation.height; + drawing->width = widget->allocation.width; + drawing->height = widget->allocation.height; return TRUE; #endif //NOTUSE @@ -276,7 +276,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, static gboolean expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { - Drawing_t *Drawing = (Drawing_t*)user_data; + Drawing_t *drawing = (Drawing_t*)user_data; ControlFlowData *control_flow_data = (ControlFlowData*)g_object_get_data( G_OBJECT(widget), @@ -300,14 +300,14 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) gdk_draw_pixmap(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - Drawing->pixmap, + drawing->pixmap, event->area.x, event->area.y, event->area.x, event->area.y, event->area.width, event->area.height); if(x >= event->area.x && x <= event->area.x+event->area.width) { - GdkGC *gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + GdkGC *gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(gc, widget->style->black_gc); drawing_draw_line(NULL, widget->window, @@ -327,7 +327,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); - Drawing_t *Drawing = control_flow_data->Drawing; + Drawing_t *drawing = control_flow_data->drawing; g_critical("click"); @@ -359,78 +359,78 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data Drawing_t *drawing_construct(ControlFlowData *control_flow_data) { - Drawing_t *Drawing = g_new(Drawing_t, 1); + Drawing_t *drawing = g_new(Drawing_t, 1); - Drawing->drawing_area = gtk_drawing_area_new (); - Drawing->control_flow_data = control_flow_data; + drawing->drawing_area = gtk_drawing_area_new (); + drawing->control_flow_data = control_flow_data; - Drawing->pango_layout = - gtk_widget_create_pango_layout(Drawing->drawing_area, NULL); + drawing->pango_layout = + gtk_widget_create_pango_layout(drawing->drawing_area, NULL); - //gtk_widget_set_size_request(Drawing->drawing_area->window, 50, 50); + //gtk_widget_set_size_request(drawing->drawing_area->window, 50, 50); g_object_set_data_full( - G_OBJECT(Drawing->drawing_area), - "Link_Drawing_Data", - Drawing, + G_OBJECT(drawing->drawing_area), + "Link_drawing_Data", + drawing, (GDestroyNotify)drawing_destroy); - //gtk_widget_modify_bg( Drawing->drawing_area, + //gtk_widget_modify_bg( drawing->drawing_area, // GTK_STATE_NORMAL, // &CF_Colors[BLACK]); - //gdk_window_get_geometry(Drawing->drawing_area->window, + //gdk_window_get_geometry(drawing->drawing_area->window, // NULL, NULL, - // &(Drawing->width), - // &(Drawing->height), + // &(drawing->width), + // &(drawing->height), // -1); - //Drawing->pixmap = gdk_pixmap_new( - // Drawing->drawing_area->window, - // Drawing->width, - // Drawing->height, - // Drawing->depth); + //drawing->pixmap = gdk_pixmap_new( + // drawing->drawing_area->window, + // drawing->width, + // drawing->height, + // drawing->depth); - Drawing->pixmap = NULL; + drawing->pixmap = NULL; -// Drawing->pixmap = gdk_pixmap_new(Drawing->drawing_area->window, -// Drawing->drawing_area->allocation.width, -// Drawing->drawing_area->allocation.height, +// drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window, +// drawing->drawing_area->allocation.width, +// drawing->drawing_area->allocation.height, // -1); - gtk_widget_add_events(Drawing->drawing_area, GDK_BUTTON_PRESS_MASK); + gtk_widget_add_events(drawing->drawing_area, GDK_BUTTON_PRESS_MASK); - g_signal_connect (G_OBJECT(Drawing->drawing_area), + g_signal_connect (G_OBJECT(drawing->drawing_area), "configure_event", G_CALLBACK (configure_event), - (gpointer)Drawing); + (gpointer)drawing); - g_signal_connect (G_OBJECT(Drawing->drawing_area), + g_signal_connect (G_OBJECT(drawing->drawing_area), "expose_event", G_CALLBACK (expose_event), - (gpointer)Drawing); + (gpointer)drawing); - g_signal_connect (G_OBJECT(Drawing->drawing_area), + g_signal_connect (G_OBJECT(drawing->drawing_area), "button-press-event", G_CALLBACK (button_press_event), - (gpointer)Drawing); + (gpointer)drawing); - return Drawing; + return drawing; } -void drawing_destroy(Drawing_t *Drawing) +void drawing_destroy(Drawing_t *drawing) { // Do not unref here, Drawing_t destroyed by it's widget. - //g_object_unref( G_OBJECT(Drawing->drawing_area)); + //g_object_unref( G_OBJECT(drawing->drawing_area)); - g_free(Drawing->pango_layout); - g_free(Drawing); + g_free(drawing->pango_layout); + g_free(drawing); } -GtkWidget *drawing_get_widget(Drawing_t *Drawing) +GtkWidget *drawing_get_widget(Drawing_t *drawing) { - return Drawing->drawing_area; + return drawing->drawing_area; } /* convert_pixels_to_time @@ -475,7 +475,7 @@ void convert_time_to_pixels( } -void drawing_refresh ( Drawing_t *Drawing, +void drawing_refresh ( Drawing_t *drawing, guint x, guint y, guint width, guint height) { @@ -483,24 +483,24 @@ void drawing_refresh ( Drawing_t *Drawing, GdkRectangle update_rect; gdk_draw_drawable( - Drawing->drawing_area->window, - Drawing->drawing_area-> - style->fg_gc[GTK_WIDGET_STATE (Drawing->drawing_area)], - GDK_DRAWABLE(Drawing->pixmap), + drawing->drawing_area->window, + drawing->drawing_area-> + style->fg_gc[GTK_WIDGET_STATE (drawing->drawing_area)], + GDK_DRAWABLE(drawing->pixmap), x, y, x, y, width, height); update_rect.x = 0 ; update_rect.y = 0 ; - update_rect.width = Drawing->width; - update_rect.height = Drawing->height ; - gtk_widget_draw( Drawing->drawing_area, &update_rect); + update_rect.width = drawing->width; + update_rect.height = drawing->height ; + gtk_widget_draw( drawing->drawing_area, &update_rect); } -void drawing_draw_line( Drawing_t *Drawing, +void drawing_draw_line( Drawing_t *drawing, GdkPixmap *pixmap, guint x1, guint y1, guint x2, guint y2, @@ -514,83 +514,83 @@ void drawing_draw_line( Drawing_t *Drawing, -void drawing_resize(Drawing_t *Drawing, guint h, guint w) +void drawing_resize(Drawing_t *drawing, guint h, guint w) { - Drawing->height = h ; - Drawing->width = w ; + drawing->height = h ; + drawing->width = w ; - gtk_widget_set_size_request ( Drawing->drawing_area, - Drawing->width, - Drawing->height); + gtk_widget_set_size_request ( drawing->drawing_area, + drawing->width, + drawing->height); } /* Insert a square corresponding to a new process in the list */ -/* Applies to whole Drawing->width */ -void drawing_insert_square(Drawing_t *Drawing, +/* Applies to whole drawing->width */ +void drawing_insert_square(Drawing_t *drawing, guint y, guint height) { //GdkRectangle update_rect; /* Allocate a new pixmap with new height */ - GdkPixmap *pixmap = gdk_pixmap_new(Drawing->drawing_area->window, - Drawing->width + SAFETY, - Drawing->height + height + SAFETY, + GdkPixmap *pixmap = gdk_pixmap_new(drawing->drawing_area->window, + drawing->width + SAFETY, + drawing->height + height + SAFETY, -1); /* Copy the high region */ gdk_draw_drawable (pixmap, - Drawing->drawing_area->style->black_gc, - Drawing->pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, 0, 0, 0, 0, - Drawing->width + SAFETY, y); + drawing->width + SAFETY, y); /* add an empty square */ gdk_draw_rectangle (pixmap, - Drawing->drawing_area->style->white_gc, + drawing->drawing_area->style->white_gc, TRUE, 0, y, - Drawing->width + SAFETY, // do not overlap + drawing->width + SAFETY, // do not overlap height); /* copy the bottom of the region */ gdk_draw_drawable (pixmap, - Drawing->drawing_area->style->black_gc, - Drawing->pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, 0, y, 0, y + height, - Drawing->width+SAFETY, Drawing->height - y + SAFETY); + drawing->width+SAFETY, drawing->height - y + SAFETY); - if (Drawing->pixmap) - gdk_pixmap_unref(Drawing->pixmap); + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); - Drawing->pixmap = pixmap; + drawing->pixmap = pixmap; - Drawing->height+=height; + drawing->height+=height; - /* Rectangle to update, from new Drawing dimensions */ + /* Rectangle to update, from new drawing dimensions */ //update_rect.x = 0 ; //update_rect.y = y ; - //update_rect.width = Drawing->width; - //update_rect.height = Drawing->height - y ; - //gtk_widget_draw( Drawing->drawing_area, &update_rect); + //update_rect.width = drawing->width; + //update_rect.height = drawing->height - y ; + //gtk_widget_draw( drawing->drawing_area, &update_rect); } /* Remove a square corresponding to a removed process in the list */ -void drawing_remove_square(Drawing_t *Drawing, +void drawing_remove_square(Drawing_t *drawing, guint y, guint height) { @@ -598,43 +598,43 @@ void drawing_remove_square(Drawing_t *Drawing, /* Allocate a new pixmap with new height */ GdkPixmap *pixmap = gdk_pixmap_new( - Drawing->drawing_area->window, - Drawing->width + SAFETY, - Drawing->height - height + SAFETY, + drawing->drawing_area->window, + drawing->width + SAFETY, + drawing->height - height + SAFETY, -1); /* Copy the high region */ gdk_draw_drawable (pixmap, - Drawing->drawing_area->style->black_gc, - Drawing->pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, 0, 0, 0, 0, - Drawing->width + SAFETY, y); + drawing->width + SAFETY, y); /* Copy up the bottom of the region */ gdk_draw_drawable (pixmap, - Drawing->drawing_area->style->black_gc, - Drawing->pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, 0, y + height, 0, y, - Drawing->width, Drawing->height - y - height + SAFETY); + drawing->width, drawing->height - y - height + SAFETY); - if (Drawing->pixmap) - gdk_pixmap_unref(Drawing->pixmap); + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); - Drawing->pixmap = pixmap; + drawing->pixmap = pixmap; - Drawing->height-=height; + drawing->height-=height; - /* Rectangle to update, from new Drawing dimensions */ + /* Rectangle to update, from new drawing dimensions */ //update_rect.x = 0 ; //update_rect.y = y ; - //update_rect.width = Drawing->width; - //update_rect.height = Drawing->height - y ; - //gtk_widget_draw( Drawing->drawing_area, &update_rect); + //update_rect.width = drawing->width; + //update_rect.height = drawing->height - y ; + //gtk_widget_draw( drawing->drawing_area, &update_rect); } diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h index 3f6eb210..d4b6afd6 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h @@ -47,37 +47,37 @@ struct _Drawing_t { }; Drawing_t *drawing_construct(ControlFlowData *control_flow_data); -void drawing_destroy(Drawing_t *Drawing); +void drawing_destroy(Drawing_t *drawing); -GtkWidget *drawing_get_widget(Drawing_t *Drawing); +GtkWidget *drawing_get_widget(Drawing_t *drawing); -//void Drawing_Refresh ( Drawing_t *Drawing, +//void drawing_Refresh ( Drawing_t *drawing, // guint x, guint y, // guint width, guint height); -void drawing_draw_line( Drawing_t *Drawing, +void drawing_draw_line( Drawing_t *drawing, GdkPixmap *pixmap, guint x1, guint y1, guint x2, guint y2, GdkGC *GC); -//void Drawing_copy( Drawing_t *Drawing, +//void drawing_copy( Drawing_t *drawing, // guint xsrc, guint ysrc, // guint xdest, guint ydest, // guint width, guint height); /* Insert a square corresponding to a new process in the list */ -void drawing_insert_square(Drawing_t *Drawing, +void drawing_insert_square(Drawing_t *drawing, guint y, guint height); /* Remove a square corresponding to a removed process in the list */ -void drawing_remove_square(Drawing_t *Drawing, +void drawing_remove_square(Drawing_t *drawing, guint y, guint height); -//void Drawing_Resize(Drawing_t *Drawing, guint h, guint w); +//void drawing_Resize(Drawing_t *drawing, guint h, guint w); void convert_pixels_to_time( gint width, diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c index 93ac25af..2905f6bd 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -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); @@ -231,7 +231,7 @@ int draw_event_hook(void *hook_data, void *call_data) /* Find pixels corresponding to time of the event. If the time does * not fit in the window, show a warning, not supposed to happend. */ guint x = 0; - guint width = control_flow_data->Drawing->drawing_area->allocation.width; + guint width = control_flow_data->drawing->drawing_area->allocation.width; LttTime time = ltt_event_time(e); @@ -253,16 +253,16 @@ int draw_event_hook(void *hook_data, void *call_data) 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->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; + 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; //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); //draw_context_out->gc = widget->style->black_gc; //draw_arc((void*)&prop_arc, (void*)draw_context_out); - //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap); + //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff }; @@ -301,10 +301,10 @@ int draw_event_hook(void *hook_data, void *call_data) 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->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; - draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); PropertiesLine prop_line_out; @@ -367,16 +367,16 @@ int draw_event_hook(void *hook_data, void *call_data) 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->drawable = control_flow_data->Drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout; - widget = control_flow_data->Drawing->drawing_area; + 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; //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; //draw_context_in->gc = widget->style->black_gc; - draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); //draw_arc((void*)&prop_arc, (void*)draw_context_in); - //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap); + //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff }; @@ -415,10 +415,10 @@ int draw_event_hook(void *hook_data, void *call_data) 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->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; - draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); PropertiesLine prop_line_in; @@ -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); @@ -608,7 +608,7 @@ int draw_after_hook(void *hook_data, void *call_data) /* Find pixels corresponding to time of the event. If the time does * not fit in the window, show a warning, not supposed to happend. */ //guint x = 0; - //guint width = control_flow_data->Drawing->drawing_area->allocation.width; + //guint width = control_flow_data->drawing->drawing_area->allocation.width; //LttTime time = ltt_event_time(e); @@ -630,14 +630,14 @@ int draw_after_hook(void *hook_data, void *call_data) 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->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; + 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; //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; draw_context_out->gc = widget->style->black_gc; //draw_arc((void*)&prop_arc, (void*)draw_context_out); - //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap); + //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff }; @@ -705,14 +705,14 @@ int draw_after_hook(void *hook_data, void *call_data) 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->drawable = control_flow_data->Drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout; - widget = control_flow_data->Drawing->drawing_area; + 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; //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; draw_context_in->gc = widget->style->black_gc; //draw_arc((void*)&prop_arc, (void*)draw_context_in); - //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap); + //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff }; @@ -829,7 +829,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) g_info("scrolling near right"); /* Scroll right, keep right part of the screen */ guint x = 0; - guint width = control_flow_data->Drawing->drawing_area->allocation.width; + guint width = control_flow_data->drawing->drawing_area->allocation.width; convert_time_to_pixels( *os, old_end, @@ -838,9 +838,9 @@ gint update_time_window_hook(void *hook_data, void *call_data) &x); /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, - control_flow_data->Drawing->pixmap, + gdk_draw_drawable (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->pixmap, x, 0, 0, 0, -1, -1); @@ -854,23 +854,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) *old_time_window = *new_time_window; /* Clear the data request background, but not SAFETY */ - gdk_draw_rectangle (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, TRUE, x+SAFETY, 0, - control_flow_data->Drawing->width - x, // do not overlap - control_flow_data->Drawing->height+SAFETY); + control_flow_data->drawing->width - x, // do not overlap + control_flow_data->drawing->height+SAFETY); /* Get new data for the rest. */ - drawing_data_request(control_flow_data->Drawing, - &control_flow_data->Drawing->pixmap, + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, x, 0, - control_flow_data->Drawing->width - x, - control_flow_data->Drawing->height); + control_flow_data->drawing->width - x, + control_flow_data->drawing->height); - drawing_refresh(control_flow_data->Drawing, + drawing_refresh(control_flow_data->drawing, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); } else { @@ -883,7 +883,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) g_info("scrolling near left"); /* Scroll left, keep left part of the screen */ guint x = 0; - guint width = control_flow_data->Drawing->drawing_area->allocation.width; + guint width = control_flow_data->drawing->drawing_area->allocation.width; convert_time_to_pixels( *ns, new_end, @@ -892,9 +892,9 @@ gint update_time_window_hook(void *hook_data, void *call_data) &x); /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, - control_flow_data->Drawing->pixmap, + gdk_draw_drawable (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->pixmap, 0, 0, x, 0, -1, -1); @@ -902,23 +902,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) *old_time_window = *new_time_window; /* Clean the data request background */ - gdk_draw_rectangle (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, TRUE, 0, 0, x, // do not overlap - control_flow_data->Drawing->height+SAFETY); + control_flow_data->drawing->height+SAFETY); /* Get new data for the rest. */ - drawing_data_request(control_flow_data->Drawing, - &control_flow_data->Drawing->pixmap, + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, 0, 0, x, - control_flow_data->Drawing->height); + control_flow_data->drawing->height); - drawing_refresh(control_flow_data->Drawing, + drawing_refresh(control_flow_data->drawing, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); } else { g_info("scrolling far"); @@ -926,23 +926,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) *old_time_window = *new_time_window; - gdk_draw_rectangle (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, TRUE, 0, 0, - control_flow_data->Drawing->width+SAFETY, // do not overlap - control_flow_data->Drawing->height+SAFETY); + control_flow_data->drawing->width+SAFETY, // do not overlap + control_flow_data->drawing->height+SAFETY); - drawing_data_request(control_flow_data->Drawing, - &control_flow_data->Drawing->pixmap, + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); - drawing_refresh(control_flow_data->Drawing, + drawing_refresh(control_flow_data->drawing, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); } } } else { @@ -951,24 +951,24 @@ gint update_time_window_hook(void *hook_data, void *call_data) *old_time_window = *new_time_window; - gdk_draw_rectangle (control_flow_data->Drawing->pixmap, - control_flow_data->Drawing->drawing_area->style->white_gc, + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->white_gc, TRUE, 0, 0, - control_flow_data->Drawing->width+SAFETY, // do not overlap - control_flow_data->Drawing->height+SAFETY); + control_flow_data->drawing->width+SAFETY, // do not overlap + control_flow_data->drawing->height+SAFETY); - drawing_data_request(control_flow_data->Drawing, - &control_flow_data->Drawing->pixmap, + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); - drawing_refresh(control_flow_data->Drawing, + drawing_refresh(control_flow_data->drawing, 0, 0, - control_flow_data->Drawing->width, - control_flow_data->Drawing->height); + control_flow_data->drawing->width, + control_flow_data->drawing->height); } return 0; @@ -1036,7 +1036,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) set_time_window(control_flow_data->mw, &time_window); } - gtk_widget_queue_draw(control_flow_data->Drawing->drawing_area); + gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); return 0; } @@ -1056,7 +1056,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) ControlFlowData *control_flow_data = closure_data->event_request->control_flow_data; - GtkWidget *widget = control_flow_data->Drawing->drawing_area; + GtkWidget *widget = control_flow_data->drawing->drawing_area; /* Get y position of process */ gint y=0, height=0; @@ -1086,10 +1086,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) 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->drawable = control_flow_data->drawing->pixmap; + draw_context->pango_layout = control_flow_data->drawing->pango_layout; //draw_context->gc = widget->style->black_gc; - draw_context->gc = gdk_gc_new(control_flow_data->Drawing->pixmap); + draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context->gc, widget->style->black_gc); PropertiesLine prop_line; diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h index 1adcc4c4..66170d3c 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.h @@ -1,5 +1,5 @@ /* Event_hooks.c defines the hooks that are given to processTrace as parameter. - * These hooks call the Drawing API to draw the information on the screen, + * These hooks call the drawing API to draw the information on the screen, * using information from Context, but mostly state (running, waiting...). */ @@ -35,7 +35,7 @@ typedef struct _EventRequest -void send_test_data(ProcessList *process_list, Drawing_t *Drawing); +void send_test_data(ProcessList *process_list, Drawing_t *drawing); GtkWidget *h_guicontrolflow(MainWindow *mw, LttvTracesetSelector * s, char * key); 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 700c5b1a..873db1c6 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Widget_Callbacks.c.old @@ -12,7 +12,7 @@ void expose_event_cb (GtkWidget *widget, GdkEventExpose *expose, gpointer 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->drawing_Area_Info.width, &control_flow_data->Begin_Time, &control_flow_data->End_Time, &event_request->time_begin, &event_request->time_end) diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old b/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old index 5e1d0ab7..5c7961d5 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/guiControlFlow.c.old @@ -93,7 +93,7 @@ static void get_test_data(guint event_number, guint List_Height, 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/test.c b/ltt/branches/poly/lttv/modules/guiControlFlow/test.c index fee1f4b5..c326fc5f 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/test.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/test.c @@ -103,7 +103,7 @@ 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; } @@ -120,7 +120,7 @@ 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); @@ -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) @@ -186,7 +186,7 @@ void test_draw() { /* Event_Hook.c tests */ -void test_draw_item(Drawing_t *Drawing, +void test_draw_item(Drawing_t *drawing, GdkPixmap *pixmap) { PropertiesIcon properties_icon; @@ -207,7 +207,7 @@ void test_draw_item(Drawing_t *Drawing, current.modify_over = &over; draw_context.drawable = pixmap; - draw_context.gc = Drawing->drawing_area->style->black_gc; + draw_context.gc = drawing->drawing_area->style->black_gc; draw_context.current = ¤t; draw_context.previous = NULL; @@ -230,7 +230,7 @@ void test_draw_item(Drawing_t *Drawing, /* NOTE : no drawing data should be sent there, since the drawing widget * has not been initialized */ void send_test_drawing(ProcessList *process_list, - Drawing_t *Drawing, + Drawing_t *drawing, GdkPixmap *pixmap, gint x, gint y, // y not used here? gint width, @@ -254,7 +254,7 @@ void send_test_drawing(ProcessList *process_list, gc = gdk_gc_new(pixmap); /* Sent text data */ - layout = gtk_widget_create_pango_layout(Drawing->drawing_area, + layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL); context = pango_layout_get_context(layout); FontDesc = pango_context_get_font_description(context); @@ -276,12 +276,12 @@ void send_test_drawing(ProcessList *process_list, g_info("we draw : x : %u, y : %u, width : %u, height : %u", x, y, width, height); drawing_draw_line( - Drawing, pixmap, x, + drawing, pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->drawing_area->style->black_gc); + drawing->drawing_area->style->black_gc); pango_layout_set_text(layout, "Test", -1); - gdk_draw_layout(pixmap, Drawing->drawing_area->style->black_gc, + gdk_draw_layout(pixmap, drawing->drawing_area->style->black_gc, 0, y+height, layout); birth.tv_sec = 14000; @@ -295,9 +295,9 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( - Drawing, pixmap, x, + drawing, pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->drawing_area->style->black_gc); + drawing->drawing_area->style->black_gc); g_info("y : %u, height : %u", y, height); @@ -313,20 +313,20 @@ void send_test_drawing(ProcessList *process_list, &height); /* Draw rectangle (background color) */ - gdk_gc_copy(gc, Drawing->drawing_area->style->black_gc); + gdk_gc_copy(gc, drawing->drawing_area->style->black_gc); gdk_gc_set_rgb_fg_color(gc, &color); gdk_draw_rectangle(pixmap, gc, TRUE, x, y, width, height); drawing_draw_line( - Drawing, pixmap, x, + drawing, pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->drawing_area->style->black_gc); + drawing->drawing_area->style->black_gc); /* Draw arc */ - gdk_draw_arc(pixmap, Drawing->drawing_area->style->black_gc, + gdk_draw_arc(pixmap, drawing->drawing_area->style->black_gc, TRUE, 100, y, height/2, height/2, 0, 360*64); g_info("y : %u, height : %u", y, height); @@ -344,9 +344,9 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( - Drawing, pixmap, x, + drawing, pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->drawing_area->style->black_gc); + drawing->drawing_area->style->black_gc); g_critical("y : %u, height : %u", y, height); @@ -363,9 +363,9 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( - Drawing, pixmap, x, + drawing, pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->drawing_area->style->black_gc); + drawing->drawing_area->style->black_gc); g_info("y : %u, height : %u", y, height); @@ -375,7 +375,7 @@ void send_test_drawing(ProcessList *process_list, // "/home/compudj/local/share/LinuxTraceToolkit/pixmaps/move_message.xpm"); // "/home/compudj/local/share/LinuxTraceToolkit/pixmaps/mini-display.xpm"); - // gdk_gc_set_clip_mask(Drawing->drawing_area->style->black_gc, mask); + // gdk_gc_set_clip_mask(drawing->drawing_area->style->black_gc, mask); // for(i=x;idrawing_area->style->black_gc); -// gdk_gc_set_clip_origin(Drawing->drawing_area->style->black_gc, i, j); + //gdk_gc_copy(gc, drawing->drawing_area->style->black_gc); +// gdk_gc_set_clip_origin(drawing->drawing_area->style->black_gc, i, j); // gdk_draw_drawable(pixmap, -// Drawing->drawing_area->style->black_gc, +// drawing->drawing_area->style->black_gc, // icon_pixmap, // 0, 0, i, j, -1, -1); // } // } - test_draw_item(Drawing,pixmap); + test_draw_item(drawing,pixmap); - //gdk_gc_set_clip_origin(Drawing->drawing_area->style->black_gc, 0, 0); - //gdk_gc_set_clip_mask(Drawing->drawing_area->style->black_gc, NULL); + //gdk_gc_set_clip_origin(drawing->drawing_area->style->black_gc, 0, 0); + //gdk_gc_set_clip_mask(drawing->drawing_area->style->black_gc, NULL); //g_free(icon_pixmap); //g_free(mask); @@ -411,7 +411,7 @@ void send_test_drawing(ProcessList *process_list, g_free(gc); } -void send_test_process(ProcessList *process_list, Drawing_t *Drawing) +void send_test_process(ProcessList *process_list, Drawing_t *drawing) { guint height, y; int i; @@ -435,7 +435,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); //g_critical("y : %u, height : %u", y, height); @@ -451,7 +451,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); //g_critical("y : %u, height : %u", y, height); @@ -467,11 +467,11 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); //g_critical("y : %u, height : %u", y, height); - //drawing_insert_square( Drawing, height, 5); + //drawing_insert_square( drawing, height, 5); for(i=0; i<10; i++) { @@ -487,7 +487,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); // g_critical("y : %u, height : %u", y, height); @@ -506,7 +506,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); //g_critical("y : %u, height : %u", y, height); @@ -519,11 +519,11 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) &birth, &y, &height); - drawing_insert_square( Drawing, y, height); + drawing_insert_square( drawing, y, height); //g_critical("y : %u, height : %u", y, height); - //drawing_insert_square( Drawing, height, 5); + //drawing_insert_square( drawing, height, 5); //g_critical("height : %u", height); @@ -535,7 +535,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) 10000, &birth); - drawing_remove_square( Drawing, y, height); + drawing_remove_square( drawing, y, height); if(row_ref = (GtkTreeRowReference*)g_hash_table_lookup( -- 2.34.1