[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-85-g7a2311b)
The branch, master has been updated
via 7a2311b5e144601594c5b99b2ceb8a8e8567ac5e (commit)
via 6045569126c44bd5f09f77d74e472e75e36c908d (commit)
from 5cad2cd9a184e1af8273dba6d8ddc3c02a2b72d6 (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/include/prototype.h | 2 +-
gschem/src/o_attrib.c | 25 +++++++++++++++----------
gschem/src/o_select.c | 6 +++---
3 files changed, 19 insertions(+), 14 deletions(-)
=================
Commit Messages
=================
commit 7a2311b5e144601594c5b99b2ceb8a8e8567ac5e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Rename o_attrib_remove_selected_invisible()
This function had a todo note "get a better name". Lets go with
o_attrib_deselect_invisible().
Whilst I'm here, complete the doxygen comments for this function.
:100644 100644 0dafebf... 5278a9b... M gschem/include/prototype.h
:100644 100644 6c29f62... 6052b6d... M gschem/src/o_attrib.c
:100644 100644 f598444... 9c8d05b... M gschem/src/o_select.c
commit 6045569126c44bd5f09f77d74e472e75e36c908d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Tidy the o_attrib_remove_selected_invisible() function
This function does nothing when toplevel->show_hidden_text is
true. Returning immediately when this is the case, rather
than looping over the entire selection not doing anything.
:100644 100644 a4ac6d1... 6c29f62... M gschem/src/o_attrib.c
=========
Changes
=========
commit 7a2311b5e144601594c5b99b2ceb8a8e8567ac5e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Rename o_attrib_remove_selected_invisible()
This function had a todo note "get a better name". Lets go with
o_attrib_deselect_invisible().
Whilst I'm here, complete the doxygen comments for this function.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 0dafebf..5278a9b 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -484,7 +484,7 @@ void o_arc_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_arc_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_attrib.c */
void o_attrib_add_selected(GSCHEM_TOPLEVEL *w_current, SELECTION *selection, OBJECT *selected);
-void o_attrib_remove_selected_invisible(GSCHEM_TOPLEVEL *w_current, SELECTION *selection, OBJECT *selected);
+void o_attrib_deselect_invisible(GSCHEM_TOPLEVEL *w_current, SELECTION *selection, OBJECT *selected);
void o_attrib_toggle_visibility(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
void o_attrib_toggle_show_name_value(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int new_show_name_value);
OBJECT *o_attrib_add_attrib(GSCHEM_TOPLEVEL *w_current, const char *text_string, int visibility, int show_name_value, OBJECT *object);
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index 6c29f62..6052b6d 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -69,16 +69,20 @@ void o_attrib_add_selected(GSCHEM_TOPLEVEL *w_current, SELECTION *selection,
}
}
-/*! \todo Finish function documentation!!!
- * \brief
+/*! \brief Remove invisible attributes of an object from the selection list.
* \par Function Description
- * Remove all invisible attributes from the selection list.
*
- * \todo get a better name
+ * Remove all invisible attributes attached to the given object
+ * from the selection list. If hidden text is being shown, this
+ * function returns immediately.
+ *
+ * \param [in] w_current The GSCHEM_TOPLEVEL object.
+ * \param [in,out] selection The SELECTION list to remove from.
+ * \param [in] object The OBJECT whos invisible attributes to remove.
*/
-void o_attrib_remove_selected_invisible (GSCHEM_TOPLEVEL *w_current,
- SELECTION *selection,
- OBJECT *selected)
+void o_attrib_deselect_invisible (GSCHEM_TOPLEVEL *w_current,
+ SELECTION *selection,
+ OBJECT *selected)
{
OBJECT *a_current;
GList *a_iter;
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index f598444..9c8d05b 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -241,9 +241,9 @@ void o_select_object(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
/* Remove the invisible attributes from the object list as well,
* so they don't remain selected without the user knowing.
*/
- o_attrib_remove_selected_invisible (w_current,
- toplevel->page_current->selection_list,
- o_current);
+ o_attrib_deselect_invisible (w_current,
+ toplevel->page_current->selection_list,
+ o_current);
} else {
o_attrib_add_selected (w_current, toplevel->page_current->selection_list,
o_current);
commit 6045569126c44bd5f09f77d74e472e75e36c908d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Tidy the o_attrib_remove_selected_invisible() function
This function does nothing when toplevel->show_hidden_text is
true. Returning immediately when this is the case, rather
than looping over the entire selection not doing anything.
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index a4ac6d1..6c29f62 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -85,13 +85,14 @@ void o_attrib_remove_selected_invisible (GSCHEM_TOPLEVEL *w_current,
g_assert( selection != NULL );
+ if (w_current->toplevel->show_hidden_text)
+ return;
+
for (a_iter = selected->attribs; a_iter != NULL;
a_iter = g_list_next (a_iter)) {
a_current = a_iter->data;
- if (!w_current->toplevel->show_hidden_text &&
- a_current->visibility == INVISIBLE &&
- a_current->selected) {
+ if (a_current->selected && a_current->visibility == INVISIBLE) {
o_selection_remove (w_current->toplevel, selection, a_current);
o_invalidate (w_current, a_current);
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs