X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2Ftest.c;h=b4d042636d2b408e82a65caecc7dd3190e6e0c9b;hb=8d70e03bc0026687c050287b3dc9b3ec42281191;hp=4fb61eb4e1991d0b2a6ee7df466d2bfa5c22675e;hpb=ba90bc77f7ef2ffc59cc08b6234c61274cdd4396;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/test.c b/ltt/branches/poly/lttv/modules/guiControlFlow/test.c index 4fb61eb4..b4d04263 100644 --- 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; inumber_of_process; i++) + for(i=0; inumber_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->list_store, &iter); + gtk_list_store_set ( control_flow_data->list_store, &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_widget)); 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) @@ -207,10 +207,10 @@ void test_draw_item(Drawing_t *Drawing, current.modify_over = &over; draw_context.drawable = Pixmap; - draw_context.gc = Drawing->Drawing_Area_V->style->black_gc; + draw_context.gc = Drawing->drawing_area->style->black_gc; - draw_context.Current = ¤t; - draw_context.Previous = NULL; + draw_context.current = ¤t; + draw_context.previous = NULL; properties_icon.icon_name = g_new(char, MAX_PATH_LEN); strncpy(properties_icon.icon_name, @@ -239,7 +239,7 @@ void send_test_drawing(ProcessList *process_list, int i,j; ProcessInfo Process_Info = {10000, 12000, 55600}; //ProcessInfo Process_Info = {156, 14000, 55500}; - GtkTreeRowReference *got_RowRef; + GtkTreeRowReference *row_ref; PangoContext *context; PangoLayout *layout; PangoFontDescription *FontDesc;// = pango_font_description_new(); @@ -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_V, + layout = gtk_widget_create_pango_layout(Drawing->drawing_area, NULL); context = pango_layout_get_context(layout); FontDesc = pango_context_get_font_description(context); @@ -278,10 +278,10 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); + Drawing->drawing_area->style->black_gc); pango_layout_set_text(layout, "Test", -1); - gdk_draw_layout(Pixmap, Drawing->Drawing_Area_V->style->black_gc, + gdk_draw_layout(Pixmap, Drawing->drawing_area->style->black_gc, 0, y+height, layout); birth.tv_sec = 14000; @@ -297,7 +297,7 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); + Drawing->drawing_area->style->black_gc); g_info("y : %u, height : %u", y, height); @@ -313,7 +313,7 @@ void send_test_drawing(ProcessList *process_list, &height); /* Draw rectangle (background color) */ - gdk_gc_copy(gc, Drawing->Drawing_Area_V->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, @@ -322,11 +322,11 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); + Drawing->drawing_area->style->black_gc); /* Draw arc */ - gdk_draw_arc(Pixmap, Drawing->Drawing_Area_V->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); @@ -346,7 +346,7 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); + Drawing->drawing_area->style->black_gc); g_critical("y : %u, height : %u", y, height); @@ -365,7 +365,7 @@ void send_test_drawing(ProcessList *process_list, drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->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_V->style->black_gc, mask); + // gdk_gc_set_clip_mask(Drawing->drawing_area->style->black_gc, mask); // for(i=x;iDrawing_Area_V->style->black_gc); -// gdk_gc_set_clip_origin(Drawing->Drawing_Area_V->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_V->style->black_gc, +// Drawing->drawing_area->style->black_gc, // icon_pixmap, // 0, 0, i, j, -1, -1); @@ -395,8 +395,8 @@ void send_test_drawing(ProcessList *process_list, test_draw_item(Drawing,Pixmap); - //gdk_gc_set_clip_origin(Drawing->Drawing_Area_V->style->black_gc, 0, 0); - //gdk_gc_set_clip_mask(Drawing->Drawing_Area_V->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); @@ -417,7 +417,7 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) int i; ProcessInfo Process_Info = {10000, 12000, 55600}; //ProcessInfo Process_Info = {156, 14000, 55500}; - GtkTreeRowReference *got_RowRef; + GtkTreeRowReference *row_ref; LttTime birth; @@ -537,16 +537,16 @@ void send_test_process(ProcessList *process_list, Drawing_t *Drawing) drawing_remove_square( Drawing, y, height); - if(got_RowRef = + if(row_ref = (GtkTreeRowReference*)g_hash_table_lookup( - process_list->Process_Hash, + process_list->process_hash, &Process_Info)) { g_critical("key found"); g_critical("position in the list : %s", gtk_tree_path_to_string ( gtk_tree_row_reference_get_path( - (GtkTreeRowReference*)got_RowRef) + (GtkTreeRowReference*)row_ref) )); }