gEDA-cvs: CVS update: o_complex.nw

[cvspsrv@xxxxxxxx]

  User: cnieves 
  Date: 06/04/22 16:34:02

  Modified:    .        o_complex.nw o_move.nw
  Log:
  Allow complex objects inside complex objects.
  
  
  
  
  Revision  Changes    Path
  1.19      +2 -5      eda/geda/devel/gschem/noweb/o_complex.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_complex.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_complex.nw,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- o_complex.nw	25 Feb 2006 15:00:58 -0000	1.18
  +++ o_complex.nw	22 Apr 2006 20:34:02 -0000	1.19
  @@ -161,12 +161,9 @@
           break;
   
         case(OBJ_COMPLEX):
  -				/* TODO: complex inside a complex? -
  -                                 * not supported yet */
  -#if 0
  +      case(OBJ_PLACEHOLDER):
           o_complex_draw_xor(w_current, dx, dy,
  -                           o_current->complex);
  -#endif
  +                           o_current->complex->prim_objs);
           break;
   
         case(OBJ_TEXT):
  
  
  
  1.13      +6 -0      eda/geda/devel/gschem/noweb/o_move.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_move.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_move.nw,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- o_move.nw	19 Feb 2005 23:27:08 -0000	1.12
  +++ o_move.nw	22 Apr 2006 20:34:02 -0000	1.13
  @@ -181,6 +181,12 @@
         case (OBJ_ARC):
           o_arc_translate_world(w_current, diff_x, diff_y, object);
           break;
  +
  +      case (OBJ_COMPLEX):
  +      case (OBJ_PLACEHOLDER):
  +	o_complex_world_translate (w_current, diff_x, diff_y, 
  +				   object->complex->prim_objs);
  +	break;
       }
   
       if (type == COMPLEX) {