now, main window resize will change the scale, not time interval

git-svn-id: http://ltt.polymtl.ca/svn@370 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
index 000efdf017fe4b87acb3129e9fb99d1e3fe1bdd1..6a50d79de536c942250a417933e7f8b7e791a54b 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -1124,8 +1124,11 @@ on_MWindow_configure                   (GtkWidget         *widget,
   double ratio;
   TimeInterval *time_span;
   LttTime time;
-
-  while(tab){
+       
+       // MD : removed time width modification upon resizing of the main window.
+       // The viewers will redraw themselves completely, without time interval
+       // modification.
+/*  while(tab){
     if(mw_data->window_width){
       time_span = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->Time_Span ;
       time_win = tab->time_window;
@@ -1140,6 +1143,7 @@ on_MWindow_configure                   (GtkWidget         *widget,
   }
 
   mw_data->window_width = (int)width;
+       */
   return FALSE;
 }
 

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
index bb551dc166ca6592339c2b80404921149a801bc3..ea056ff06ca5ac324a09f26676bd6e6f28e87f61 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
@@ -123,6 +123,9 @@ void drawing_data_request(Drawing_t *Drawing,
 
 
 /* Create a new backing pixmap of the appropriate size */
+/* As the scaling will always change, it's of no use to copy old
+ * pixmap.
+ */
 static gboolean
 configure_event( GtkWidget *widget, GdkEventConfigure *event, 
                gpointer user_data)
@@ -136,18 +139,23 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
         * executed.
         */
        get_time_window(Drawing->Control_Flow_Data->Parent_Window,
-                       &Drawing->Control_Flow_Data->Time_Window);
-               
+                               &Drawing->Control_Flow_Data->Time_Window);
+       
   /* New Pixmap, size of the configure event */
-  GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
-                         widget->allocation.width + SAFETY,
-                         widget->allocation.height + SAFETY,
-                         -1);
+  //GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
+       //                widget->allocation.width + SAFETY,
+       //                widget->allocation.height + SAFETY,
+       //                -1);
        
   g_critical("drawing configure event");
-
+       g_critical("New draw size : %i by %i",widget->allocation.width, widget->allocation.height);
+       
+               
+       if (Drawing->Pixmap)
+    gdk_pixmap_unref(Drawing->Pixmap);
+       
   /* If no old Pixmap present */
-  if(Drawing->Pixmap == NULL)
+  //if(Drawing->Pixmap == NULL)
   {
        Drawing->Pixmap = gdk_pixmap_new(
                widget->window,
@@ -158,6 +166,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
                -1);
                Drawing->width = widget->allocation.width;
                Drawing->height = widget->allocation.height;
+               
 
                // Clear the image
          gdk_draw_rectangle (Drawing->Pixmap,
@@ -167,15 +176,25 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
                      widget->allocation.width+SAFETY,
                      widget->allocation.height+SAFETY);
 
-               g_info("init data request");
+               //g_info("init data request");
 
 
                /* Initial data request */
+               // Do not need to ask for data of 1 pixel : not synchronized with
+               // main window time at this moment.
                drawing_data_request(Drawing, &Drawing->Pixmap, 0, 0,
                        widget->allocation.width,
                                widget->allocation.height);
+                                     
+         Drawing->width = widget->allocation.width;
+               Drawing->height = widget->allocation.height;
+
+       return TRUE;
+
+
 
   }
+#ifdef NOTUSE
 //  /* Draw empty background */ 
 //  gdk_draw_rectangle (Pixmap,
 //                   widget->style->black_gc,
@@ -184,14 +203,14 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
 //                   widget->allocation.width,
 //                   widget->allocation.height);
   
-  /* Copy old data to new pixmap */
-  gdk_draw_drawable (Pixmap,
-                 widget->style->white_gc,
-                 Drawing->Pixmap,
-                 0, 0,
-                 0, 0,
-                 -1, -1);
-
+       /* Copy old data to new pixmap */
+       gdk_draw_drawable (Pixmap,
+         widget->style->white_gc,
+         Drawing->Pixmap,
+         0, 0,
+         0, 0,
+         -1, -1);
+               
   if (Drawing->Pixmap)
     gdk_pixmap_unref(Drawing->Pixmap);
 
@@ -204,6 +223,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
                      0, Drawing->height+SAFETY,
                      Drawing->width+SAFETY,    // do not overlap
                      (widget->allocation.height) - Drawing->height);
