ifdef for EXTRA_CHECK, and precalculate time_width_double

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / drawing.c

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index b71dafacfab65307aaf54ff45d2798ebd7a1a70a..ee42d907416bc987e8fc92faf4c697cacb39699a 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -115,12 +115,6 @@ void drawing_data_request(Drawing_t *drawing,
   if(width < 0) return ;
   if(height < 0) return ;
 
-  if(drawing->gc == NULL) {
-    drawing->gc = gdk_gc_new(drawing->drawing_area->window);
-    gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc);
-  }
-
-
   Tab *tab = drawing->control_flow_data->tab;
   TimeWindow time_window =
               lttvwindow_get_time_window(tab);
@@ -130,8 +124,7 @@ void drawing_data_request(Drawing_t *drawing,
   //               G_OBJECT(drawing->drawing_area), "control_flow_data");
 
   LttTime start, time_end;
-  LttTime window_end = ltt_time_add(time_window.time_width,
-                                    time_window.start_time);
+  LttTime window_end = time_window.end_time;
 
   g_debug("req : window start_time : %u, %u", time_window.start_time.tv_sec, 
                                        time_window.start_time.tv_nsec);
@@ -145,13 +138,11 @@ void drawing_data_request(Drawing_t *drawing,
   g_debug("x is : %i, x+width is : %i", x, x+width);
 
   convert_pixels_to_time(drawing->width, x,
-        time_window.start_time,
-        window_end,
+        time_window,
         &start);
 
   convert_pixels_to_time(drawing->width, x+width,
-        time_window.start_time,
-        window_end,
+        time_window,
         &time_end);
 
   lttvwindow_events_request_remove_all(tab,
@@ -403,16 +394,15 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
   TimeWindow time_window = 
     lttvwindow_get_time_window(cfd->tab);
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
+
   guint width = cfd->drawing->width;
   guint x=0;
 
   cfd->drawing->last_start = events_request->start_time;
 
   convert_time_to_pixels(
-          time_window.start_time,
-          end_time,
+          time_window,
           events_request->start_time,
           width,
           &x);
@@ -448,20 +438,18 @@ void drawing_request_expose(EventsRequest *events_request,
 
   g_debug("request expose");
   
-  LttTime window_end = ltt_time_add(time_window.time_width,
-                                    time_window.start_time);
+  LttTime window_end = time_window.end_time;
+
 #if 0
   convert_time_to_pixels(
-        time_window.start_time,
-        window_end,
+        time_window,
         cfd->drawing->last_start,
         drawing->width,
         &x);
 
 #endif //0
   convert_time_to_pixels(
-        time_window.start_time,
-        window_end,
+        time_window,
         end_time,
         drawing->width,
         &x_end);
@@ -588,6 +576,10 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
                 "control_flow_data");
+  if(drawing->gc == NULL) {
+    drawing->gc = gdk_gc_new(drawing->drawing_area->window);
+    gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc);
+  }
 
   TimeWindow time_window = 
       lttvwindow_get_time_window(control_flow_data->tab);
@@ -596,9 +588,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 
   guint cursor_x=0;
 
-  LttTime window_end = ltt_time_add(time_window.time_width,
-                                    time_window.start_time);
-
+  LttTime window_end = time_window.end_time;
 
   /* update the screen from the pixmap buffer */
   gdk_draw_pixmap(widget->window,
@@ -614,8 +604,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   {
     /* Draw the dotted lines */
     convert_time_to_pixels(
-          time_window.start_time,
-          window_end,
+          time_window,
           current_time,
           drawing->width,
           &cursor_x);
@@ -696,16 +685,14 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   {
     LttTime time;
 
-    LttTime window_end = ltt_time_add(time_window.time_width,
-                                      time_window.start_time);
+    LttTime window_end = time_window.end_time;
 
 
     /* left mouse button click */
     g_debug("x click is : %f", event->x);
 
     convert_pixels_to_time(drawing->width, (guint)event->x,
-        time_window.start_time,
-        window_end,
+        time_window,
         &time);
 
     lttvwindow_report_current_time(control_flow_data->tab, time);
@@ -932,47 +919,39 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing)
 __inline void convert_pixels_to_time(
     gint width,
     guint x,
-    LttTime window_time_begin,
-    LttTime window_time_end,
+    TimeWindow time_window,
     LttTime *time)
 {
-  LttTime window_time_interval;
-  guint64 time_ll;
+  double time_d;
   
-  window_time_interval = ltt_time_sub(window_time_end, 
-            window_time_begin);
-  time_ll = ltt_time_to_uint64(window_time_interval);
-  time_ll = time_ll * x / width;
-  *time = ltt_time_from_uint64(time_ll);
-  *time = ltt_time_add(window_time_begin, *time);
+  time_d = time_window.time_width_double;
+  time_d = time_d / (double)width * (double)x;
+  *time = ltt_time_from_double(time_d);
+  *time = ltt_time_add(time_window.start_time, *time);
 }
 
 
 __inline void convert_time_to_pixels(
-    LttTime window_time_begin,
-    LttTime window_time_end,
+    TimeWindow time_window,
     LttTime time,
     int width,
     guint *x)
 {
-  LttTime window_time_interval;
-  guint64 time_ll, interval_ll;
-  
+  double time_d;
+#ifdef EXTRA_CHECK 
   g_assert(ltt_time_compare(window_time_begin, time) <= 0 &&
            ltt_time_compare(window_time_end, time) >= 0);
+#endif //EXTRA_CHECK
   
-  window_time_interval = ltt_time_sub(window_time_end,window_time_begin);
+  time = ltt_time_sub(time, time_window.start_time);
   
-  time = ltt_time_sub(time, window_time_begin);
+  time_d = ltt_time_to_double(time);
   
-  time_ll = ltt_time_to_uint64(time);
-  interval_ll = ltt_time_to_uint64(window_time_interval);
-  
-  if(interval_ll == 0) {
-    g_assert(time_ll == 0);
+  if(time_window.time_width_double == 0.0) {
+    g_assert(time_d == 0.0);
     *x = 0;
   } else {
-    *x = (guint)(time_ll * width / interval_ll);
+    *x = (guint)(time_d / time_window.time_width_double * (double)width);
   }
   
 }
@@ -1168,9 +1147,7 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   GdkColor foreground = { 0, 0, 0, 0 };
   GdkColor background = { 0, 0xffff, 0xffff, 0xffff };
 
-  LttTime window_end = 
-    ltt_time_add(time_window.time_width,
-                 time_window.start_time);
+  LttTime window_end = time_window.end_time;
   LttTime half_width =
     ltt_time_div(time_window.time_width,2.0);
   LttTime window_middle =