[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-54-gf94d63a)
The branch, master has been updated
via f94d63a9a9f73e70b51c16b1e9f337bfa26b0de2 (commit)
via 03896ea02c444e5889d98953f6a7f5988253cc40 (commit)
via 36dc96b81aadceb9bb6e4c3d8b59939a2dc240e0 (commit)
from 7018461cf5f5f011f3b59a711c4817752099a534 (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_buffer.c | 8 ++--
gschem/src/o_complex.c | 30 ++++++--------
gschem/src/o_copy.c | 4 +-
gschem/src/o_move.c | 7 +--
libgeda/include/prototype.h | 7 ++-
libgeda/src/a_basic.c | 2 +-
libgeda/src/o_basic.c | 37 +++++++++++++++++
libgeda/src/o_complex_basic.c | 86 ++++------------------------------------
libgeda/src/o_list.c | 33 ++++++++++++++++
libgeda/src/o_text_basic.c | 8 ++--
10 files changed, 109 insertions(+), 113 deletions(-)
=================
Commit Messages
=================
commit f94d63a9a9f73e70b51c16b1e9f337bfa26b0de2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:26:47 2007 +0100
Use o_translate_world() to tidy up o_complex_translate_world()
Removed o_complex_world_translate_toplevel(), and changed all useage of
o_complex_translate_world() for generic lists of objects to instead use
the new o_list_translate_world(). o_glist_translate_world() is also added.
:100644 100644 6e23acd... 6bd401f... M gschem/src/o_buffer.c
:100644 100644 c8649b0... c7ddc3c... M gschem/src/o_complex.c
:100644 100644 2bad386... 3852003... M gschem/src/o_copy.c
:100644 100644 791a874... 74c7655... M gschem/src/o_move.c
:100644 100644 463732a... 1567d7a... M libgeda/include/prototype.h
:100644 100644 3aa6751... 83da47d... M libgeda/src/o_complex_basic.c
:100644 100644 766a525... ddf7f1e... M libgeda/src/o_list.c
:100644 100644 e8682fa... 9acf339... M libgeda/src/o_text_basic.c
commit 03896ea02c444e5889d98953f6a7f5988253cc40
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:24:33 2007 +0100
Add new function o_translate_world() which will translate any object.
:100644 100644 43ca2f4... 463732a... M libgeda/include/prototype.h
:100644 100644 0ea20ef... 083e2a0... M libgeda/src/o_basic.c
commit 36dc96b81aadceb9bb6e4c3d8b59939a2dc240e0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:24:27 2007 +0100
Rename o_complex_world_translate() to o_complex_translate_world()
The function name now matches the pattern for other objects types.
:100644 100644 399d028... 6e23acd... M gschem/src/o_buffer.c
:100644 100644 b0d5559... c8649b0... M gschem/src/o_complex.c
:100644 100644 d15fad2... 791a874... M gschem/src/o_move.c
:100644 100644 e98bac5... 43ca2f4... M libgeda/include/prototype.h
:100644 100644 85bd8d7... 51e2ac2... M libgeda/src/a_basic.c
:100644 100644 a7729c9... 3aa6751... M libgeda/src/o_complex_basic.c
:100644 100644 6199e52... e8682fa... M libgeda/src/o_text_basic.c
=========
Changes
=========
commit f94d63a9a9f73e70b51c16b1e9f337bfa26b0de2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:26:47 2007 +0100
Use o_translate_world() to tidy up o_complex_translate_world()
Removed o_complex_world_translate_toplevel(), and changed all useage of
o_complex_translate_world() for generic lists of objects to instead use
the new o_list_translate_world(). o_glist_translate_world() is also added.
diff --git a/gschem/src/o_buffer.c b/gschem/src/o_buffer.c
index 6e23acd..6bd401f 100644
--- a/gschem/src/o_buffer.c
+++ b/gschem/src/o_buffer.c
@@ -135,7 +135,7 @@ void o_buffer_paste_start(TOPLEVEL *w_current, int screen_x, int screen_y,
y = snap_grid(w_current, rtop);
w_current->ADDING_SEL = 1;
- o_complex_translate_world(w_current, -x, -y, object_buffer[buf_num]);
+ o_list_translate_world(w_current, -x, -y, object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
/* now translate selection to current position */
@@ -144,7 +144,7 @@ void o_buffer_paste_start(TOPLEVEL *w_current, int screen_x, int screen_y,
y = snap_grid(w_current, y);
w_current->ADDING_SEL = 1;
- o_complex_translate_world(w_current, x, y, object_buffer[buf_num]);
+ o_list_translate_world(w_current, x, y, object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
w_current->last_x = w_current->start_x = fix_x(w_current, screen_x);
@@ -204,8 +204,8 @@ void o_buffer_paste_end(TOPLEVEL *w_current, int screen_x, int screen_y,
w_diff_x = w_x - w_start_x;
w_diff_y = w_y - w_start_y;
w_current->ADDING_SEL = 1;
- o_complex_translate_world(w_current, w_diff_x, w_diff_y,
- object_buffer[buf_num]);
+ o_list_translate_world(w_current, w_diff_x, w_diff_y,
+ object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
o_current = object_buffer[buf_num]->next;
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index c8649b0..c7ddc3c 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -291,7 +291,7 @@ void o_complex_end(TOPLEVEL *w_current, int screen_x, int screen_y)
o_start = o_start->next;
w_current->ADDING_SEL=0;
- o_complex_translate_world(w_current, x, y, o_start);
+ o_list_translate_world(w_current, x, y, o_start);
o_temp = o_start;
while (o_temp != NULL) {
@@ -596,17 +596,13 @@ void o_complex_translate_all(TOPLEVEL *w_current, int offset)
if (offset == 0) {
s_log_message(_("Translating schematic [%d %d]\n"), -x, -y);
- o_complex_translate_world(
- w_current,
- -x, -y,
- w_current->page_current->object_head);
+ o_list_translate_world(w_current, -x, -y,
+ w_current->page_current->object_head);
} else {
s_log_message(_("Translating schematic [%d %d]\n"),
offset, offset);
- o_complex_translate_world(
- w_current,
- offset, offset,
- w_current->page_current->object_head);
+ o_list_translate_world(w_current, offset, offset,
+ w_current->page_current->object_head);
}
o_current = w_current->page_current->object_head;
@@ -649,15 +645,15 @@ void o_complex_rotate_world(TOPLEVEL *w_current, int centerx, int centery,
x = newx + (centerx);
y = newy + (centery);
- o_complex_world_translate_toplevel(w_current,
- -object->complex->x,
- -object->complex->y, object);
+ o_complex_translate_world(w_current,
+ -object->complex->x,
+ -object->complex->y, object);
o_complex_rotate_lowlevel(w_current, 0, 0, angle, object);
object->complex->x = 0;
object->complex->y = 0;
- o_complex_world_translate_toplevel(w_current, x, y, object);
+ o_complex_translate_world(w_current, x, y, object);
object->complex->angle = ( object->complex->angle + angle ) % 360;
@@ -691,9 +687,9 @@ int o_complex_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_cen
x = newx + (world_centerx);
y = newy + (world_centery);
- o_complex_world_translate_toplevel(w_current,
- -object->complex->x,
- -object->complex->y, object);
+ o_complex_translate_world(w_current,
+ -object->complex->x,
+ -object->complex->y, object);
o_complex_mirror_lowlevel(w_current, 0, 0, object);
@@ -712,7 +708,7 @@ int o_complex_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_cen
object->complex->mirror = !object->complex->mirror;
- o_complex_world_translate_toplevel(w_current, x, y, object);
+ o_complex_translate_world(w_current, x, y, object);
#if DEBUG
printf("final res %d %d\n", object->complex->x, object->complex->y);
diff --git a/gschem/src/o_copy.c b/gschem/src/o_copy.c
index 2bad386..3852003 100644
--- a/gschem/src/o_copy.c
+++ b/gschem/src/o_copy.c
@@ -237,9 +237,7 @@ void o_copy_end(TOPLEVEL *w_current)
object->complex->prim_objs);
}
- o_complex_world_translate_toplevel(w_current,
- diff_x, diff_y,
- new_object);
+ o_complex_translate_world(w_current, diff_x, diff_y, new_object);
o_selection_add( temp_list, new_object );
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 791a874..74c7655 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -145,8 +145,7 @@ void o_move_end_lowlevel(TOPLEVEL * w_current, OBJECT * list, int type,
case (OBJ_COMPLEX):
case (OBJ_PLACEHOLDER):
- o_complex_translate_world (w_current, diff_x, diff_y,
- object->complex->prim_objs);
+ o_complex_translate_world(w_current, diff_x, diff_y, object);
break;
}
@@ -251,7 +250,7 @@ void o_move_end(TOPLEVEL * w_current)
}
/* this next section of code is from */
- /* o_complex_world_translate_toplevel */
+ /* o_complex_world_translate_world */
object->complex->x = object->complex->x + diff_x;
object->complex->y = object->complex->y + diff_y;
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 463732a..1567d7a 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -286,8 +286,7 @@ OBJECT *o_complex_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsi
char *o_complex_save(OBJECT *object);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
void o_complex_free_filename(TOPLEVEL *toplevel);
-void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *prim_objs);
-void o_complex_world_translate_toplevel(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
+void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, 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_delete(TOPLEVEL *toplevel, OBJECT *delete);
@@ -336,6 +335,8 @@ OBJECT *o_list_copy_all_selection2(TOPLEVEL *toplevel, GList *src_list_head, OBJ
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);
/* o_net_basic.c */
void world_get_net_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 3aa6751..83da47d 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -605,7 +605,7 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
}
o_complex_rotate_lowlevel(toplevel, x, y, angle, new_node);
- o_complex_translate_world(toplevel, x, y, prim_objs);
+ o_list_translate_world(toplevel, x, y, prim_objs);
if (!toplevel->ADDING_SEL) {
s_conn_update_complex(toplevel, prim_objs);
@@ -832,91 +832,23 @@ void o_complex_free_filename(TOPLEVEL *toplevel)
* \par Function Description
*
*/
-/* this needs work remove display stuff */
-/* libhack */
-/* and recalc stuff */
-/* this function takes in a complex list */
void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1,
- OBJECT *prim_objs)
-{
- OBJECT *o_current=NULL;
-
- o_current = prim_objs;
-
- while ( o_current != NULL ) {
- switch(o_current->type) {
- case(OBJ_LINE):
- o_line_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_NET):
- /* same as a line, don't do this */
- o_line_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_BUS):
- /* same as a line, don't do this */
- o_line_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_BOX):
- o_box_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_PICTURE):
- o_picture_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_CIRCLE):
- o_circle_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_COMPLEX):
- case(OBJ_PLACEHOLDER):
- o_complex_world_translate_toplevel(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_TEXT):
- o_text_translate_world(toplevel, x1, y1, o_current);
- break;
-
- /* same note as above */
- case(OBJ_PIN):
- o_pin_translate_world(toplevel, x1, y1, o_current);
- break;
-
- case(OBJ_ARC):
- o_arc_translate_world(toplevel, x1, y1, o_current);
- break;
- }
- o_current=o_current->next;
- }
-}
-
-/*! \brief
- * \par Function Description
- *
- */
-/* this function takes the toplevel object and then also translates the
- * complex */
-void o_complex_world_translate_toplevel(TOPLEVEL *toplevel,
- int x1, int y1, OBJECT *object)
+ OBJECT *object)
{
int left, right, top, bottom;
- g_return_if_fail(object != NULL);
- g_return_if_fail((object->type == OBJ_COMPLEX) ||
- (object->type == OBJ_PLACEHOLDER));
+ g_return_if_fail (object != NULL &&
+ (object->type == OBJ_COMPLEX ||
+ object->type == OBJ_PLACEHOLDER));
object->complex->x = object->complex->x + x1;
object->complex->y = object->complex->y + y1;
- o_complex_translate_world(toplevel, x1, y1,
- object->complex->prim_objs);
+ o_list_translate_world (toplevel, x1, y1, object->complex->prim_objs);
world_get_object_list_bounds(toplevel, object->complex->prim_objs,
- &left, &top, &right, &bottom);
-
+ &left, &top, &right, &bottom);
+
object->w_left = left;
object->w_top = top;
object->w_right = right;
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index 766a525..ddf7f1e 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -444,3 +444,36 @@ void o_list_delete_rest(TOPLEVEL *toplevel, OBJECT *list)
}
}
}
+
+
+/*! \todo Finish function description!!!
+ * \brief
+ * \par Function Description
+ */
+void o_list_translate_world (TOPLEVEL *toplevel, int x, int y, OBJECT *list)
+{
+ OBJECT *o_current = list;
+
+ while ( o_current != NULL ) {
+ o_translate_world (toplevel, x, y, o_current);
+ o_current = o_current->next;
+ }
+}
+
+
+/*! \todo Finish function description!!!
+ * \brief
+ * \par Function Description
+ */
+void o_glist_translate_world (TOPLEVEL *toplevel, int x, int y, GList *list)
+{
+ GList *iter = list;
+ OBJECT *o_current;
+
+ while ( iter != NULL ) {
+ o_current = (OBJECT *)iter->data;
+ o_translate_world (toplevel, x, y, o_current);
+ iter = g_list_next (iter);
+ }
+}
+
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index e8682fa..9acf339 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -656,9 +656,9 @@ OBJECT *o_text_create_string(TOPLEVEL *toplevel, OBJECT *object_list,
/* we don't want to do that for now */
/* Rotate and translate the character to its world position */
o_text_rotate_lowlevel(toplevel, x, y, angle, start_of_char);
- o_complex_translate_world(toplevel,
- x_offset, y_offset,
- start_of_char);
+ o_list_translate_world(toplevel,
+ x_offset, y_offset,
+ start_of_char);
/* Reset the escapes counter after being processed. Otherwise,
if the next character is also a backslash, it will
@@ -1381,7 +1381,7 @@ void o_text_translate_world(TOPLEVEL *toplevel,
o_current->text->x = o_current->text->x + x1;
o_current->text->y = o_current->text->y + y1;
- o_complex_translate_world(toplevel, x1, y1, o_current->text->prim_objs);
+ o_list_translate_world(toplevel, x1, y1, o_current->text->prim_objs);
/* Update bounding box */
o_text_recalc( toplevel, o_current );
commit 03896ea02c444e5889d98953f6a7f5988253cc40
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:24:33 2007 +0100
Add new function o_translate_world() which will translate any object.
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 43ca2f4..463732a 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -201,7 +201,7 @@ void o_recalc_object_list(TOPLEVEL *toplevel, OBJECT *object_list);
void o_recalc_object_glist(TOPLEVEL *toplevel, GList *object_glist);
void o_set_line_options(TOPLEVEL *toplevel, OBJECT *o_current, OBJECT_END end, OBJECT_TYPE type, int width, int length, int space);
void o_set_fill_options(TOPLEVEL *toplevel, OBJECT *o_current, OBJECT_FILLING type, int width, int pitch1, int angle1, int pitch2, int angle2);
-
+void o_translate_world (TOPLEVEL *toplevel, gint dx, gint dy, OBJECT *object);
/* o_box_basic.c */
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);
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index 0ea20ef..083e2a0 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -283,3 +283,40 @@ void o_set_fill_options(TOPLEVEL *toplevel, OBJECT *o_current,
o_current->fill_angle2 = angle2;
}
+
+
+/*! \brief Translates an object in world coordinates
+ * \par Function Description
+ * This function translates the object <B>object</B> by
+ * <B>dx</B> and <B>dy</B>.
+ *
+ * \param [in] toplevel The toplevel environment.
+ * \param [in] dx Amount to horizontally translate object
+ * \param [in] dx Amount to vertically translate object
+ * \param [in] object The object to translate.
+ */
+void o_translate_world (TOPLEVEL *toplevel, gint dx, gint dy, OBJECT *object)
+{
+ void (*func) (TOPLEVEL*, int, int, OBJECT*) = NULL;
+
+ switch (object->type) {
+ case OBJ_HEAD: /* Do nothing for head nodes */ break;
+ case OBJ_LINE: func = o_line_translate_world; break;
+ case OBJ_NET: func = o_net_translate_world; break;
+ case OBJ_BUS: func = o_bus_translate_world; break;
+ case OBJ_BOX: func = o_box_translate_world; break;
+ case OBJ_PICTURE: func = o_picture_translate_world; break;
+ case OBJ_CIRCLE: func = o_circle_translate_world; break;
+ case OBJ_PLACEHOLDER:
+ case OBJ_COMPLEX: func = o_complex_translate_world; break;
+ case OBJ_TEXT: func = o_text_translate_world; break;
+ case OBJ_PIN: func = o_pin_translate_world; break;
+ case OBJ_ARC: func = o_arc_translate_world; break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ if (func != NULL) {
+ (*func) (toplevel, dx, dy, object);
+ }
+}
commit 36dc96b81aadceb9bb6e4c3d8b59939a2dc240e0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Sep 8 23:24:27 2007 +0100
Rename o_complex_world_translate() to o_complex_translate_world()
The function name now matches the pattern for other objects types.
diff --git a/gschem/src/o_buffer.c b/gschem/src/o_buffer.c
index 399d028..6e23acd 100644
--- a/gschem/src/o_buffer.c
+++ b/gschem/src/o_buffer.c
@@ -135,7 +135,7 @@ void o_buffer_paste_start(TOPLEVEL *w_current, int screen_x, int screen_y,
y = snap_grid(w_current, rtop);
w_current->ADDING_SEL = 1;
- o_complex_world_translate(w_current, -x, -y, object_buffer[buf_num]);
+ o_complex_translate_world(w_current, -x, -y, object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
/* now translate selection to current position */
@@ -144,7 +144,7 @@ void o_buffer_paste_start(TOPLEVEL *w_current, int screen_x, int screen_y,
y = snap_grid(w_current, y);
w_current->ADDING_SEL = 1;
- o_complex_world_translate(w_current, x, y, object_buffer[buf_num]);
+ o_complex_translate_world(w_current, x, y, object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
w_current->last_x = w_current->start_x = fix_x(w_current, screen_x);
@@ -204,7 +204,7 @@ void o_buffer_paste_end(TOPLEVEL *w_current, int screen_x, int screen_y,
w_diff_x = w_x - w_start_x;
w_diff_y = w_y - w_start_y;
w_current->ADDING_SEL = 1;
- o_complex_world_translate(w_current, w_diff_x, w_diff_y,
+ o_complex_translate_world(w_current, w_diff_x, w_diff_y,
object_buffer[buf_num]);
w_current->ADDING_SEL = 0;
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index b0d5559..c8649b0 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -291,7 +291,7 @@ void o_complex_end(TOPLEVEL *w_current, int screen_x, int screen_y)
o_start = o_start->next;
w_current->ADDING_SEL=0;
- o_complex_world_translate(w_current, x, y, o_start);
+ o_complex_translate_world(w_current, x, y, o_start);
o_temp = o_start;
while (o_temp != NULL) {
@@ -596,14 +596,14 @@ void o_complex_translate_all(TOPLEVEL *w_current, int offset)
if (offset == 0) {
s_log_message(_("Translating schematic [%d %d]\n"), -x, -y);
- o_complex_world_translate(
+ o_complex_translate_world(
w_current,
-x, -y,
w_current->page_current->object_head);
} else {
s_log_message(_("Translating schematic [%d %d]\n"),
offset, offset);
- o_complex_world_translate(
+ o_complex_translate_world(
w_current,
offset, offset,
w_current->page_current->object_head);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index d15fad2..791a874 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -145,9 +145,9 @@ void o_move_end_lowlevel(TOPLEVEL * w_current, OBJECT * list, int type,
case (OBJ_COMPLEX):
case (OBJ_PLACEHOLDER):
- o_complex_world_translate (w_current, diff_x, diff_y,
- object->complex->prim_objs);
- break;
+ o_complex_translate_world (w_current, diff_x, diff_y,
+ object->complex->prim_objs);
+ break;
}
if (type == COMPLEX) {
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index e98bac5..43ca2f4 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -286,7 +286,7 @@ OBJECT *o_complex_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsi
char *o_complex_save(OBJECT *object);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
void o_complex_free_filename(TOPLEVEL *toplevel);
-void o_complex_world_translate(TOPLEVEL *toplevel, int x1, int y1, OBJECT *prim_objs);
+void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *prim_objs);
void o_complex_world_translate_toplevel(TOPLEVEL *toplevel, int x1, int y1, 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);
diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c
index 85bd8d7..51e2ac2 100644
--- a/libgeda/src/a_basic.c
+++ b/libgeda/src/a_basic.c
@@ -482,7 +482,7 @@ OBJECT *o_read_buffer(TOPLEVEL *toplevel, OBJECT *object_list,
object_list = object_list_save;
/* don't do this since objects are already
* stored/read translated
- * o_complex_world_translate(toplevel, object_list->x,
+ * o_complex_translate_world(toplevel, object_list->x,
* object_list->y, object_list->complex);
*/
toplevel->page_current->object_tail = temp_tail;
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index a7729c9..3aa6751 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -605,7 +605,7 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
}
o_complex_rotate_lowlevel(toplevel, x, y, angle, new_node);
- o_complex_world_translate(toplevel, x, y, prim_objs);
+ o_complex_translate_world(toplevel, x, y, prim_objs);
if (!toplevel->ADDING_SEL) {
s_conn_update_complex(toplevel, prim_objs);
@@ -836,7 +836,7 @@ void o_complex_free_filename(TOPLEVEL *toplevel)
/* libhack */
/* and recalc stuff */
/* this function takes in a complex list */
-void o_complex_world_translate(TOPLEVEL *toplevel, int x1, int y1,
+void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1,
OBJECT *prim_objs)
{
OBJECT *o_current=NULL;
@@ -911,7 +911,7 @@ void o_complex_world_translate_toplevel(TOPLEVEL *toplevel,
object->complex->x = object->complex->x + x1;
object->complex->y = object->complex->y + y1;
- o_complex_world_translate(toplevel, x1, y1,
+ o_complex_translate_world(toplevel, x1, y1,
object->complex->prim_objs);
world_get_object_list_bounds(toplevel, object->complex->prim_objs,
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 6199e52..e8682fa 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -656,7 +656,7 @@ OBJECT *o_text_create_string(TOPLEVEL *toplevel, OBJECT *object_list,
/* we don't want to do that for now */
/* Rotate and translate the character to its world position */
o_text_rotate_lowlevel(toplevel, x, y, angle, start_of_char);
- o_complex_world_translate(toplevel,
+ o_complex_translate_world(toplevel,
x_offset, y_offset,
start_of_char);
@@ -1381,7 +1381,7 @@ void o_text_translate_world(TOPLEVEL *toplevel,
o_current->text->x = o_current->text->x + x1;
o_current->text->y = o_current->text->y + y1;
- o_complex_world_translate(toplevel, x1, y1, o_current->text->prim_objs);
+ o_complex_translate_world(toplevel, x1, y1, o_current->text->prim_objs);
/* Update bounding box */
o_text_recalc( toplevel, o_current );
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs