[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-52-g980e933)
The branch, master has been updated
via 980e933a85d180019152424023b879c39d7e4aff (commit)
via 06692019e4c66e948cad3414ef92f188e9a38c98 (commit)
from dbb2d15d8d477ace013d0ddadea7e34f5d777b31 (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
=========
gattrib/src/s_object.c | 3 ++-
gattrib/src/s_toplevel.c | 2 +-
libgeda/include/libgeda/defines.h | 1 +
libgeda/src/a_basic.c | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
=================
Commit Messages
=================
commit 980e933a85d180019152424023b879c39d7e4aff
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Preserve visibility of embedded component attributes
gattrib was overriding the visibility of pin attributes to match the
visibility of the pin. This was not noticed for non-embedded complex
objects, as the edited pin attributes are not saved. For embedded
components, they are.
:100644 100644 24cc61d... cb9d9a9... M gattrib/src/s_object.c
:100644 100644 3b64fcc... 68a1221... M gattrib/src/s_toplevel.c
:100644 100644 cf5aea7... fe2df6a... M libgeda/include/libgeda/defines.h
commit 06692019e4c66e948cad3414ef92f188e9a38c98
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Fix primitive object load order of embedded objects
We were missing a g_list_reverse() when assigning the loaded prim_objs.
This is necessary as for performance, we prepend to the object glist
when reading - then reverse the list as a final step.
:100644 100644 b397f00... 2868891... M libgeda/src/a_basic.c
=========
Changes
=========
commit 980e933a85d180019152424023b879c39d7e4aff
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Preserve visibility of embedded component attributes
gattrib was overriding the visibility of pin attributes to match the
visibility of the pin. This was not noticed for non-embedded complex
objects, as the edited pin attributes are not saved. For embedded
components, they are.
diff --git a/gattrib/src/s_object.c b/gattrib/src/s_object.c
index 24cc61d..cb9d9a9 100644
--- a/gattrib/src/s_object.c
+++ b/gattrib/src/s_object.c
@@ -203,7 +203,8 @@ void s_object_replace_attrib_in_object(TOPLEVEL *toplevel,
new_attrib_text = g_strconcat(new_attrib_name, "=", new_attrib_value, NULL);
g_free(a_current->text->string); /* remove old attrib string */
a_current->text->string = g_strdup(new_attrib_text); /* insert new attrib string */
- o_set_visibility (toplevel, a_current, visibility);
+ if (visibility != LEAVE_VISIBILITY_ALONE)
+ o_set_visibility (toplevel, a_current, visibility);
if (show_name_value != LEAVE_NAME_VALUE_ALONE)
a_current->show_name_value = show_name_value;
g_free(new_attrib_text);
diff --git a/gattrib/src/s_toplevel.c b/gattrib/src/s_toplevel.c
index 3b64fcc..68a1221 100644
--- a/gattrib/src/s_toplevel.c
+++ b/gattrib/src/s_toplevel.c
@@ -997,7 +997,7 @@ s_toplevel_update_pin_attribs_in_toplevel (TOPLEVEL *toplevel,
o_pin,
new_attrib_name,
new_attrib_value,
- o_is_visible (toplevel, o_pin) ? VISIBLE : INVISIBLE,
+ LEAVE_VISIBILITY_ALONE,
LEAVE_NAME_VALUE_ALONE);
}
diff --git a/libgeda/include/libgeda/defines.h b/libgeda/include/libgeda/defines.h
index cf5aea7..fe2df6a 100644
--- a/libgeda/include/libgeda/defines.h
+++ b/libgeda/include/libgeda/defines.h
@@ -60,6 +60,7 @@
/* for visibility in st_objects */
#define INVISIBLE 0
#define VISIBLE 1
+#define LEAVE_VISIBILITY_ALONE -1
/* For pin and net styles */
#define THIN 0
commit 06692019e4c66e948cad3414ef92f188e9a38c98
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Fix primitive object load order of embedded objects
We were missing a g_list_reverse() when assigning the loaded prim_objs.
This is necessary as for performance, we prepend to the object glist
when reading - then reverse the list as a final step.
diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c
index b397f00..2868891 100644
--- a/libgeda/src/a_basic.c
+++ b/libgeda/src/a_basic.c
@@ -426,6 +426,7 @@ GList *o_read_buffer (TOPLEVEL *toplevel, GList *object_list,
* o_complex_translate_world (toplevel, object_list->x,
* object_list->y, object_list->complex);
*/
+ object_list = g_list_reverse (object_list);
new_obj = object_list_save->data;
new_obj->complex->prim_objs = object_list;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs