[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: CVS update: o_arc_basic.c



  User: pcjc2   
  Date: 06/12/27 15:30:51

  Modified:    .        Tag: noscreen o_arc_basic.c o_box_basic.c
                        o_bus_basic.c o_circle_basic.c o_complex_basic.c
                        o_line_basic.c o_net_basic.c o_picture.c
                        o_pin_basic.c
  Log:
  * include/prototype.h, src/o_arc_basic.c, src/o_box_basic.c, 
  
    src/o_bus_basic.c, src/o_circle_basic.c, src/o_complex_basic.c, 
  
    src/o_line_basic.c, src/o_net_basic.c, src/o_picture.c, 
  
    src/o_pin_basic.c: Removed o_..._translate() functions which
  
    are unused.
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.31.2.3  +0 -35     eda/geda/gaf/libgeda/src/o_arc_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_arc_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_arc_basic.c,v
  retrieving revision 1.31.2.2
  retrieving revision 1.31.2.3
  diff -u -b -r1.31.2.2 -r1.31.2.3
  --- o_arc_basic.c	27 Dec 2006 20:10:44 -0000	1.31.2.2
  +++ o_arc_basic.c	27 Dec 2006 20:30:51 -0000	1.31.2.3
  @@ -397,41 +397,6 @@
     return(buf);
   }
   
  -
  -/*! \brief
  - *  \par Function Description
  - *  This function translates the arc described in the <B>object</B>
  - *  pointed structure by <B>dx</B> horizontally and <B>dy</B> vertically.
  - *  <B>dx</B> and <B>dy</B> are in screen unit.
  - *
  - *  The translation vector is converted in world unit. The translation
  - *  is made with <B>o_arc_translate_world()</B> that also updates the
  - *  screen coordinates and the bounding box.
  - *
  - *  \param [in] w_current  The TOPLEVEL object.
  - *  \param [in] dx         
  - *  \param [in] dy         
  - *  \param [in] object
  - */
  -void o_arc_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int world_dx, world_dy;
  -  
  -  if (object == NULL) {
  -    return;
  -  }
  -
  -  /* convert the translation vector in world unit */
  -  world_dx = SCREENabs(w_current, dx);
  -  world_dy = SCREENabs(w_current, dy);
  -  
  -  /* translate the arc */
  -  o_arc_translate_world(w_current, world_dx, world_dy, object);
  -
  -  /* screen coords and boundings are updated by _translate_world() */
  -	
  -}
  -
   /*! \brief
    *  \par Function Description
    *  This function applies a translation of (<B>dx</B>,<B>dy</B>)
  
  
  
  1.26.2.3  +0 -27     eda/geda/gaf/libgeda/src/o_box_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_box_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_box_basic.c,v
  retrieving revision 1.26.2.2
  retrieving revision 1.26.2.3
  diff -u -b -r1.26.2.2 -r1.26.2.3
  --- o_box_basic.c	27 Dec 2006 20:10:44 -0000	1.26.2.2
  +++ o_box_basic.c	27 Dec 2006 20:30:51 -0000	1.26.2.3
  @@ -480,33 +480,6 @@
     return(buf);
   }
   
  -/*! \brief Translate a BOX position by a delta.
  - *  \par Function Description
  - *  This function applies a translation of (<B>dx</B>,<B>dy</B>) to the box
  - *  described by <B>*object</B>. <B>dx</B> and <B>dy</B> are in screen unit.
  - *
  - *  \param [in]     w_current   The TOPLEVEL object.
  - *  \param [in]     dx          x distance to move.
  - *  \param [in]     dy          y distance to move.
  - *  \param [in,out] object      BOX OBJECT to translate.
  - */
  -void o_box_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int world_dx, world_dy;
  -
  -  if (object == NULL) printf("bt NO!\n");
  -
  -  /* convert the translation vector in world unit */
  -  world_dx = SCREENabs(w_current, dx);
  -  world_dy = SCREENabs(w_current, dy);
  -
  -  /* translate the box */
  -  o_box_translate_world(w_current, world_dx, world_dy, object);
  -
  -  /* screen coords and boundings are updated by _translate_world */
  -  
  -}
  -
   /*! \brief Translate a BOX position in WORLD coordinates by a delta.
    *  \par Function Description
    *  This function applies a translation of (<B>x1</B>,<B>y1</B>) to the box
  
  
  
  1.17.2.3  +0 -37     eda/geda/gaf/libgeda/src/o_bus_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_bus_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_bus_basic.c,v
  retrieving revision 1.17.2.2
  retrieving revision 1.17.2.3
  diff -u -b -r1.17.2.2 -r1.17.2.3
  --- o_bus_basic.c	27 Dec 2006 20:10:44 -0000	1.17.2.2
  +++ o_bus_basic.c	27 Dec 2006 20:30:51 -0000	1.17.2.3
  @@ -294,43 +294,6 @@
    * \par Function Description
    *
    */
  -void o_bus_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int x, y;
  -
  -  if (object == NULL) printf("nt NO!\n");
  -
  -
  -  /* Do world coords */
  -  object->line->screen_x[0] = object->line->screen_x[0] + dx;
  -  object->line->screen_y[0] = object->line->screen_y[0] + dy;
  -  object->line->screen_x[1] = object->line->screen_x[1] + dx;
  -  object->line->screen_y[1] = object->line->screen_y[1] + dy;
  -
  -  /* do we want snap grid here? */
  -  SCREENtoWORLD(w_current, object->line->screen_x[0], 
  -                object->line->screen_y[0], 
  -                &x,
  -                &y);  
  -	
  -  object->line->x[0] = snap_grid(w_current, x);
  -  object->line->y[0] = snap_grid(w_current, y);
  -	
  -  SCREENtoWORLD(w_current, object->line->screen_x[1], 
  -                object->line->screen_y[1], 
  -                &x,
  -                &y);  
  -	
  -  object->line->x[1] = snap_grid(w_current, x);
  -  object->line->y[1] = snap_grid(w_current, y);
  -
  -  s_tile_update_object(w_current, object);
  -}
  -
  -/* \brief
  - * \par Function Description
  - *
  - */
   void o_bus_translate_world(TOPLEVEL *w_current, int x1, int y1, OBJECT *object)
   {
     int screen_x1, screen_y1;
  
  
  
  1.27.2.3  +0 -30     eda/geda/gaf/libgeda/src/o_circle_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_circle_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_circle_basic.c,v
  retrieving revision 1.27.2.2
  retrieving revision 1.27.2.3
  diff -u -b -r1.27.2.2 -r1.27.2.3
  --- o_circle_basic.c	27 Dec 2006 20:10:44 -0000	1.27.2.2
  +++ o_circle_basic.c	27 Dec 2006 20:30:51 -0000	1.27.2.3
  @@ -426,36 +426,6 @@
     return(buf);
   }
              
  -/*! \brief Translate a circle position by a delta.
  - *  \par Function Description
  - *  This function applies a translation of (<B>dx</B>,<B>dy</B> to the circle
  - *  described by <B>*object</B>. <B>dx</B> and <B>dy</B> are in screen unit.
  - *
  - *  The translation vector is converted in world unit. The translation is
  - *  made with #o_circle_translate_world().
  - *
  - *  \param [in]     w_current   The TOPLEVEL object.
  - *  \param [in]     dx          x distance to move.
  - *  \param [in]     dy          y distance to move.
  - *  \param [in,out] object      Circle OBJECT to translate.
  - */
  -void o_circle_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -	int world_dx, world_dy;
  -	
  -	if (object == NULL) printf("ct NO!\n");
  -	
  -	/* convert the translation vector in world unit */
  -	world_dx = SCREENabs(w_current, dx);
  -	world_dy = SCREENabs(w_current, dy);
  -	
  -	/* translate the circle */
  -	o_circle_translate_world(w_current, world_dx, world_dy, object);
  -	
  -	/* screen coords and boundings are updated by _translate_world() */
  -  
  -}
  -
   /*! \brief Translate a circle position in WORLD coordinates by a delta.
    *  \par Function Description
    *  This function applies a translation of (<B>x1</B>,<B>y1</B>) to the circle
  
  
  
  1.30.2.1  +0 -34     eda/geda/gaf/libgeda/src/o_complex_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_complex_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_complex_basic.c,v
  retrieving revision 1.30
  retrieving revision 1.30.2.1
  diff -u -b -r1.30 -r1.30.2.1
  --- o_complex_basic.c	17 Dec 2006 04:14:07 -0000	1.30
  +++ o_complex_basic.c	27 Dec 2006 20:30:51 -0000	1.30.2.1
  @@ -974,40 +974,6 @@
    *  \par Function Description
    *
    */
  -/* now I think it works fine */
  -/* no there is a bug with snap locking.  Basically if you don't snap/lock in */
  -/* PCtoW, then this doesn't work... :(  I don't know why yet */
  -void o_complex_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int x, y;
  -  int prevx, prevy;
  -
  -  if (object == NULL) {
  -    printf("cmpt NO!\n");
  -    return;
  -  }
  -
  -  object->complex->screen_x = object->complex->screen_x + dx;
  -  object->complex->screen_y = object->complex->screen_y + dy;
  -
  -
  -  /* this fixing makes me nervious hack */
  -  SCREENtoWORLD(w_current, object->complex->screen_x,
  -                object->complex->screen_y, &x, &y);
  -
  -  prevx = object->complex->x;
  -  prevy = object->complex->y;
  -  object->complex->x = snap_grid(w_current, x);
  -  object->complex->y = snap_grid(w_current, y);
  -
  -  o_complex_world_translate(w_current, x - prevx,y - prevy, 
  -                            object->complex->prim_objs);
  -}
  -
  -/*! \brief
  - *  \par Function Description
  - *
  - */
   /* this needs work remove display stuff */
   /* libhack */
   /* and recalc stuff */
  
  
  
  1.26.2.3  +0 -38     eda/geda/gaf/libgeda/src/o_line_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_line_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_line_basic.c,v
  retrieving revision 1.26.2.2
  retrieving revision 1.26.2.3
  diff -u -b -r1.26.2.2 -r1.26.2.3
  --- o_line_basic.c	27 Dec 2006 20:10:44 -0000	1.26.2.2
  +++ o_line_basic.c	27 Dec 2006 20:30:51 -0000	1.26.2.3
  @@ -392,44 +392,6 @@
     return(buf);
   }
         
  -/*! \brief Translate a line position by a delta.
  - *  \par Function Description
  - *  This function applies a translation of (<B>dx</B>,<B>dy</B>) to the
  - *  line described by <B>*object</B>. <B>dx</B> and <B>dy</B> are in
  - *  screen unit.
  - *
  - *  \param [in]     w_current   The TOPLEVEL object.
  - *  \param [in]     dx          x distance to move.
  - *  \param [in]     dy          y distance to move.
  - *  \param [in,out] object      Line OBJECT to translate.
  - */
  -void o_line_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int x, y;
  -
  -  if (object == NULL) printf("lt NO!\n");
  -
  -  /* Do screen coords */
  -  object->line->screen_x[0] = object->line->screen_x[0] + dx;
  -  object->line->screen_y[0] = object->line->screen_y[0] + dy;
  -  object->line->screen_x[1] = object->line->screen_x[1] + dx;
  -  object->line->screen_y[1] = object->line->screen_y[1] + dy;
  -  
  -  /* do we want snap grid here? hack */
  -  SCREENtoWORLD(w_current,
  -		object->line->screen_x[0], object->line->screen_y[0], 
  -		&x, &y);  
  -  object->line->x[0] = snap_grid(w_current, x);
  -  object->line->y[0] = snap_grid(w_current, y);
  -  
  -  SCREENtoWORLD(w_current,
  -		object->line->screen_x[1], object->line->screen_y[1], 
  -		&x, &y);  
  -  object->line->x[1] = snap_grid(w_current, x);
  -  object->line->y[1] = snap_grid(w_current, y);
  -  
  -}
  -
   /*! \brief Translate a line position in WORLD coordinates by a delta.
    *  \par Function Description
    *  This function applies a translation of (<B>x1</B>,<B>y1</B>) to the line
  
  
  
  1.34.2.3  +0 -36     eda/geda/gaf/libgeda/src/o_net_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_net_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_net_basic.c,v
  retrieving revision 1.34.2.2
  retrieving revision 1.34.2.3
  diff -u -b -r1.34.2.2 -r1.34.2.3
  --- o_net_basic.c	27 Dec 2006 20:10:44 -0000	1.34.2.2
  +++ o_net_basic.c	27 Dec 2006 20:30:51 -0000	1.34.2.3
  @@ -320,42 +320,6 @@
    *
    *
    */
  -void o_net_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int x, y;
  -
  -  if (object == NULL)
  -  printf("nt NO!\n");
  -
  -
  -  /* Do world coords */
  -  object->line->screen_x[0] = object->line->screen_x[0] + dx;
  -  object->line->screen_y[0] = object->line->screen_y[0] + dy;
  -  object->line->screen_x[1] = object->line->screen_x[1] + dx;
  -  object->line->screen_y[1] = object->line->screen_y[1] + dy;
  -
  -  /* do we want snap grid here? */
  -  SCREENtoWORLD(w_current, object->line->screen_x[0],
  -                object->line->screen_y[0], &x, &y);
  -
  -  object->line->x[0] = snap_grid(w_current, x);
  -  object->line->y[0] = snap_grid(w_current, y);
  -
  -  SCREENtoWORLD(w_current, object->line->screen_x[1],
  -                object->line->screen_y[1], &x, &y);
  -
  -  object->line->x[1] = snap_grid(w_current, x);
  -  object->line->y[1] = snap_grid(w_current, y);
  -
  -  s_tile_update_object(w_current, object);
  -}
  -
  -/*! \todo Finish function documentation!!!
  - *  \brief
  - *  \par Function Description
  - *
  - *
  - */
   void o_net_translate_world(TOPLEVEL *w_current, int x1, int y1,
   			   OBJECT *object)
   {
  
  
  
  1.5.2.3   +0 -30     eda/geda/gaf/libgeda/src/o_picture.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_picture.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_picture.c,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -b -r1.5.2.2 -r1.5.2.3
  --- o_picture.c	27 Dec 2006 20:10:44 -0000	1.5.2.2
  +++ o_picture.c	27 Dec 2006 20:30:51 -0000	1.5.2.3
  @@ -768,36 +768,6 @@
     
   }
   
  -/*! \brief Translate a picture position by a delta.
  - *  \par Function Description
  - *  This function applies a translation of (<B>dx</B>,<B>dy</B>) to the picture
  - *  described by <B>*object</B>. <B>dx</B> and <B>dy</B> are in screen units.
  - *
  - *  The translation vector is converted in world unit. The translation is 
  - *  made with #o_picture_translate_world().
  - *
  - *  \param [in]     w_current   The TOPLEVEL object.
  - *  \param [in]     dx          x distance to move.
  - *  \param [in]     dy          y distance to move.
  - *  \param [in,out] object      Picture OBJECT to translate.
  - */
  -void o_picture_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int world_dx, world_dy;
  -
  -  if (object == NULL) printf("bt NO!\n");
  -
  -  /* convert the translation vector in world unit */
  -  world_dx = SCREENabs(w_current, dx);
  -  world_dy = SCREENabs(w_current, dy);
  -
  -  /* translate the picture */
  -  o_picture_translate_world(w_current, world_dx, world_dy, object);
  -
  -  /* screen coords and boundings are updated by _translate_world */
  -  
  -}
  -
   /*! \brief Translate a picture position in WORLD coordinates by a delta.
    *  \par Function Description
    *  This function applies a translation of (<B>x1</B>,<B>y1</B>) to the picture
  
  
  
  1.24.2.3  +0 -38     eda/geda/gaf/libgeda/src/o_pin_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_pin_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_pin_basic.c,v
  retrieving revision 1.24.2.2
  retrieving revision 1.24.2.3
  diff -u -b -r1.24.2.2 -r1.24.2.3
  --- o_pin_basic.c	27 Dec 2006 20:10:44 -0000	1.24.2.2
  +++ o_pin_basic.c	27 Dec 2006 20:30:51 -0000	1.24.2.3
  @@ -318,44 +318,6 @@
    *  \par Function Description
    *
    */
  -void o_pin_translate(TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
  -{
  -  int x, y;
  -
  -  if (object == NULL) printf("pt NO!\n");
  -
  -
  -  /* Do screen coords */
  -  object->line->screen_x[0] = object->line->screen_x[0] + dx;
  -  object->line->screen_y[0] = object->line->screen_y[0] + dy;
  -  object->line->screen_x[1] = object->line->screen_x[1] + dx;
  -  object->line->screen_y[1] = object->line->screen_y[1] + dy;
  -
  -  /* do we want snap grid here? */
  -  SCREENtoWORLD(w_current, object->line->screen_x[0], 
  -                object->line->screen_y[0], 
  -                &x,
  -                &y);  
  -	
  -  object->line->x[0] = snap_grid(w_current, x);
  -  object->line->y[0] = snap_grid(w_current, y);
  -	
  -  SCREENtoWORLD(w_current, object->line->screen_x[1], 
  -                object->line->screen_y[1], 
  -                &x,
  -                &y);  
  -	
  -  object->line->x[1] = snap_grid(w_current, x);
  -  object->line->y[1] = snap_grid(w_current, y);
  -
  -  s_tile_update_object(w_current, object);
  -}
  -
  -/*! \todo Finish function documentation!!!
  - *  \brief
  - *  \par Function Description
  - *
  - */
   void o_pin_translate_world(TOPLEVEL *w_current, int x1, int y1, OBJECT *object)
   {
     int screen_x1, screen_y1;
  
  
  


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