fix current time event list

[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 690588f1d9d3794b6a9077d801c4f77a898c14b0..0b89478670f5e06fcc61c25150d8a2b805fa31b3 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -127,6 +127,8 @@ typedef struct _EventViewerData {
   LttvTracesetContextPosition *currently_selected_position;
   gboolean update_cursor; /* Speed optimisation : do not update cursor when 
                              unnecessary */
+  gboolean report_position; /* do not report position when in current_time
+                               update */
 
   LttvTracesetContextPosition *first_event;  /* Time of the first event shown */
   LttvTracesetContextPosition *last_event;  /* Time of the first event shown */
@@ -265,9 +267,10 @@ gui_events(Tab *tab)
   event_viewer_data->last_event =
     lttv_traceset_context_position_new(tsc);
 
-  event_viewer_data->main_win_filter = NULL;
+  event_viewer_data->main_win_filter = lttvwindow_get_filter(tab);
 
   event_viewer_data->update_cursor = TRUE;
+  event_viewer_data->report_position = TRUE;
 
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
@@ -687,7 +690,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
         LttvTracesetContextPosition *end_pos = 
           (LttvTracesetContextPosition*)g_ptr_array_index(
                                              event_viewer_data->pos,
-                                             event_viewer_data->pos->len - 1);
+                                             event_viewer_data->pos->len-1);
         if(lttv_traceset_context_pos_pos_compare(end_pos, 
               event_viewer_data->currently_selected_position) == 0) {
           /* Must get down one event and select the last one */
@@ -703,12 +706,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
                                    path, NULL, FALSE);
           gtk_tree_path_free(path);
         }
-#if 0       
-          GtkTreePath *path = gtk_tree_path_new_from_indices(i, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                 path, NULL, FALSE);
-          gtk_tree_path_free(path);
-#endif //0
       }
 
     } else {
@@ -743,7 +740,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
         LttvTracesetContextPosition *end_pos = 
           (LttvTracesetContextPosition*)g_ptr_array_index(
                                              event_viewer_data->pos,
-                                             event_viewer_data->pos->len - 1);
+                                             event_viewer_data->pos->len-1);
         if(lttv_traceset_context_pos_pos_compare(end_pos, 
               event_viewer_data->currently_selected_position) == 0) {
           /* Must get down one page and select the last one */
@@ -930,16 +927,18 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
 
   /* On cursor change, modify the currently selected event by calling
    * the right API function */
-  tree_v_get_cursor(event_viewer_data);
   
-  gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-      &path, NULL);
-  if(gtk_tree_model_get_iter(model,&iter,path)){
-    gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
- 
-    lttvwindow_report_current_position(tab, pos);
-  }else{
-    g_warning("Can not get iter\n");
+  
+  if(event_viewer_data->report_position) {
+    gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+        &path, NULL);
+    if(gtk_tree_model_get_iter(model,&iter,path)){
+      gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
+      
+        lttvwindow_report_current_position(tab, pos);
+    }else{
+      g_warning("Can not get iter\n");
+    }
   }
 }
 
@@ -1368,7 +1367,7 @@ int event_hook(void *hook_data, void *call_data)
     }
   }
   
-  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events -1 )
+  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events )
     return TRUE;
   else
     return FALSE;
@@ -1380,6 +1379,7 @@ static void event_update_selection(EventViewerData *event_viewer_data)
 {
   guint i;
   GPtrArray *positions = event_viewer_data->pos;
+  g_info("event_update_selection");
 
   for(i=0;i<positions->len;i++) {
     LttvTracesetContextPosition *cur_pos = 
@@ -1397,6 +1397,7 @@ static void event_update_selection(EventViewerData *event_viewer_data)
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
+  g_info("update_current_time");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttTime * current_time = (LttTime*)call_data;
   LttvTracesetContext * tsc =
@@ -1409,7 +1410,21 @@ gboolean update_current_time(void * hook_data, void * call_data)
       event_viewer_data->currently_selected_position);
   if(ltt_time_compare(pos_time, *current_time) != 0) {
     
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+        *current_time);
+    lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT,
+                                   NULL);
+    /* Little trick : seek 0 events forward to get the first event
+     * that passes the filter. The trick is to have a match function that
+     * returns 2 : it makes the read stop and keep the last position */
+    guint count;
+    count = lttv_process_traceset_seek_n_forward(tsc, 0,
+          event_viewer_data->main_win_filter);
+
+#if 0
     lttv_process_traceset_seek_time(tsc, *current_time);
+#endif //0
+
     lttv_traceset_context_position_save(tsc,
         event_viewer_data->currently_selected_position);
     pos_time = lttv_traceset_context_position_get_time(
@@ -1419,6 +1434,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
   LttTime time = ltt_time_sub(pos_time, tsc->time_span.start_time);
   double new_value = ltt_time_to_double(time);
  
+  event_viewer_data->report_position = FALSE;
   /* Change the viewed area if does not match */
   if(lttv_traceset_context_pos_pos_compare(
         event_viewer_data->currently_selected_position,
@@ -1429,15 +1445,17 @@ gboolean update_current_time(void * hook_data, void * call_data)
         event_viewer_data->last_event) > 0) {
     gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value);
   } else {
-      /* Simply update the current time : it is in the list */
-      event_update_selection(event_viewer_data);
+    /* Simply update the current time : it is in the list */
+    event_update_selection(event_viewer_data);
   }
+  event_viewer_data->report_position = TRUE;
   
   return FALSE;
 }
 
 gboolean update_current_position(void * hook_data, void * call_data)
 {
+  g_info("update_current_position");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttvTracesetContextPosition *current_pos =
     (LttvTracesetContextPosition*)call_data;
@@ -1449,7 +1467,6 @@ gboolean update_current_position(void * hook_data, void * call_data)
     lttv_traceset_context_position_copy(
         event_viewer_data->currently_selected_position, current_pos);
 
-  
     /* Change the viewed area if does not match */
     if(lttv_traceset_context_pos_pos_compare(
           event_viewer_data->currently_selected_position,