+
        // Clear the right part of the image (SAFETY)
   gdk_draw_rectangle (Pixmap,
                      widget->style->white_gc,
@@ -219,27 +239,18 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
                      Drawing->width + SAFETY, 0,
                      widget->allocation.width - Drawing->width,        // do not overlap
                      widget->allocation.height+SAFETY);
+
   /* Request data for missing space */
        g_info("missing data request");
   drawing_data_request(Drawing, &Pixmap, Drawing->width, 0,
                widget->allocation.width - Drawing->width,
                        widget->allocation.height);
-        // we do not request data vertically!
-//   drawing_data_request(Drawing, &Pixmap, 0, Drawing->height,
-//                Drawing->width,
-//                widget->allocation.height - Drawing->height);
                                      
-//   gdk_draw_rectangle (Pixmap,
-//                   widget->style->white_gc,
-//                   TRUE,
-//                   Drawing->width, 0,
-//                   widget->allocation.width -
-//                                     Drawing->width,
-//                   widget->allocation.height);
   Drawing->width = widget->allocation.width;
   Drawing->height = widget->allocation.height;
 
   return TRUE;
+#endif //NOTUSE
 }
 
 
@@ -424,7 +435,7 @@ void drawing_insert_square(Drawing_t *Drawing,
                                guint y,
                                guint height)
 {
-       GdkRectangle update_rect;
+       //GdkRectangle update_rect;
 
        /* Allocate a new pixmap with new height */
        GdkPixmap *Pixmap = gdk_pixmap_new(Drawing->Drawing_Area_V->window,
@@ -459,7 +470,7 @@ void drawing_insert_square(Drawing_t *Drawing,
                Drawing->Pixmap,
                0, y,
                0, y + height,
-               Drawing->width, Drawing->height - y + SAFETY);
+               Drawing->width+SAFETY, Drawing->height - y + SAFETY);
 
 
 
@@ -472,11 +483,11 @@ void drawing_insert_square(Drawing_t *Drawing,
        Drawing->height+=height;
 
        /* Rectangle to update, from new Drawing dimensions */
-       update_rect.x = 0 ;
-       update_rect.y = y ;
-       update_rect.width = Drawing->width;
-       update_rect.height = Drawing->height - y ;
-       gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
+       //update_rect.x = 0 ;
+       //update_rect.y = y ;
+       //update_rect.width = Drawing->width;
+       //update_rect.height = Drawing->height - y ;
+       //gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
 }
 
 
@@ -485,7 +496,7 @@ void drawing_remove_square(Drawing_t *Drawing,
                                guint y,
                                guint height)
 {
-       GdkRectangle update_rect;
+       //GdkRectangle update_rect;
        
        /* Allocate a new pixmap with new height */
        GdkPixmap *Pixmap = gdk_pixmap_new(
@@ -521,11 +532,11 @@ void drawing_remove_square(Drawing_t *Drawing,
        Drawing->height-=height;
        
        /* Rectangle to update, from new Drawing dimensions */
-       update_rect.x = 0 ;
-       update_rect.y = y ;
-       update_rect.width = Drawing->width;
-       update_rect.height = Drawing->height - y ;
-       gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
+       //update_rect.x = 0 ;
+       //update_rect.y = y ;
+       //update_rect.width = Drawing->width;
+       //update_rect.height = Drawing->height - y ;
+       //gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
 }
 
 

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
index adc6d8a05d471b56db48a6d0324b2e3df872f0e5..de41f0c64cc01948438bab4a23eb0724aa98f445 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
@@ -616,9 +616,9 @@ void update_time_window_hook(void *hook_data, void *call_data)
        TimeWindow *Old_Time_Window = 
                guicontrolflow_get_time_window(control_flow_data);
        TimeWindow *New_Time_Window = ((TimeWindow*)call_data);
-
+       
        /* Two cases : zoom in/out or scrolling */
-
+       
        /* In order to make sure we can reuse the old drawing, the scale must
         * be the same and the new time interval being partly located in the
         * currently shown time interval. (reuse is only for scrolling)
@@ -752,7 +752,7 @@ void update_time_window_hook(void *hook_data, void *call_data)
                                /* Cannot reuse any part of the screen : far jump */
                                *Old_Time_Window = *New_Time_Window;
                                
-
+                               
                                gdk_draw_rectangle (control_flow_data->Drawing->Pixmap,
                                        control_flow_data->Drawing->Drawing_Area_V->style->white_gc,
                      TRUE,