[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: i_basic.nw
User: ahvezda
Date: 05/11/06 21:43:16
Modified: . i_basic.nw i_callbacks.nw o_bus.nw o_net.nw
o_pin.nw
Log:
A bunch of changes, most having to do with tweaks to the "L" net drawing
Revision Changes Path
1.23 +4 -4 eda/geda/devel/gschem/noweb/i_basic.nw
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_basic.nw
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/i_basic.nw,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- i_basic.nw 30 Sep 2005 20:40:07 -0000 1.22
+++ i_basic.nw 7 Nov 2005 02:43:08 -0000 1.23
@@ -532,8 +532,8 @@
x_menus_sensitivity(w_current, "Edit/Unlock", TRUE);
x_menus_sensitivity(w_current, "Edit/Line Width & Type...", TRUE);
x_menus_sensitivity(w_current, "Edit/Fill Type...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Embed Component", TRUE);
- x_menus_sensitivity(w_current, "Edit/Unembed Component", TRUE);
+ x_menus_sensitivity(w_current, "Edit/Embed Component/Picture", TRUE);
+ x_menus_sensitivity(w_current, "Edit/Unembed Component/Picture", TRUE);
x_menus_sensitivity(w_current, "Edit/Update Component", TRUE);
x_menus_sensitivity(w_current, "Buffer/Copy into 1", TRUE);
x_menus_sensitivity(w_current, "Buffer/Copy into 2", TRUE);
@@ -576,8 +576,8 @@
x_menus_sensitivity(w_current, "Edit/Unlock", FALSE);
x_menus_sensitivity(w_current, "Edit/Line Width & Type...", FALSE);
x_menus_sensitivity(w_current, "Edit/Fill Type...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Embed Component", FALSE);
- x_menus_sensitivity(w_current, "Edit/Unembed Component", FALSE);
+ x_menus_sensitivity(w_current, "Edit/Embed Component/Picture", FALSE);
+ x_menus_sensitivity(w_current, "Edit/Unembed Component/Picture", FALSE);
x_menus_sensitivity(w_current, "Edit/Update Component", FALSE);
x_menus_sensitivity(w_current, "Buffer/Copy into 1", FALSE);
x_menus_sensitivity(w_current, "Buffer/Copy into 2", FALSE);
1.45 +2 -1 eda/geda/devel/gschem/noweb/i_callbacks.nw
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_callbacks.nw
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/i_callbacks.nw,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- i_callbacks.nw 15 Oct 2005 01:06:47 -0000 1.44
+++ i_callbacks.nw 7 Nov 2005 02:43:09 -0000 1.45
@@ -1467,7 +1467,8 @@
while (s_current != NULL) {
g_assert (s_current->selected_object != NULL);
- if (s_current->selected_object->type == OBJ_COMPLEX) {
+ if ( (s_current->selected_object->type == OBJ_COMPLEX) ||
+ (s_current->selected_object->type == OBJ_PICTURE) ) {
o_unembed (w_current, s_current->selected_object);
}
s_current = s_current->next;
1.11 +6 -3 eda/geda/devel/gschem/noweb/o_bus.nw
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_bus.nw
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_bus.nw,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- o_bus.nw 4 Feb 2005 04:39:29 -0000 1.10
+++ o_bus.nw 7 Nov 2005 02:43:09 -0000 1.11
@@ -640,18 +640,21 @@
if (size < 0)
size=0;
- gdk_gc_set_line_attributes(w_current->gc, size,
+ gdk_gc_set_line_attributes(w_current->xor_gc, size,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
}
+#if 0
gdk_gc_set_foreground(w_current->gc,
x_get_color(w_current->background_color) );
- gdk_draw_line(w_current->window, w_current->gc, w_current->start_x, w_current->start_y, w_current->last_x, w_current->last_y);
+#endif
+
+ gdk_draw_line(w_current->window, w_current->xor_gc, w_current->start_x, w_current->start_y, w_current->last_x, w_current->last_y);
if (w_current->bus_style == THICK ) {
- gdk_gc_set_line_attributes(w_current->gc, 0,
+ gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
1.19 +23 -5 eda/geda/devel/gschem/noweb/o_net.nw
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_net.nw
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_net.nw,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- o_net.nw 5 Oct 2005 17:46:58 -0000 1.18
+++ o_net.nw 7 Nov 2005 02:43:09 -0000 1.19
@@ -477,6 +477,7 @@
int color;
int size;
int primary_zero_length, secondary_zero_length;
+ int found_primary_connection = FALSE;
/*int temp_x, temp_y;*/
/* OBJECT *o_current;*/
@@ -602,7 +603,9 @@
other_objects = NULL;
other_objects = s_conn_return_others(other_objects, new_net);
}
+
#if DEBUG
+ printf("primary:\n");
s_conn_print(new_net->conn_list);
#endif
@@ -624,13 +627,26 @@
o_cue_draw_list(w_current, other_objects);
o_cue_draw_single(w_current, new_net);
+ /* Go off and search for valid connection on this newly created net */
+ found_primary_connection = s_conn_net_search(new_net, 1,
+ new_net->conn_list);
+ if (found_primary_connection)
+ {
+ /* if a net connection is found, reset start point of next net */
+ w_current->save_x = w_current->last_x;
+ w_current->save_y = w_current->last_y;
+ }
+
/* you don't want to consolidate nets which are drawn non-ortho */
if (w_current->net_consolidate == TRUE && !w_current->CONTROLKEY) {
o_net_consolidate_segments(w_current, new_net);
}
}
+
+
/* If the second net is not zero length, add it as well */
- if (!secondary_zero_length) {
+ /* Also, a valid net connection from the primary net was not found */
+ if (!secondary_zero_length && !found_primary_connection) {
/* Add secondary net */
w_current->page_current->object_tail =
@@ -811,16 +827,18 @@
if (size < 0)
size = 0;
- gdk_gc_set_line_attributes(w_current->gc, size,
+ gdk_gc_set_line_attributes(w_current->xor_gc, size,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
}
+#if 0
gdk_gc_set_foreground(w_current->gc,
x_get_color(w_current->background_color));
+#endif
/* Erase primary primary rubber net line */
- gdk_draw_line(w_current->window, w_current->gc, w_current->start_x,
+ gdk_draw_line(w_current->window, w_current->xor_gc, w_current->start_x,
w_current->start_y, w_current->last_x, w_current->last_y);
/* Erase secondary rubber net line */
@@ -829,7 +847,7 @@
w_current->second_x, w_current->second_y);
if (w_current->net_style == THICK) {
- gdk_gc_set_line_attributes(w_current->gc, 0,
+ gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
}
1.9 +7 -4 eda/geda/devel/gschem/noweb/o_pin.nw
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_pin.nw
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_pin.nw,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- o_pin.nw 4 Feb 2005 04:39:30 -0000 1.8
+++ o_pin.nw 7 Nov 2005 02:43:10 -0000 1.9
@@ -443,18 +443,21 @@
if (size < 0)
size=0;
- gdk_gc_set_line_attributes(w_current->gc, size,
+ gdk_gc_set_line_attributes(w_current->xor_gc, size,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
}
- gdk_gc_set_foreground(w_current->gc,
+#if 0
+ gdk_gc_set_foreground(w_current->xor_gc,
x_get_color(w_current->background_color) );
- gdk_draw_line(w_current->window, w_current->gc, w_current->start_x, w_current->start_y, w_current->last_x, w_current->last_y);
+#endif
+
+ gdk_draw_line(w_current->window, w_current->xor_gc, w_current->start_x, w_current->start_y, w_current->last_x, w_current->last_y);
if (w_current->net_style == THICK ) {
- gdk_gc_set_line_attributes(w_current->gc, 0,
+ gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID,
GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);