[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: Makefile.am
User: pcjc2
Date: 07/02/24 13:43:16
Modified: . Makefile.am m_basic.c o_arc_basic.c o_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 o_text_basic.c
Log:
Merge changes to date from noscreen branch.
Revision Changes Path
1.60 +1 -1 eda/geda/gaf/libgeda/src/Makefile.am
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Makefile.am
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/Makefile.am,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Makefile.am 17 Jan 2007 00:35:03 -0000 1.59
+++ Makefile.am 24 Feb 2007 18:43:16 -0000 1.60
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.59 2007/01/17 00:35:03 ahvezda Exp $
+# $Id: Makefile.am,v 1.60 2007/02/24 18:43:16 pcjc2 Exp $
#
# NOTE: Don't forget that in the libtool distribution, files in this
# directory are distributed by the demo_distfiles variable in the top
1.13 +0 -11 eda/geda/gaf/libgeda/src/m_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: m_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/m_basic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- m_basic.c 5 Jul 2006 03:13:38 -0000 1.12
+++ m_basic.c 24 Feb 2007 18:43:16 -0000 1.13
@@ -232,19 +232,8 @@
*/
void SCREENtoWORLD(TOPLEVEL *w_current, int mx, int my, int *x, int *y)
{
- if (w_current->snap) {
- *x = snap_grid(w_current, mil_x(w_current, mx));
- *y = snap_grid(w_current, mil_y(w_current, my));
- } else {
*x = mil_x(w_current, mx);
*y = mil_y(w_current, my);
- }
-
-#if 0
- *x = mil_x(w_current, mx);
- *y = mil_y(w_current, my);
-#endif
-
}
/*! \brief Find the closest grid coordinate.
1.34 +1 -113 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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- o_arc_basic.c 10 Feb 2007 21:25:34 -0000 1.33
+++ o_arc_basic.c 24 Feb 2007 18:43:16 -0000 1.34
@@ -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>)
@@ -460,43 +425,6 @@
/*! \brief
* \par Function Description
- * This function applies a rotation of center (<B>centerx</B>,<B>centery</B>)
- * and angle <B>angle</B> to the arc object <B>*object</B>.
- * The coordinates of the rotation center are in screen units.
- * The angle is in degree.
- *
- * The rotation is made with th <B>o_arc_rotate_world()</B> function
- * that perform a rotation of <B>angle</B> and center
- * (<B>world_centerx</B>,<B>world_centery</B>) in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx
- * \param [in] centery
- * \param [in] angle
- * \param [in] object
- */
-void o_arc_rotate(TOPLEVEL *w_current,
- int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the center of rotation to world unit */
- SCREENtoWORLD(w_current,
- centerx, centery,
- &world_centerx, &world_centery);
-
- /* rotate the arc */
- o_arc_rotate_world(w_current,
- world_centerx, world_centery, angle,
- object);
-
- /* screen coords and boundings are updated by _rotate_world() */
-
-}
-
-/*! \brief
- * \par Function Description
* This function rotates the world coordinates of an arc of an angle
* specified by <B>angle</B>. The center of the rotation is given by
* (<B>world_centerx</B>,<B>world_centery</B>).
@@ -550,42 +478,6 @@
}
-/*! \brief
- * \par Function Description
- * This function mirrors the screen coordinates of an arc.
- * The symetry axis is given by the vertical line going
- * through the point (<B>centerx</B>,<B>centery</B>).
- *
- * <B>centerx</B> and <B>centery</B> are in screen unit.
- *
- * The arc is translated in order to put the point (<B>centerx</B>,<B>centery</B>)
- * on the origin. The center of the arc is then mirrored. The start angle of
- * the arc and the sweep of the arc are also mirrored.
- *
- * The arc is finally back translated to its previous location on the page.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx
- * \param [in] centery
- * \param [in] object
- */
-void o_arc_mirror(TOPLEVEL *w_current,
- int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert mirror origin in world unit */
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx, &world_centery);
-
- /* mirror the arc */
- o_arc_mirror_world(w_current, world_centerx, world_centery, object);
-
- /* screen coords and boundings are updated by _rotate_world() */
-
-}
-
/*! \brief Mirror the WORLD coordinates of an ARC.
* \par Function Description
* This function mirrors the world coordinates of an arc.
@@ -637,8 +529,7 @@
* pointed structure.
* It also recalculates the <B>OBJECT</B> specific fields and the bounding box of the arc.
*
- * The <B>OBJECT</B> specific fields are handled by the function <B>o_object_recalc()</B>
- * whereas bounding box - in screen units - is recalculated with the <B>get_arc_bounds()</B> function.
+ * The bounding box - in screen units - is recalculated with the <B>get_arc_bounds()</B> function.
*
* \param [in] w_current The TOPLEVEL object.
* \param [in] o_current
@@ -668,9 +559,6 @@
o_current->arc->screen_width = screen_x2 - screen_x1; /* width */
o_current->arc->screen_height = screen_y2 - screen_y1; /* height */
- /* recalculates the line type information in o_current */
- o_object_recalc(w_current, o_current);
-
/* recalculates the bounding box */
get_arc_bounds(w_current, o_current, &left, &top, &right, &bottom);
o_current->left = left;
1.16 +6 -42 eda/geda/gaf/libgeda/src/o_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_basic.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- o_basic.c 17 Dec 2006 04:14:07 -0000 1.15
+++ o_basic.c 24 Feb 2007 18:43:16 -0000 1.16
@@ -51,17 +51,17 @@
* This function takes a rectangular region and a point. It will check
* if the point is located in the region or not.
*
- * \param [in] left Left coordinate of the region.
- * \param [in] top Top coordinate of the region.
- * \param [in] right Right coordinate of the region.
- * \param [in] bottom Bottom coordinate of the region.
+ * \param [in] xmin Smaller x coordinate of the region.
+ * \param [in] ymin Smaller y coordinate of the region.
+ * \param [in] xmax Larger x coordinate of the region.
+ * \param [in] ymax Larger y coordinate of the region.
* \param [in] x x coordinate of the point to check.
* \param [in] y y coordinate of the point to check.
* \return 1 if the point is inside the region, 0 otherwise.
*/
-int inside_region(int left, int top, int right, int bottom, int x, int y)
+int inside_region(int xmin, int ymin, int xmax, int ymax, int x, int y)
{
- return ((x >= left && x <= right && y >= top && y <= bottom) ? 1 : 0);
+ return ((x >= xmin && x <= xmax && y >= ymin && y <= ymax) ? 1 : 0);
}
/*! \brief Redraw an object on the screen.
@@ -279,39 +279,3 @@
o_current->fill_angle2 = angle2;
}
-
-/*! \brief Recalculate a single OBJECT in screen coordinates.
- * \par Function Description
- * This function takes an OBJECT and converts it to SCREEN coordinates.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in,out] o_current OBJECT to recalculate.
- *
- */
-void o_object_recalc(TOPLEVEL *w_current, OBJECT *o_current)
-{
- int width, length, space, pitch;
-
- if(o_current == NULL) {
- return;
- }
-
- width = SCREENabs(w_current, o_current->line_width);
- o_current->screen_line_width = width;
-
- length = SCREENabs(w_current, o_current->line_length);
- o_current->screen_line_length = length;
-
- space = SCREENabs(w_current, o_current->line_space);
- o_current->screen_line_space = space;
-
- width = SCREENabs(w_current, o_current->fill_width);
- o_current->screen_fill_width = width;
- pitch = SCREENabs(w_current, o_current->fill_pitch1);
- o_current->screen_fill_pitch1 = pitch;
- pitch = SCREENabs(w_current, o_current->fill_pitch2);
- o_current->screen_fill_pitch2 = pitch;
-
-}
-
-
1.27 +1 -111 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
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_box_basic.c 7 Dec 2006 04:24:18 -0000 1.26
+++ o_box_basic.c 24 Feb 2007 18:43:16 -0000 1.27
@@ -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
@@ -531,51 +504,6 @@
o_box_recalc(w_current, object);
}
-/*! \brief Rotate a BOX OBJECT.
- * \par Function Description
- * This function applies a rotation of center (<B>centerx</B>, <B>centery</B>) and
- * angle <B>angle</B> to the box object <B>*object</B>.
- * The coordinates of the rotation center are in screen units.
- * <B>angle</B> must be a 90 degree multiple. If not, no rotation is applied.
- *
- * The rotation is made with the #o_box_rotate_world() function that
- * perform a rotation of angle <B>angle</B> and center (<B>world_centerx</B>,
- * <B>world_centery</B>) in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Rotation center x coordinate in SCREEN units.
- * \param [in] centery Rotation center y coordinate in SCREEN units.
- * \param [in] angle Rotation angle in degrees (unused).
- * \param [in,out] object BOX OBJECT to rotate.
- *
- * \note
- * takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space
- * also ignores angle argument... for now, rotate only in 90 degree
- * increments
- * fixed to 90 degrees... it's *not* general now
- */
-void o_box_rotate(TOPLEVEL *w_current,
- int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the center of rotation to world unit */
- SCREENtoWORLD(w_current,
- centerx, centery,
- &world_centerx, &world_centery);
-
- /* rotate the box */
- /* the check of the rotation angle is in o_box_rotate_world() */
- o_box_rotate_world(w_current,
- world_centerx, world_centery, angle,
- object);
-
- /* screen coords and boundings are updated by _rotate_world() */
-
-}
-
/*! \brief Rotate BOX OBJECT using WORLD coordinates.
* \par Function Description
* The function #o_box_rotate_world() rotate the box described by
@@ -642,40 +570,6 @@
o_box_recalc(w_current, object);
}
-/*! \brief Mirror a BOX.
- * \par Function Description
- * This function mirrors the box from the point (<B>centerx</B>,<B>centery</B>) in
- * screen unit.
- *
- * The origin of the mirror in screen unit is converted in world unit. The
- * box is mirrored with the function #o_box_mirror_world() for which the
- * origin of the mirror must be given in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Origin x coordinate in WORLD units.
- * \param [in] centery Origin y coordinate in WORLD units.
- * \param [in,out] object BOX OBJECT to mirror.
- */
-void o_box_mirror(TOPLEVEL *w_current,
- int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the origin of mirror */
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* apply the mirror in world coords */
- o_box_mirror_world(w_current,
- world_centerx, world_centery,
- object);
-
- /* screen coords and boundings are updated by _mirror_world() */
-
-}
-
/*! \brief Mirror BOX using WORLD coordinates.
* \par Function Description
* This function mirrors the box from the point
@@ -730,8 +624,7 @@
* This function recalculates the screen coords of the <B>o_current</B> pointed
* box object from its world coords.
*
- * The box coordinates and its bounding are recalculated as well as the
- * OBJECT specific fields (line width, filling ...).
+ * The box coordinates and its bounding are recalculated
*
* \param [in] w_current The TOPLEVEL object.
* \param [in,out] o_current BOX OBJECT to be recalculated.
@@ -766,9 +659,6 @@
o_current->top = top;
o_current->right = right;
o_current->bottom = bottom;
-
- /* recalc OBJECT specific parameters */
- o_object_recalc(w_current, o_current);
}
/*! \brief Get BOX bounding rectangle.
1.18 +0 -104 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
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- o_bus_basic.c 7 Dec 2006 04:24:18 -0000 1.17
+++ o_bus_basic.c 24 Feb 2007 18:43:16 -0000 1.18
@@ -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;
@@ -526,50 +489,6 @@
* \par Function Description
*
*/
-/* takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space */
-/* also ignores angle argument... for now, rotate only in 90 degree
- * increments */
-/* fully functional */
-void o_bus_rotate(TOPLEVEL *w_current, int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
- int newx, newy;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* change the bus ripper orientation when the rotation is 90 degrees */
- /* yes it's okay to use o_net_orientation */
- if (o_net_orientation(object) == VERTICAL && angle == 90) {
- object->bus_ripper_direction = -object->bus_ripper_direction;
- }
-
- /* translate object to origin */
- o_bus_translate_world(w_current, -world_centerx, -world_centery, object);
-
- rotate_point_90(object->line->x[0], object->line->y[0], angle,
- &newx, &newy);
-
- object->line->x[0] = newx;
- object->line->y[0] = newy;
-
- rotate_point_90(object->line->x[1], object->line->y[1], angle,
- &newx, &newy);
-
- object->line->x[1] = newx;
- object->line->y[1] = newy;
-
- o_bus_translate_world(w_current, world_centerx, world_centery, object);
-
-}
-
-/* \brief
- * \par Function Description
- *
- */
void o_bus_rotate_world(TOPLEVEL *w_current,
int world_centerx, int world_centery, int angle,
OBJECT *object)
@@ -601,29 +520,6 @@
* \par Function Description
*
*/
-void o_bus_mirror(TOPLEVEL *w_current,
- int centerx, int centery, OBJECT *object)
-{
- int world_centerx, world_centery;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* translate object to origin */
- o_bus_translate_world(w_current, -world_centerx, -world_centery, object);
-
- object->line->x[0] = -object->line->x[0];
-
- object->line->x[1] = -object->line->x[1];
-
- o_bus_translate_world(w_current, world_centerx, world_centery, object);
-}
-
-/* \brief
- * \par Function Description
- *
- */
void o_bus_mirror_world(TOPLEVEL *w_current,
int world_centerx, int world_centery, OBJECT *object)
{
1.28 +0 -105 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
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- o_circle_basic.c 7 Dec 2006 04:24:18 -0000 1.27
+++ o_circle_basic.c 24 Feb 2007 18:43:16 -0000 1.28
@@ -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
@@ -480,45 +450,6 @@
}
-/*! \brief Rotate a Circle OBJECT.
- * \par Function Description
- * The function #o_circle_rotate_world() rotate the circle described by
- * <B>*object</B> around the (<B>world_centerx</B>,<B>world_centery</B>) point by
- * angle <B>angle</B> degrees.
- * The center of rotation is in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Rotation center x coordinate in SCREEN units.
- * \param [in] centery Rotation center y coordinate in SCREEN units.
- * \param [in] angle Rotation angle in degrees (unused).
- * \param [in,out] object Circle OBJECT to rotate.
- *
- * \note
- * takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space
- * also ignores angle argument... for now, rotate only in 90 degree
- * increments
- */
-void o_circle_rotate(TOPLEVEL *w_current,
- int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the center of rotation to world unit */
- SCREENtoWORLD(w_current,
- centerx, centery,
- &world_centerx, &world_centery);
-
- /* rotate the circle */
- o_circle_rotate_world(w_current,
- world_centerx, world_centery, angle,
- object);
-
- /* screen coords and boundings are updated by _rotate_world() */
-
-}
-
/*! \brief Rotate Circle OBJECT using WORLD coordinates.
* \par Function Description
* The function #o_circle_rotate_world() rotate the circle described by
@@ -571,39 +502,6 @@
}
-/*! \brief Mirror a Circle.
- * \par Function Description
- * This function mirrors the circle from the point (<B>centerx</B>,<B>centery</B>)
- * in screen unit.
- *
- * The origin of the mirror in screen unit is converted in world unit.
- * The circle is mirrored with the function #o_circle_mirror_world()
- * for which the origin of the mirror must be given in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Origin x coordinate in WORLD units.
- * \param [in] centery Origin y coordinate in WORLD units.
- * \param [in,out] object Circle OBJECT to mirror.
- */
-void o_circle_mirror(TOPLEVEL *w_current,
- int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the origin of mirror */
- SCREENtoWORLD(w_current,
- centerx, centery,
- &world_centerx, &world_centery);
-
- /* apply the mirror in world coords */
- o_circle_mirror_world(w_current,
- world_centerx, world_centery,
- object);
-
- /* screen coords and boundings are updated by _mirror_world() */
-}
-
/*! \brief Mirror circle using WORLD coordinates.
* \par Function Description
* This function recalculates the screen coords of the <B>o_current</B> pointed
@@ -682,9 +580,6 @@
o_current->right = right;
o_current->bottom = bottom;
- /* recalc OBJECT specific parameters */
- o_object_recalc(w_current, o_current);
-
}
/*! \brief Get circle bounding rectangle.
1.31 +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.31
diff -u -b -r1.30 -r1.31
--- o_complex_basic.c 17 Dec 2006 04:14:07 -0000 1.30
+++ o_complex_basic.c 24 Feb 2007 18:43:16 -0000 1.31
@@ -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.27 +0 -115 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
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_line_basic.c 7 Dec 2006 04:24:18 -0000 1.26
+++ o_line_basic.c 24 Feb 2007 18:43:16 -0000 1.27
@@ -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
@@ -480,47 +442,6 @@
}
-/*! \brief Rotate a line OBJECT.
- * \par Function Description
- * This function applies a rotation of center (<B>centerx</B>,<B>centery</B>)
- * and angle <B>angle</B> to the line object <B>*object</B>.
- * The coordinates of the rotation center are in screen units.
- * <B>angle</B> mst be a 90 degree multiple. If not, no rotation is applied.
- *
- * The rotation is made by the #o_line_rotate_world() function
- * that perform a rotation of angle <B>angle</B> and center
- * (<B>world_centerx</B>,<B>world_centery</B>) in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Rotation center x coordinate in SCREEN units.
- * \param [in] centery Rotation center y coordinate in SCREEN units.
- * \param [in] angle Rotation angle in degrees (unused).
- * \param [in,out] object Line OBJECT to rotate.
- *
- * \note
- * takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space
- * also ignores angle argument... for now, rotate only in 90 degree
- * increments
- */
-void o_line_rotate(TOPLEVEL *w_current, int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the center of rotation to world unit */
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* rotate the line */
- /* the check on the rotation angle is in o_line_rotate_world() */
- o_line_rotate_world(w_current,
- world_centerx, world_centery, angle,
- object);
-
-}
-
/*! \brief Rotate Line OBJECT using WORLD coordinates.
* \par Function Description
* This function rotates the line described by
@@ -576,38 +497,6 @@
}
-/*! \brief Mirror a Line.
- * \par Function Description
- * This function mirrors the line from the point
- * (<B>centerx</B>,<B>centery</B>) in screen unit.
- *
- * The origin of the mirror in screen unit is converted in world unit.
- * The line is mirrored with the function #o_line_mirror_world()
- * for which the origin of the mirror must be given in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Origin x coordinate in WORLD units.
- * \param [in] centery Origin y coordinate in WORLD units.
- * \param [in,out] object Line OBJECT to mirror.
- */
-void o_line_mirror(TOPLEVEL *w_current,
- int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the origin of mirror */
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* apply the mirror in world coords */
- o_line_mirror_world(w_current,
- world_centerx, world_centery,
- object);
-
-}
-
/*! \brief Mirror a line using WORLD coordinates.
* \par Function Description
* This function mirrors the line from the point
@@ -642,7 +531,6 @@
* pointed line object from its world coords.
*
* The line ends coordinates and its bounding box are recalculated
- * as well as the OBJECT specific fields (line width, filling ...).
*
* \param [in] w_current The TOPLEVEL object.
* \param [in,out] o_current Line OBJECT to be recalculated.
@@ -679,9 +567,6 @@
o_current->right = right;
o_current->bottom = bottom;
- /* recalc OBJECT specific parameters */
- o_object_recalc(w_current, o_current);
-
}
/*! \brief Get line bounding rectangle.
1.35 +0 -99 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
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- o_net_basic.c 21 Dec 2006 20:09:47 -0000 1.34
+++ o_net_basic.c 24 Feb 2007 18:43:16 -0000 1.35
@@ -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)
{
@@ -563,44 +527,6 @@
* \brief
* \par Function Description
*
- * takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space
- * also ignores angle argument... for now, rotate only in 90 degree
- * increments
- * fully functional
- */
-void o_net_rotate(TOPLEVEL *w_current, int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
- int newx, newy;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx, &world_centery);
-
- /* translate object to origin */
- o_net_translate_world(w_current, -world_centerx, -world_centery,
- object);
-
- rotate_point_90(object->line->x[0], object->line->y[0], angle,
- &newx, &newy);
-
- object->line->x[0] = newx;
- object->line->y[0] = newy;
-
- rotate_point_90(object->line->x[1], object->line->y[1], angle,
- &newx, &newy);
-
- object->line->x[1] = newx;
- object->line->y[1] = newy;
-
- o_net_translate_world(w_current, world_centerx, world_centery, object);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
*
*/
void o_net_rotate_world(TOPLEVEL *w_current,
@@ -637,31 +563,6 @@
*
*
*/
-void o_net_mirror(TOPLEVEL *w_current, int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx, &world_centery);
-
- /* translate object to origin */
- o_net_translate_world(w_current, -world_centerx, -world_centery,
- object);
-
- object->line->x[0] = -object->line->x[0];
-
- object->line->x[1] = -object->line->x[1];
-
- o_net_translate_world(w_current, world_centerx, world_centery, object);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- *
- */
void o_net_mirror_world(TOPLEVEL *w_current, int world_centerx,
int world_centery, OBJECT *object)
{
1.6 +1 -114 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
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- o_picture.c 7 Dec 2006 04:24:18 -0000 1.5
+++ o_picture.c 24 Feb 2007 18:43:16 -0000 1.6
@@ -459,8 +459,7 @@
* This function recalculates the screen coords of the <B>o_current</B>
* parameter picture object from its world coords.
*
- * The picture coordinates and its bounding are recalculated as well
- * as the #OBJECT specific fields (line width, filling ...).
+ * The picture coordinates and its bounding are recalculated
*
* \param [in] w_current The TOPLEVEL object.
* \param [in,out] o_current Picture OBJECT to be recalculated.
@@ -497,9 +496,6 @@
o_current->right = right;
o_current->bottom = bottom;
- /* recalc OBJECT specific parameters */
- o_object_recalc(w_current, o_current);
-
}
/*! \brief Get picture bounding rectangle.
@@ -649,51 +645,6 @@
o_picture_recalc(w_current, object);
}
-/*! \brief Rotate a picture OBJECT.
- * \par Function Description
- * This function applies a rotation of center (<B>centerx</B>, <B>centery</B>)
- * and angle <B>angle</B> to the picture object <B>*object</B>.
- * The coordinates of the rotation center are in screen units.
- * <B>angle</B> must be a 90 degree multiple. If not, no rotation is applied.
- *
- * The rotation is made with the #o_picture_rotate_world() function
- * that perform a rotation of angle <B>angle</B> and center
- * (<B>world_centerx</B>, <B>world_centery</B>) in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Rotation center x coordinate in SCREEN units.
- * \param [in] centery Rotation center y coordinate in SCREEN units.
- * \param [in] angle Rotation angle in degrees (unused).
- * \param [in,out] object Picture OBJECT to rotate.
- *
- * \note
- * takes in screen coordinates for the centerx,y, and then does the rotate
- * in world space
- * also ignores angle argument... for now, rotate only in 90 degree
- * increments
- * fixed to 90 degrees... it's *not* general now
- */
-void o_picture_rotate(TOPLEVEL *w_current,
- int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the center of rotation to world unit */
- SCREENtoWORLD(w_current,
- centerx, centery,
- &world_centerx, &world_centery);
-
- /* rotate the picture */
- /* the check of the rotation angle is in o_picture_rotate_world() */
- o_picture_rotate_world(w_current,
- world_centerx, world_centery, angle,
- object);
-
- /* screen coords and boundings are updated by _rotate_world() */
-
-}
-
/*! \brief Rotate picture OBJECT using WORLD coordinates.
* \par Function Description
* This function rotates the picture described by <B>*object</B> around
@@ -760,40 +711,6 @@
}
-/*! \brief Mirror a picture.
- * \par Function Description
- * This function mirrors the picture from the point
- * (<B>centerx</B>,<B>centery</B>) in screen unit.
- *
- * The origin of the mirror in screen unit is converted in world unit.
- * The picture is mirrored with the function #o_picture_mirror_world()
- * for which the origin of the mirror must be given in world unit.
- *
- * \param [in] w_current The TOPLEVEL object.
- * \param [in] centerx Origin x coordinate in WORLD units.
- * \param [in] centery Origin y coordinate in WORLD units.
- * \param [in,out] object Picture OBJECT to mirror.
- */
-void o_picture_mirror(TOPLEVEL *w_current,
- int centerx, int centery,
- OBJECT *object)
-{
- int world_centerx, world_centery;
-
- /* convert the origin of mirror */
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* apply the mirror in world coords */
- o_picture_mirror_world(w_current,
- world_centerx, world_centery,
- object);
-
- /* screen coords and boundings are updated by _mirror_world() */
-
-}
-
/*! \brief Mirror a picture using WORLD coordinates.
* \par Function Description
* This function mirrors the picture from the point
@@ -847,36 +764,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.25 +0 -95 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
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- o_pin_basic.c 7 Dec 2006 04:24:18 -0000 1.24
+++ o_pin_basic.c 24 Feb 2007 18:43:16 -0000 1.25
@@ -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;
@@ -529,39 +491,6 @@
* \par Function Description
*
*/
-void o_pin_rotate(TOPLEVEL *w_current, int centerx, int centery, int angle,
- OBJECT *object)
-{
- int world_centerx, world_centery;
- int newx, newy;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* translate object to origin */
- o_pin_translate_world(w_current, -world_centerx, -world_centery, object);
-
- rotate_point_90(object->line->x[0], object->line->y[0], angle,
- &newx, &newy);
-
- object->line->x[0] = newx;
- object->line->y[0] = newy;
-
- rotate_point_90(object->line->x[1], object->line->y[1], angle,
- &newx, &newy);
-
- object->line->x[1] = newx;
- object->line->y[1] = newy;
-
- o_pin_translate_world(w_current, world_centerx, world_centery, object);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
void o_pin_rotate_world(TOPLEVEL *w_current, int world_centerx,
int world_centery, int angle,
OBJECT *object)
@@ -594,30 +523,6 @@
* \par Function Description
*
*/
-void o_pin_mirror(TOPLEVEL *w_current,
- int centerx, int centery, OBJECT *object)
-{
- int world_centerx, world_centery;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- /* translate object to origin */
- o_pin_translate_world(w_current, -world_centerx, -world_centery, object);
-
- object->line->x[0] = -object->line->x[0];
-
- object->line->x[1] = -object->line->x[1];
-
- o_pin_translate_world(w_current, world_centerx, world_centery, object);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
void o_pin_mirror_world(TOPLEVEL *w_current,
int world_centerx, int world_centery, OBJECT *object)
{
1.27 +0 -47 eda/geda/gaf/libgeda/src/o_text_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_text_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_text_basic.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_text_basic.c 10 Feb 2007 19:43:44 -0000 1.26
+++ o_text_basic.c 24 Feb 2007 18:43:16 -0000 1.27
@@ -1830,37 +1830,6 @@
o_text_recreate(w_current, object);
}
-void o_text_rotate(TOPLEVEL *w_current, int centerx, int centery, int angle,
- int angle_change, OBJECT *object)
-{
- int newx, newy;
- int origx, origy;
- int world_centerx, world_centery;
- int x, y;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
-
- origx = object->text->x;
- origy = object->text->y;
-
- object->text->angle = angle;
-
- x = origx + (-world_centerx);
- y = origy + (-world_centery);
-
- rotate_point_90(x, y, angle_change, &newx, &newy);
-
- x = newx + (world_centerx);
- y = newy + (world_centery);
-
- o_text_translate_world(w_current, x-object->text->x, y-object->text->y, object);
-
- o_text_recreate(w_current, object);
-}
-
#if 0 /* code which is no longer needed, replaced by new functions below */
/*! \todo Finish function documentation!!!
* \brief
@@ -2453,19 +2422,3 @@
o_text_recreate(w_current, object);
}
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_text_mirror(TOPLEVEL *w_current,
- int centerx, int centery, OBJECT *object)
-{
- int world_centerx, world_centery;
-
- SCREENtoWORLD(w_current, centerx, centery,
- &world_centerx,
- &world_centery);
-
- o_text_mirror_world(w_current, world_centerx, world_centery, object);
-}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs