gEDA-cvs: CVS update: o_select.c

[cvspsrv@xxxxxxxx]

  User: pcjc2   
  Date: 07/04/06 13:02:24

  Modified:    .        Tag: noscreen o_select.c
  Log:
  Fixed selection box testing which had some <= and => tests reversed
  
  during screen->world coordinate switching. The swap was incorrect,
  
  as "top" and "bottom" should actually be named "y_min" and "y_max".
  
  The variable nameing is wrong in the world coordinate system.
  
  
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.6.4   +9 -13     eda/geda/gaf/gschem/src/o_select.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_select.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_select.c,v
  retrieving revision 1.5.6.3
  retrieving revision 1.5.6.4
  diff -u -b -r1.5.6.3 -r1.5.6.4
  --- o_select.c	25 Feb 2007 13:41:24 -0000	1.5.6.3
  +++ o_select.c	6 Apr 2007 17:02:24 -0000	1.5.6.4
  @@ -414,17 +414,13 @@
       if (o_current->type != OBJ_HEAD && 
           (o_current->visibility == VISIBLE ||
           (o_current->visibility == INVISIBLE && w_current->show_hidden_text))) {
  -      if ( (o_current->w_left >= w_start_x && 
  -            o_current->w_top <= w_start_y) &&
  -           (o_current->w_left >= w_start_x && 
  -            o_current->w_bottom >= w_last_y) &&
  -           (o_current->w_right <= w_last_x && 
  -            o_current->w_top <= w_start_y ) &&
  -           (o_current->w_right <= w_last_x && 
  -            o_current->w_bottom >= w_last_y) ) {
   
  -        o_select_object(w_current, o_current, 	
  -                        MULTIPLE, count);
  +      if ( o_current->w_left   >= w_start_x &&
  +           o_current->w_right  <= w_last_x  &&
  +           o_current->w_top    >= w_last_y  &&
  +           o_current->w_bottom <= w_start_y ) {
  +
  +        o_select_object(w_current, o_current, MULTIPLE, count);
           count++;
         }
       }
  @@ -436,8 +432,8 @@
     /* key was pressed */
     if (count == 0 && !SHIFTKEY)  {
       o_select_run_hooks(w_current, NULL, 2);
  -    o_selection_unselect_list (w_current,
  -			       &(w_current->page_current->selection_list));
  +    o_selection_unselect_list( w_current,
  +                               &(w_current->page_current->selection_list) );
     }
     i_update_menus(w_current);
   }
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs