X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=12cf5c4d9dcb9d724ecb270c58ec3e19b03c8af2;hb=f7afe191fd58f0bf4bab9c9514c261535b99d32b;hp=bc278874d8561e79752a8bd4a5dd8b232f2c6dbd;hpb=5f16133f507054edf95e61cefdc3fd04552b0925;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
index bc278874..12cf5c4d 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
@@ -13,25 +13,141 @@
 #include "Event_Hooks.h"
 #include "CFV.h"
 #include "Process_List.h"
+#include "Drawing.h"
+#include "CFV-private.h"
+
+
+/* NOTE : no drawing data should be sent there, as the drawing widget
+ * has not been initialized */
+void send_test_drawing(ProcessList *Process_List,
+			Drawing_t *Drawing,
+			GdkPixmap *Pixmap,
+			gint x, gint y, // y not used here?
+		   	gint width,
+			gint height) // height won't be used here ?
+{
+	int i;
+	ProcessInfo Process_Info = {10000, 12000, 55600};
+	//ProcessInfo Process_Info = {156, 14000, 55500};
+	GtkTreeRowReference *got_RowRef;
+	
+	LttTime birth;
+	birth.tv_sec = 12000;
+	birth.tv_nsec = 55500;
+	g_critical("we have : x : %u, y : %u, width : %u, height : %u", x, y, width, height);
+	ProcessList_get_process_pixels(Process_List,
+					1,
+					&birth,
+					&y,
+					&height);
+	
+	g_critical("we draw : x : %u, y : %u, width : %u, height : %u", x, y, width, height);
+	Drawing_draw_line(
+		Drawing, Pixmap, x,
+		y+(height/2), x + width, y+(height/2),
+		Drawing->Drawing_Area_V->style->black_gc);
+
+	birth.tv_sec = 14000;
+	birth.tv_nsec = 55500;
+
+	ProcessList_get_process_pixels(Process_List,
+					156,
+					&birth,
+					&y,
+					&height);
+	
+
+	Drawing_draw_line(
+		Drawing, Pixmap, x,
+		y+(height/2), x + width, y+(height/2),
+		Drawing->Drawing_Area_V->style->black_gc);
+
+	g_critical("y : %u, height : %u", y, height);
+
+	birth.tv_sec = 12000;
+	birth.tv_nsec = 55700;
+
+	ProcessList_get_process_pixels(Process_List,
+					10,
+					&birth,
+					&y,
+					&height);
+	
+
+	Drawing_draw_line(
+		Drawing, Pixmap, x,
+		y+(height/2), x + width, y+(height/2),
+		Drawing->Drawing_Area_V->style->black_gc);
 
-void send_test_data(ProcessList *Process_List)
+	g_critical("y : %u, height : %u", y, height);
+
+	for(i=0; i<10; i++)
+	{
+		birth.tv_sec = i*12000;
+		birth.tv_nsec = i*55700;
+
+		ProcessList_get_process_pixels(Process_List,
+						i,
+						&birth,
+						&y,
+						&height);
+		
+
+		Drawing_draw_line(
+			Drawing, Pixmap, x,
+			y+(height/2), x + width, y+(height/2),
+			Drawing->Drawing_Area_V->style->black_gc);
+
+		g_critical("y : %u, height : %u", y, height);
+
+	}
+
+	birth.tv_sec = 12000;
+	birth.tv_nsec = 55600;
+
+	ProcessList_get_process_pixels(Process_List,
+					10,
+					&birth,
+					&y,
+					&height);
+	
+
+	Drawing_draw_line(
+		Drawing, Pixmap, x,
+		y+(height/2), x + width, y+(height/2),
+		Drawing->Drawing_Area_V->style->black_gc);
+
+	g_critical("y : %u, height : %u", y, height);
+	
+}
+
+void send_test_process(ProcessList *Process_List, Drawing_t *Drawing)
 {
-	guint height;
+	guint height, y;
 	int i;
 	ProcessInfo Process_Info = {10000, 12000, 55600};
 	//ProcessInfo Process_Info = {156, 14000, 55500};
 	GtkTreeRowReference *got_RowRef;
 
 	LttTime birth;
+
+	if(Process_List->Test_Process_Sent) return;
+
 	birth.tv_sec = 12000;
 	birth.tv_nsec = 55500;
 
 	ProcessList_add(Process_List,
 			1,
 			&birth,
-			&height);
-
-	g_critical("height : %u", height);
+			&y);
+	ProcessList_get_process_pixels(Process_List,
+					1,
+					&birth,
+					&y,
+					&height);
+	Drawing_Insert_Square( Drawing, y, height);
+	
+	//g_critical("y : %u, height : %u", y, height);
 	
 	birth.tv_sec = 14000;
 	birth.tv_nsec = 55500;
@@ -39,10 +155,16 @@ void send_test_data(ProcessList *Process_List)
 	ProcessList_add(Process_List,
 			156,
 			&birth,
-			&height);
-
-	g_critical("height : %u", height);
-
+			&y);
+	ProcessList_get_process_pixels(Process_List,
+					156,
+					&birth,
+					&y,
+					&height);
+	Drawing_Insert_Square( Drawing, y, height);
+	
+	//g_critical("y : %u, height : %u", y, height);
+	
 	birth.tv_sec = 12000;
 	birth.tv_nsec = 55700;
 
@@ -50,6 +172,16 @@ void send_test_data(ProcessList *Process_List)
 			10,
 			&birth,
 			&height);
+	ProcessList_get_process_pixels(Process_List,
+					10,
+					&birth,
+					&y,
+					&height);
+	Drawing_Insert_Square( Drawing, y, height);
+	
+	//g_critical("y : %u, height : %u", y, height);
+	
+	//Drawing_Insert_Square( Drawing, height, 5);
 
 	for(i=0; i<10; i++)
 	{
@@ -60,9 +192,17 @@ void send_test_data(ProcessList *Process_List)
 				i,
 				&birth,
 				&height);
-
+		ProcessList_get_process_pixels(Process_List,
+						i,
+						&birth,
+						&y,
+						&height);
+		Drawing_Insert_Square( Drawing, y, height);
+	
+	//	g_critical("y : %u, height : %u", y, height);
+	
 	}
-	g_critical("height : %u", height);
+	//g_critical("height : %u", height);
 
 	birth.tv_sec = 12000;
 	birth.tv_nsec = 55600;
@@ -70,19 +210,42 @@ void send_test_data(ProcessList *Process_List)
 	ProcessList_add(Process_List,
 			10,
 			&birth,
-			&height);
-	g_critical("height : %u", height);
-
+			&y);
+	ProcessList_get_process_pixels(Process_List,
+					10,
+					&birth,
+					&y,
+					&height);
+	Drawing_Insert_Square( Drawing, y, height);
+	
+	//g_critical("y : %u, height : %u", y, height);
+	
 	ProcessList_add(Process_List,
 			10000,
 			&birth,
 			&height);
-	g_critical("height : %u", height);
+	ProcessList_get_process_pixels(Process_List,
+					10000,
+					&birth,
+					&y,
+					&height);
+	Drawing_Insert_Square( Drawing, y, height);
+	
+	//g_critical("y : %u, height : %u", y, height);
+	
+	//Drawing_Insert_Square( Drawing, height, 5);
+	//g_critical("height : %u", height);
 
 
+	ProcessList_get_process_pixels(Process_List,
+				10000,
+				&birth,
+				&y, &height);
 	ProcessList_remove( 	Process_List,
 				10000,
 				&birth);
+
+	Drawing_Remove_Square( Drawing, y, height);
 	
 	if(got_RowRef = 
 		(GtkTreeRowReference*)g_hash_table_lookup(
@@ -98,6 +261,8 @@ void send_test_data(ProcessList *Process_List)
 		
 	}
 
+	Process_List->Test_Process_Sent = TRUE;
+
 }
 
 
@@ -116,6 +281,16 @@ hGuiControlFlow(mainWindow *pmParentWindow)
 	g_critical("hGuiControlFlow");
 	ControlFlowData *Control_Flow_Data = GuiControlFlow() ;
 
+	GetTimeWindow(pmParentWindow,
+			GuiControlFlow_get_Time_Window(Control_Flow_Data));
+	GetCurrentTime(pmParentWindow,
+			GuiControlFlow_get_Current_Time(Control_Flow_Data));
+
+	// Unreg done in the GuiControlFlow_Destructor
+	RegUpdateTimeWindow(Update_Time_Window_Hook, Control_Flow_Data,
+				pmParentWindow);
+	RegUpdateCurrentTime(Update_Current_Time_Hook, Control_Flow_Data,
+				pmParentWindow);
 	return GuiControlFlow_get_Widget(Control_Flow_Data) ;
 	
 }
@@ -184,3 +359,58 @@ int Draw_After_Hook(void *hook_data, void *call_data)
 	return 0;
 }
 #endif
+
+
+
+
+void Update_Time_Window_Hook(void *hook_data, void *call_data)
+{
+	ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data;
+	TimeWindow* Time_Window = 
+		GuiControlFlow_get_Time_Window(Control_Flow_Data);
+	TimeWindow *New_Time_Window = ((TimeWindow*)call_data);
+
+	// As the time interval change will mostly be used for
+	// zoom in and out, it's not useful to keep old drawing
+	// sections, as scale will be changed.
+	
+
+	*Time_Window = *New_Time_Window;
+	g_critical("New time window HOOK : %u, %u to %u, %u",
+			Time_Window->startTime.tv_sec,
+			Time_Window->startTime.tv_nsec,
+			Time_Window->Time_Width.tv_sec,
+			Time_Window->Time_Width.tv_nsec);
+
+   	Drawing_Data_Request(Control_Flow_Data->Drawing,
+			&Control_Flow_Data->Drawing->Pixmap,
+			0, 0,
+			Control_Flow_Data->Drawing->width,
+		   	Control_Flow_Data->Drawing->height);
+
+	Drawing_Refresh(Control_Flow_Data->Drawing,
+			0, 0,
+			Control_Flow_Data->Drawing->width,
+			Control_Flow_Data->Drawing->height);
+
+}
+
+void Update_Current_Time_Hook(void *hook_data, void *call_data)
+{
+	ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data;
+	LttTime* Current_Time = 
+		GuiControlFlow_get_Current_Time(Control_Flow_Data);
+	*Current_Time = *((LttTime*)call_data);
+	g_critical("New Current time HOOK : %u, %u", Current_Time->tv_sec,
+							Current_Time->tv_nsec);
+
+	/* If current time is inside time interval, just move the highlight
+	 * bar */
+
+	/* Else, we have to change the time interval. We have to tell it
+	 * to the main window. */
+	/* The time interval change will take care of placing the current
+	 * time at the center of the visible area */
+	
+}
+