[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: o_arc_basic.c
User: pcjc2
Date: 07/02/11 21:20:25
Modified: . Tag: noscreen o_arc_basic.c o_basic.c o_box_basic.c
o_circle_basic.c o_line_basic.c o_picture.c
Log:
Removed all calls to o_object_recalc() now the data it calculates is no
longer used.
Revision Changes Path
No revision
No revision
1.31.2.5 +1 -5 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.4
retrieving revision 1.31.2.5
diff -u -b -r1.31.2.4 -r1.31.2.5
--- o_arc_basic.c 11 Feb 2007 23:59:04 -0000 1.31.2.4
+++ o_arc_basic.c 12 Feb 2007 02:20:24 -0000 1.31.2.5
@@ -529,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
@@ -560,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.15.2.2 +0 -36 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.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- o_basic.c 30 Dec 2006 14:57:53 -0000 1.15.2.1
+++ o_basic.c 12 Feb 2007 02:20:24 -0000 1.15.2.2
@@ -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.26.2.4 +1 -5 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.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- o_box_basic.c 27 Dec 2006 20:30:51 -0000 1.26.2.3
+++ o_box_basic.c 12 Feb 2007 02:20:24 -0000 1.26.2.4
@@ -624,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.
@@ -660,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.27.2.4 +0 -3 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.3
retrieving revision 1.27.2.4
diff -u -b -r1.27.2.3 -r1.27.2.4
--- o_circle_basic.c 27 Dec 2006 20:30:51 -0000 1.27.2.3
+++ o_circle_basic.c 12 Feb 2007 02:20:24 -0000 1.27.2.4
@@ -580,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.26.2.4 +0 -4 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.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- o_line_basic.c 27 Dec 2006 20:30:51 -0000 1.26.2.3
+++ o_line_basic.c 12 Feb 2007 02:20:24 -0000 1.26.2.4
@@ -531,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.
@@ -568,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.5.2.4 +1 -5 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.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- o_picture.c 27 Dec 2006 20:30:51 -0000 1.5.2.3
+++ o_picture.c 12 Feb 2007 02:20:24 -0000 1.5.2.4
@@ -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.
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs