Rework of lttv_traceset_get_time_span_real function to take advantage of the seek_las...

[lttv.git] / lttv / modules / gui / lttvwindow / lttvwindow / callbacks.c

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index bdb90e7019d6ba4f720bbe96a29cfe8566ff3c0c..872cd75bbeb26f34310e80c0de71fe889b8f4f6d 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -283,7 +283,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset)
   }
 #endif /*BABEL_CLEANUP*/
 
-  time_span = lttv_traceset_get_time_span(traceset);
+  time_span = lttv_traceset_get_time_span_real(traceset);
   
   tab->traceset_info->traceset = traceset;
   
@@ -1077,11 +1077,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
             lttv_hooks_call(events_request->before_chunk_traceset, ts);
 
-            lttv_trace_add_hooks(trace,
-                                         events_request->before_chunk_trace,
-
-                                         events_request->event
-                                         );
+            lttv_trace_add_hooks(trace, events_request->before_chunk_trace,
+                                        events_request->event);
           }
         }
       }
@@ -1117,7 +1114,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
             lttv_trace_add_hooks(trace,
                                          events_request->before_chunk_trace,
-
                                          events_request->event
                                          );
           }
@@ -2139,11 +2135,11 @@ void save_as(GtkWidget * widget, gpointer user_data)
 
 void zoom(GtkWidget * widget, double size)
 {
-#ifdef BABEL_CLEANUP
+
   TimeInterval time_span;
   TimeWindow new_time_window;
   LttTime    current_time, time_delta;
-  LttvTracesetContext *tsc;
+  LttvTraceset *ts;
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
 
   GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
@@ -2160,8 +2156,8 @@ void zoom(GtkWidget * widget, double size)
 
   if(size == 1) return;
 
-  tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
-  time_span = tsc->time_span;
+  ts = lttvwindow_get_traceset(tab);
+  time_span = lttv_traceset_get_time_span_real(ts);
   new_time_window =  tab->time_window;
   current_time = tab->current_time;
   
@@ -2223,8 +2219,6 @@ void zoom(GtkWidget * widget, double size)
  } else {
    time_change_manager(tab, new_time_window);
   }
-  
-#endif /* BABEL_CLEANUP */
 }
 
 void zoom_in(GtkWidget * widget, gpointer user_data)
@@ -3329,9 +3323,8 @@ void time_change_manager               (Tab *tab,
   TimeInterval time_span;
   
   LttvTraceset *ts = tab->traceset_info->traceset;
-  time_span.start_time =ltt_time_from_uint64( lttv_traceset_get_timestamp_begin(ts));
-  time_span.end_time = ltt_time_from_uint64(lttv_traceset_get_timestamp_end(ts));
   
+  time_span = lttv_traceset_get_time_span_real(ts);
 
   LttTime start_time = new_time_window.start_time;
   LttTime end_time = new_time_window.end_time;
@@ -3438,7 +3431,7 @@ static void on_timebar_starttime_changed(Timebar *timebar,
 {
        Tab *tab = (Tab *)user_data;
        LttvTraceset * ts =tab->traceset_info->traceset;
-       TimeInterval time_span = lttv_traceset_get_time_span(ts);
+       TimeInterval time_span = lttv_traceset_get_time_span_real(ts);
 
        TimeWindow new_time_window = tab->time_window;
        new_time_window.start_time = timebar_get_start_time(timebar);
@@ -3474,7 +3467,7 @@ static void on_timebar_endtime_changed(Timebar *timebar,
 {
        Tab *tab = (Tab *)user_data;
         LttvTraceset * ts =tab->traceset_info->traceset;
-        TimeInterval time_span = lttv_traceset_get_time_span(ts);
+        TimeInterval time_span = lttv_traceset_get_time_span_real(ts);
 
        TimeWindow new_time_window = tab->time_window;
 
@@ -3525,7 +3518,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar,
   gdouble page_size;
   
   LttvTraceset * ts = tab->traceset_info->traceset;
-  TimeInterval time_span = lttv_traceset_get_time_span(ts);
+  TimeInterval time_span = lttv_traceset_get_time_span_real(ts);
 
   time = ltt_time_add(ltt_time_from_double(value),
                       time_span.start_time);