[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-84-g6cf89af)
The branch, master has been updated
via 6cf89af1dc94790e8671a2c5d760a47a31d3a6eb (commit)
via 02da9f9d11cc04eae292a868172033e3eb6c8147 (commit)
via deca0be214ca709ffd2cedeb75919ffdb1dd232a (commit)
via 6c9b043233a645f6293d62f5a8c598cd5f95940b (commit)
via 7bdd0362b87bcfc29a647f650a2d610465314526 (commit)
from 17c64b764cb42afc8d5b80a66361029655dd644b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/src/o_arc.c | 12 +++++++++---
gschem/src/o_picture.c | 4 ++--
libgeda/include/prototype.h | 22 +++++++++++-----------
libgeda/src/o_basic.c | 4 ++--
libgeda/src/o_box_basic.c | 14 +++++++-------
libgeda/src/o_bus_basic.c | 10 +++++-----
libgeda/src/o_circle_basic.c | 10 +++++-----
libgeda/src/o_complex_basic.c | 8 ++++----
libgeda/src/o_line_basic.c | 14 +++++++-------
libgeda/src/o_list.c | 8 ++++----
libgeda/src/o_net_basic.c | 10 +++++-----
libgeda/src/o_picture.c | 14 +++++++-------
libgeda/src/o_pin_basic.c | 10 +++++-----
libgeda/src/o_text_basic.c | 8 ++++----
libgeda/src/s_basic.c | 16 ++++++----------
15 files changed, 83 insertions(+), 81 deletions(-)
=================
Commit Messages
=================
commit 6cf89af1dc94790e8671a2c5d760a47a31d3a6eb
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:42:06 2008 +0100
o_*_translate_world(): Rename x1 and y1 parameters to dx and dy
Makes the purpose of these variables more obvious.
:100644 100644 ce0e194... 5a40281... M libgeda/include/prototype.h
:100644 100644 54e40eb... 8e57f3c... M libgeda/src/o_box_basic.c
:100644 100644 32ccd6e... 3f3fe93... M libgeda/src/o_bus_basic.c
:100644 100644 4f0acb5... 1bfbd04... M libgeda/src/o_circle_basic.c
:100644 100644 b42c636... 47595c0... M libgeda/src/o_complex_basic.c
:100644 100644 5554de2... bcebbf9... M libgeda/src/o_line_basic.c
:100644 100644 f2f0c82... 5a1fb36... M libgeda/src/o_list.c
:100644 100644 465cd61... a406c9b... M libgeda/src/o_net_basic.c
:100644 100644 1a7810e... a15ddb0... M libgeda/src/o_picture.c
:100644 100644 f65cfdc... 541c0ee... M libgeda/src/o_pin_basic.c
:100644 100644 cf5aad6... feb48c4... M libgeda/src/o_text_basic.c
commit 02da9f9d11cc04eae292a868172033e3eb6c8147
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:40:56 2008 +0100
o_{rotate,mirror}_world(): Make error message mention the right function.
:100644 100644 c1a0691... d617165... M libgeda/src/o_basic.c
commit deca0be214ca709ffd2cedeb75919ffdb1dd232a
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:40:55 2008 +0100
s_delete(): Delete code with no effect.
If a pointer is already NULL, there's no point setting it to NULL.
:100644 100644 3463c80... 8fe7e87... M libgeda/src/s_basic.c
commit 6c9b043233a645f6293d62f5a8c598cd5f95940b
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:33:45 2008 +0100
o_picture_rubberbox(): Update comments to reflect reality.
Coordinates passed are in world units, not screen.
:100644 100644 cf91611... 24b9653... M gschem/src/o_picture.c
commit 7bdd0362b87bcfc29a647f650a2d610465314526
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:33:45 2008 +0100
o_arc_rubberarc(): Document the effect of moving each grip.
The documentation was elsewhere far away. Moving it closer to the
arc moving code mitigates the "action at a distance" antipattern.
:100644 100644 f0e967c... dc38c43... M gschem/src/o_arc.c
=========
Changes
=========
commit 6cf89af1dc94790e8671a2c5d760a47a31d3a6eb
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:42:06 2008 +0100
o_*_translate_world(): Rename x1 and y1 parameters to dx and dy
Makes the purpose of these variables more obvious.
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index ce0e194..5a40281 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -145,7 +145,7 @@ gdouble o_shortest_distance(OBJECT *object, gint x, gint y);
OBJECT *o_box_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
OBJECT *o_box_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_box_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
-void o_box_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_box_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_box_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_box_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_box_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
@@ -155,7 +155,7 @@ void world_get_box_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *to
void world_get_bus_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_bus_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int bus_ripper_direction);
void o_bus_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void o_bus_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_bus_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_bus_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_bus_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_bus_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
@@ -170,7 +170,7 @@ int dist(int x1, int y1, int x2, int y2);
OBJECT *o_circle_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x, int y, int radius);
OBJECT *o_circle_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_circle_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
-void o_circle_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_circle_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_circle_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_circle_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_circle_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
@@ -197,7 +197,7 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *o_complex_add_embedded(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x, int y, int angle, int mirror, const gchar *basename, int selectable);
void o_complex_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
-void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_complex_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_complex_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
OBJECT *o_complex_copy_embedded(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_complex_set_color(OBJECT *prim_objs, int color);
@@ -221,7 +221,7 @@ void o_unembed(TOPLEVEL *toplevel, OBJECT *o_current);
OBJECT *o_line_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
OBJECT *o_line_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_line_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
-void o_line_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_line_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_line_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_line_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_line_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
@@ -237,8 +237,8 @@ GList *o_glist_copy_all_to_glist(TOPLEVEL *toplevel, GList *src_list, GList *des
OBJECT *o_list_search(OBJECT *list, OBJECT *current);
void o_list_delete(TOPLEVEL *toplevel, OBJECT *list, OBJECT *delete);
void o_list_delete_rest(TOPLEVEL *toplevel, OBJECT *list);
-void o_list_translate_world(TOPLEVEL *toplevel, int x, int y, OBJECT *list);
-void o_glist_translate_world(TOPLEVEL *toplevel, int x, int y, GList *list);
+void o_list_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *list);
+void o_glist_translate_world(TOPLEVEL *toplevel, int dx, int dy, GList *list);
void o_list_rotate_world(TOPLEVEL *toplevel, int x, int y, int angle, OBJECT *list);
void o_glist_rotate_world(TOPLEVEL *toplevel, int x, int y, int angle, GList *list);
void o_list_mirror_world(TOPLEVEL *toplevel, int x, int y, OBJECT *list);
@@ -248,7 +248,7 @@ void o_glist_mirror_world(TOPLEVEL *toplevel, int x, int y, GList *list);
void world_get_net_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_net_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
void o_net_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void o_net_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_net_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_net_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_net_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_net_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
@@ -270,7 +270,7 @@ void world_get_picture_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int
void o_picture_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
void o_picture_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle,OBJECT *object);
void o_picture_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
-void o_picture_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_picture_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_picture_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
guint8 *o_picture_rgb_data(GdkPixbuf *image);
guint8 *o_picture_mask_data(GdkPixbuf *image);
@@ -282,7 +282,7 @@ GdkPixbuf *o_picture_pixbuf_from_buffer (gchar *file_content, gsize file_length,
void world_get_pin_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_pin_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int pin_type, int whichend);
void o_pin_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void o_pin_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_pin_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_pin_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_pin_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_pin_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
@@ -311,7 +311,7 @@ OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color
void o_text_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_text_set_info_font(char buf[]);
void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current);
-void o_text_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *o_current);
+void o_text_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *o_current);
OBJECT *o_text_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_text_freeallfonts(TOPLEVEL *toplevel);
void o_text_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index 54e40eb..8e57f3c 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -457,19 +457,19 @@ char *o_box_save(OBJECT *object)
* described by <B>*object</B>. <B>x1</B> and <B>y1</B> are in world unit.
*
* \param [in] toplevel The TOPLEVEL object.
- * \param [in] x1 x distance to move.
- * \param [in] y1 y distance to move.
+ * \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_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object)
+void o_box_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object)
{
if (object == NULL) printf("btw NO!\n");
/* Do world coords */
- object->box->upper_x = object->box->upper_x + x1;
- object->box->upper_y = object->box->upper_y + y1;
- object->box->lower_x = object->box->lower_x + x1;
- object->box->lower_y = object->box->lower_y + y1;
+ object->box->upper_x = object->box->upper_x + dx;
+ object->box->upper_y = object->box->upper_y + dy;
+ object->box->lower_x = object->box->lower_x + dx;
+ object->box->lower_y = object->box->lower_y + dy;
/* recalc the screen coords and the bounding box */
o_box_recalc(toplevel, object);
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index 32ccd6e..3f3fe93 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -199,7 +199,7 @@ char *o_bus_save(OBJECT *object)
* \par Function Description
*
*/
-void o_bus_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object)
+void o_bus_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object)
{
int left, right, top, bottom;
@@ -207,10 +207,10 @@ void o_bus_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object)
/* Update world coords */
- object->line->x[0] = object->line->x[0] + x1;
- object->line->y[0] = object->line->y[0] + y1;
- object->line->x[1] = object->line->x[1] + x1;
- object->line->y[1] = object->line->y[1] + y1;
+ object->line->x[0] = object->line->x[0] + dx;
+ object->line->y[0] = object->line->y[0] + dy;
+ object->line->x[1] = object->line->x[1] + dx;
+ object->line->y[1] = object->line->y[1] + dy;
/* Update bounding box */
world_get_bus_bounds(toplevel, object, &left, &top, &right, &bottom);
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index 4f0acb5..1bfbd04 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -382,18 +382,18 @@ char *o_circle_save(OBJECT *object)
* described by <B>*object</B>. <B>x1</B> and <B>y1</B> are in world unit.
*
* \param [in] toplevel The TOPLEVEL object.
- * \param [in] x1 x distance to move.
- * \param [in] y1 y distance to move.
+ * \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_world(TOPLEVEL *toplevel,
- int x1, int y1, OBJECT *object)
+ int dx, int dy, OBJECT *object)
{
if (object == NULL) printf("ctw NO!\n");
/* Do world coords */
- object->circle->center_x = object->circle->center_x + x1;
- object->circle->center_y = object->circle->center_y + y1;
+ object->circle->center_x = object->circle->center_x + dx;
+ object->circle->center_y = object->circle->center_y + dy;
/* recalc the screen coords and the bounding box */
o_circle_recalc(toplevel, object);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index b42c636..47595c0 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -781,7 +781,7 @@ char *o_complex_save(OBJECT *object)
* \par Function Description
*
*/
-void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1,
+void o_complex_translate_world(TOPLEVEL *toplevel, int dx, int dy,
OBJECT *object)
{
int left, right, top, bottom;
@@ -790,10 +790,10 @@ void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1,
(object->type == OBJ_COMPLEX ||
object->type == OBJ_PLACEHOLDER));
- object->complex->x = object->complex->x + x1;
- object->complex->y = object->complex->y + y1;
+ object->complex->x = object->complex->x + dx;
+ object->complex->y = object->complex->y + dy;
- o_list_translate_world (toplevel, x1, y1, object->complex->prim_objs);
+ o_list_translate_world(toplevel, dx, dy, object->complex->prim_objs);
world_get_object_list_bounds(toplevel, object->complex->prim_objs,
&left, &top, &right, &bottom);
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index 5554de2..bcebbf9 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -370,22 +370,22 @@ char *o_line_save(OBJECT *object)
* described by <B>*object</B>. <B>x1</B> and <B>y1</B> are in world unit.
*
* \param [in] toplevel The TOPLEVEL object.
- * \param [in] x1 x distance to move.
- * \param [in] y1 y distance to move.
+ * \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_world(TOPLEVEL *toplevel,
- int x1, int y1, OBJECT *object)
+ int dx, int dy, OBJECT *object)
{
int left, right, top, bottom;
if (object == NULL) printf("ltw NO!\n");
/* Update world coords */
- object->line->x[0] = object->line->x[0] + x1;
- object->line->y[0] = object->line->y[0] + y1;
- object->line->x[1] = object->line->x[1] + x1;
- object->line->y[1] = object->line->y[1] + y1;
+ object->line->x[0] = object->line->x[0] + dx;
+ object->line->y[0] = object->line->y[0] + dy;
+ object->line->x[1] = object->line->x[1] + dx;
+ object->line->y[1] = object->line->y[1] + dy;
/* Update bounding box */
world_get_line_bounds(toplevel, object, &left, &top, &right, &bottom);
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index f2f0c82..5a1fb36 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -423,12 +423,12 @@ void o_list_delete_rest(TOPLEVEL *toplevel, OBJECT *list)
* \brief
* \par Function Description
*/
-void o_list_translate_world (TOPLEVEL *toplevel, int x, int y, OBJECT *list)
+void o_list_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *list)
{
OBJECT *o_current = list;
while ( o_current != NULL ) {
- o_translate_world (toplevel, x, y, o_current);
+ o_translate_world(toplevel, dx, dy, o_current);
o_current = o_current->next;
}
}
@@ -438,14 +438,14 @@ void o_list_translate_world (TOPLEVEL *toplevel, int x, int y, OBJECT *list)
* \brief
* \par Function Description
*/
-void o_glist_translate_world (TOPLEVEL *toplevel, int x, int y, GList *list)
+void o_glist_translate_world(TOPLEVEL *toplevel, int dx, int dy, GList *list)
{
GList *iter = list;
OBJECT *o_current;
while ( iter != NULL ) {
o_current = (OBJECT *)iter->data;
- o_translate_world (toplevel, x, y, o_current);
+ o_translate_world(toplevel, dx, dy, o_current);
iter = g_list_next (iter);
}
}
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 465cd61..a406c9b 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -206,7 +206,7 @@ char *o_net_save(OBJECT *object)
*
*
*/
-void o_net_translate_world(TOPLEVEL *toplevel, int x1, int y1,
+void o_net_translate_world(TOPLEVEL *toplevel, int dx, int dy,
OBJECT *object)
{
int left, right, top, bottom;
@@ -216,10 +216,10 @@ void o_net_translate_world(TOPLEVEL *toplevel, int x1, int y1,
/* Update world coords */
- object->line->x[0] = object->line->x[0] + x1;
- object->line->y[0] = object->line->y[0] + y1;
- object->line->x[1] = object->line->x[1] + x1;
- object->line->y[1] = object->line->y[1] + y1;
+ object->line->x[0] = object->line->x[0] + dx;
+ object->line->y[0] = object->line->y[0] + dy;
+ object->line->x[1] = object->line->x[1] + dx;
+ object->line->y[1] = object->line->y[1] + dy;
/* Update bounding box */
world_get_net_bounds(toplevel, object, &left, &top, &right, &bottom);
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index 1a7810e..a15ddb0 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -645,20 +645,20 @@ void o_picture_mirror_world(TOPLEVEL *toplevel,
* described by <B>*object</B>. <B>x1</B> and <B>y1</B> are in world units.
*
* \param [in] toplevel The TOPLEVEL object.
- * \param [in] x1 x distance to move.
- * \param [in] y1 y distance to move.
+ * \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_world(TOPLEVEL *toplevel,
- int x1, int y1, OBJECT *object)
+ int dx, int dy, OBJECT *object)
{
if (object == NULL) printf("btw NO!\n");
/* Do world coords */
- object->picture->upper_x = object->picture->upper_x + x1;
- object->picture->upper_y = object->picture->upper_y + y1;
- object->picture->lower_x = object->picture->lower_x + x1;
- object->picture->lower_y = object->picture->lower_y + y1;
+ object->picture->upper_x = object->picture->upper_x + dx;
+ object->picture->upper_y = object->picture->upper_y + dy;
+ object->picture->lower_x = object->picture->lower_x + dx;
+ object->picture->lower_y = object->picture->lower_y + dy;
/* recalc the screen coords and the bounding picture */
o_picture_recalc(toplevel, object);
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index f65cfdc..541c0ee 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -203,7 +203,7 @@ char *o_pin_save(OBJECT *object)
* \par Function Description
*
*/
-void o_pin_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object)
+void o_pin_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object)
{
int left, right, top, bottom;
@@ -211,10 +211,10 @@ void o_pin_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object)
/* Update world coords */
- object->line->x[0] = object->line->x[0] + x1;
- object->line->y[0] = object->line->y[0] + y1;
- object->line->x[1] = object->line->x[1] + x1;
- object->line->y[1] = object->line->y[1] + y1;
+ object->line->x[0] = object->line->x[0] + dx;
+ object->line->y[0] = object->line->y[0] + dy;
+ object->line->x[1] = object->line->x[1] + dx;
+ object->line->y[1] = object->line->y[1] + dy;
/* Update bounding box */
world_get_pin_bounds(toplevel, object, &left, &top, &right, &bottom);
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index cf5aad6..feb48c4 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -1359,12 +1359,12 @@ void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current)
*
*/
void o_text_translate_world(TOPLEVEL *toplevel,
- int x1, int y1, OBJECT *o_current)
+ int dx, int dy, OBJECT *o_current)
{
- o_current->text->x = o_current->text->x + x1;
- o_current->text->y = o_current->text->y + y1;
+ o_current->text->x = o_current->text->x + dx;
+ o_current->text->y = o_current->text->y + dy;
- o_list_translate_world(toplevel, x1, y1, o_current->text->prim_objs);
+ o_list_translate_world(toplevel, dx, dy, o_current->text->prim_objs);
/* Update bounding box */
o_text_recalc( toplevel, o_current );
commit 02da9f9d11cc04eae292a868172033e3eb6c8147
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:40:56 2008 +0100
o_{rotate,mirror}_world(): Make error message mention the right function.
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index c1a0691..d617165 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -320,7 +320,7 @@ void o_rotate_world (TOPLEVEL *toplevel, int world_centerx, int world_centery, i
case OBJ_PIN: func = o_pin_rotate_world; break;
case OBJ_ARC: func = o_arc_rotate_world; break;
default:
- g_critical ("o_translate_world: object %p has bad type '%c'\n",
+ g_critical ("o_rotate_world: object %p has bad type '%c'\n",
object, object->type);
}
@@ -358,7 +358,7 @@ void o_mirror_world (TOPLEVEL *toplevel, int world_centerx, int world_centery, O
case OBJ_PIN: func = o_pin_mirror_world; break;
case OBJ_ARC: func = o_arc_mirror_world; break;
default:
- g_critical ("o_translate_world: object %p has bad type '%c'\n",
+ g_critical ("o_mirror_world: object %p has bad type '%c'\n",
object, object->type);
}
commit deca0be214ca709ffd2cedeb75919ffdb1dd232a
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:40:55 2008 +0100
s_delete(): Delete code with no effect.
If a pointer is already NULL, there's no point setting it to NULL.
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 3463c80..8fe7e87 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -410,16 +410,12 @@ s_delete(TOPLEVEL *toplevel, OBJECT *o_current)
printf("sdel: %d\n", o_current->sid);
#endif
- if (o_current->next)
- o_current->next->prev = o_current->prev;
- else
- o_current->next = NULL;
-
- if (o_current->prev)
- o_current->prev->next = o_current->next;
- else
- o_current->prev = NULL;
-
+ if (o_current->next)
+ o_current->next->prev = o_current->prev;
+
+ if (o_current->prev)
+ o_current->prev->next = o_current->next;
+
s_delete_object(toplevel, o_current);
}
}
commit 6c9b043233a645f6293d62f5a8c598cd5f95940b
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:33:45 2008 +0100
o_picture_rubberbox(): Update comments to reflect reality.
Coordinates passed are in world units, not screen.
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index cf91611..24b9653 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -230,8 +230,8 @@ void o_picture_eraserubber(GSCHEM_TOPLEVEL *w_current)
* macros. The box is then erased by performing a xor-drawing over the box.
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
- * \param [in] x Current x coordinate of pointer in screen units.
- * \param [in] y Current y coordinate of pointer in screen units.
+ * \param [in] w_x Current x coordinate of pointer in world units.
+ * \param [in] w_y Current y coordinate of pointer in world units.
*/
void o_picture_rubberbox(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
commit 7bdd0362b87bcfc29a647f650a2d610465314526
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Wed Aug 13 01:33:45 2008 +0100
o_arc_rubberarc(): Document the effect of moving each grip.
The documentation was elsewhere far away. Moving it closer to the
arc moving code mitigates the "action at a distance" antipattern.
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index f0e967c..dc38c43 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -993,9 +993,15 @@ void o_arc_end4(GSCHEM_TOPLEVEL *w_current, int start_angle, int end_angle)
*
* <B>whichone</B> can have one of the following values:
* <DL>
- * <DT>*</DT><DD>ARC_RADIUS
- * <DT>*</DT><DD>ARC_START_ANGLE
- * <DT>*</DT><DD>ARC_END_ANGLE
+ * <DT>ARC_RADIUS</DT>
+ * <DD>at the center of the arc. This grip is used to modify
+ * the radius of the arc.
+ * <DT>ARC_START_ANGLE</DT>
+ * <DD>at one end of the arc. It corresponds to the starting
+ * angle of the arc.
+ * <DT>ARC_END_ANGLE</DT>
+ * <DD>at the other end of the arc. It corresponds to the
+ * ending angle of the arc.
* </DL>
*/
void o_arc_rubberarc(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y, int whichone)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs