[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: s_sheet_data.c
User: pcjc2
Date: 07/04/06 13:29:13
Modified: . Tag: noscreen s_sheet_data.c s_table.c s_toplevel.c
Log:
Sync with trunk
Revision Changes Path
No revision
No revision
1.11.6.1 +7 -4 eda/geda/gaf/gattrib/src/s_sheet_data.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_sheet_data.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/s_sheet_data.c,v
retrieving revision 1.11
retrieving revision 1.11.6.1
diff -u -b -r1.11 -r1.11.6.1
--- s_sheet_data.c 13 Aug 2006 12:31:56 -0000 1.11
+++ s_sheet_data.c 6 Apr 2007 17:29:13 -0000 1.11.6.1
@@ -1,6 +1,6 @@
/* gEDA - GPL Electronic Design Automation
* gattrib -- gEDA component and net attribute manipulation using spreadsheet.
- * Copyright (C) 2003 Stuart D. Brorson.
+ * Copyright (C) 2003 -- 2007 Stuart D. Brorson.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -133,7 +133,8 @@
#if DEBUG
printf(" In s_sheet_add_master_comp_list, about to add to master list refdes = %s\n", temp_uref);
#endif
- s_string_list_add_item(sheet_head->master_comp_list_head, &(sheet_head->comp_count), temp_uref);
+ s_string_list_add_item(sheet_head->master_comp_list_head,
+ &(sheet_head->comp_count), temp_uref);
g_free(temp_uref);
}
@@ -194,8 +195,10 @@
attrib_name = u_basic_breakup_string(attrib_text, '=', 0);
/* Don't include "refdes" or "slot" because they form the row name */
- if ( (strcmp(attrib_name, "refdes") != 0)
- && (strcmp(attrib_name, "slot") != 0) ) {
+ /* Also don't include "net" per bug found by Steve W. -- 4.3.2007, SDB */
+ if ( (strcmp(attrib_name, "refdes") != 0) &&
+ (strcmp(attrib_name, "net") != 0) &&
+ (strcmp(attrib_name, "slot") != 0) ) {
#if DEBUG
printf(" . . . from this component, about to add to master comp attrib list attrib = %s\n", attrib_name);
#endif
1.13.6.1 +4 -2 eda/geda/gaf/gattrib/src/s_table.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_table.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/s_table.c,v
retrieving revision 1.13
retrieving revision 1.13.6.1
diff -u -b -r1.13 -r1.13.6.1
--- s_table.c 22 Aug 2006 18:20:00 -0000 1.13
+++ s_table.c 6 Apr 2007 17:29:13 -0000 1.13.6.1
@@ -281,8 +281,10 @@
old_show_name_value = a_current->object->show_name_value;
/* Don't include "refdes" or "slot" because they form the row name. */
- if ( (strcmp(attrib_name, "refdes") != 0)
- && (strcmp(attrib_name, "slot") != 0) ) {
+ /* Also don't include "net" per bug found by Steve W. 4.3.2007 -- SDB */
+ if ( (strcmp(attrib_name, "refdes") != 0) &&
+ (strcmp(attrib_name, "net") != 0) &&
+ (strcmp(attrib_name, "slot") != 0) ) {
/* Get row and col where to put this attrib */
row = s_table_get_index(sheet_head->master_comp_list_head, temp_uref);
1.22.6.2 +3 -1 eda/geda/gaf/gattrib/src/s_toplevel.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_toplevel.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/s_toplevel.c,v
retrieving revision 1.22.6.1
retrieving revision 1.22.6.2
diff -u -b -r1.22.6.1 -r1.22.6.2
--- s_toplevel.c 11 Feb 2007 23:58:20 -0000 1.22.6.1
+++ s_toplevel.c 6 Apr 2007 17:29:13 -0000 1.22.6.2
@@ -1,4 +1,4 @@
-/* $Id: s_toplevel.c,v 1.22.6.1 2007/02/11 23:58:20 pcjc2 Exp $ */
+/* $Id: s_toplevel.c,v 1.22.6.2 2007/04/06 17:29:13 pcjc2 Exp $ */
/* gEDA - GPL Electronic Design Automation
* gattrib -- gEDA component and net attribute manipulation using spreadsheet.
@@ -753,6 +753,7 @@
#if 1
old_attrib_name = u_basic_breakup_string(old_name_value_pair, '=', 0);
if ( (strcmp(old_attrib_name, "refdes") != 0) &&
+ (strcmp(old_attrib_name, "net") != 0) &&
(strcmp(old_attrib_name, "slot") != 0) &&
(s_attrib_name_in_list(new_comp_attrib_list, old_attrib_name) == FALSE) ) {
s_string_list_add_item(complete_comp_attrib_list, &count, old_name_value_pair);
@@ -763,6 +764,7 @@
/* Don't put "refdes" or "slot" into list. Don't put old name=value pair into list if a new
* one is already in there. */
if ( (strcmp(old_attrib_name, "refdes") != 0) &&
+ (strcmp(old_attrib_name, "net") != 0) &&
(strcmp(old_attrib_name, "slot") != 0) &&
(s_attrib_name_in_list(new_comp_attrib_list, old_attrib_name) == FALSE) ) {
s_string_list_add_item(complete_comp_attrib_list, &count, old_name_value_pair);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs