[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-378-g2a768be)
The branch, master has been updated
via 2a768bee990afdb7e73a7f9c01aa0be372fd59ea (commit)
via 1a8e62cded4076f9711f86e50b1749972bc01b87 (commit)
from 07c7ea85f21c05b24513f1b087d839f098456408 (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/i_callbacks.c | 12 ------------
gschem/src/o_net.c | 42 +++---------------------------------------
2 files changed, 3 insertions(+), 51 deletions(-)
=================
Commit Messages
=================
commit 2a768bee990afdb7e73a7f9c01aa0be372fd59ea
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 13 22:06:25 2008 +0000
gschem: Don't re-invent the drawing routines in o_net_end()
Use o_redraw_single() in o_net_ned() rather than replicating parts of
the net drawing code.
:100644 100644 455b700... 19780f6... M gschem/src/o_net.c
commit 1a8e62cded4076f9711f86e50b1749972bc01b87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 13 21:27:01 2008 +0000
gschem: Empty "misc" callbacks
Remove apparently left over debugging code
:100644 100644 9887871... b2a5a9f... M gschem/src/i_callbacks.c
=========
Changes
=========
commit 2a768bee990afdb7e73a7f9c01aa0be372fd59ea
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 13 22:06:25 2008 +0000
gschem: Don't re-invent the drawing routines in o_net_end()
Use o_redraw_single() in o_net_ned() rather than replicating parts of
the net drawing code.
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 455b700..19780f6 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -658,10 +658,8 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
TOPLEVEL *toplevel = w_current->toplevel;
int color;
- int size;
int primary_zero_length, secondary_zero_length;
int found_primary_connection = FALSE;
- int sx[2], sy[2];
int save_magnetic, save_wx, save_wy;
GList *other_objects = NULL;
@@ -673,21 +671,11 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
but I need it for o_net_finish_magnetic */
save_magnetic = w_current->magnetic_visible;
- gdk_gc_set_foreground(w_current->xor_gc,
- x_get_darkcolor(w_current->select_color) );
-
o_net_eraserubber(w_current);
if (save_magnetic)
o_net_finishmagnetic(w_current);
- if (toplevel->net_style == THICK) {
- size = SCREENabs(toplevel, NET_WIDTH);
- gdk_gc_set_line_attributes(w_current->gc, size,
- GDK_LINE_SOLID,
- GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
- }
-
/* See if either of the nets are zero length. We'll only add */
/* the non-zero ones */
primary_zero_length = (w_current->first_wx == w_current->second_wx) &&
@@ -736,20 +724,8 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
printf("primary:\n");
s_conn_print(new_net->conn_list);
#endif
-
- WORLDtoSCREEN( toplevel, new_net->line->x[0], new_net->line->y[0], &sx[0], &sy[0] );
- WORLDtoSCREEN( toplevel, new_net->line->x[1], new_net->line->y[1], &sx[1], &sy[1] );
-
- gdk_gc_set_foreground(w_current->gc, x_get_color(color));
- gdk_draw_line (w_current->drawable, w_current->gc,
- sx[0], sy[0], sx[1], sy[1]);
- o_invalidate_rect(w_current, sx[0], sy[0], sx[1], sy[1]);
-
- if (toplevel->net_style == THICK) {
- gdk_gc_set_line_attributes(w_current->gc, 0,
- GDK_LINE_SOLID,
- GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
- }
+
+ o_redraw_single (w_current, new_net);
o_cue_undraw_list(w_current, other_objects);
o_cue_draw_list(w_current, other_objects);
@@ -800,19 +776,7 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
s_conn_print(new_net->conn_list);
#endif
- WORLDtoSCREEN( toplevel, new_net->line->x[0], new_net->line->y[0], &sx[0], &sy[0] );
- WORLDtoSCREEN( toplevel, new_net->line->x[1], new_net->line->y[1], &sx[1], &sy[1] );
-
- gdk_gc_set_foreground(w_current->gc, x_get_color(color));
- gdk_draw_line (w_current->drawable, w_current->gc,
- sx[0], sy[0], sx[1], sy[1]);
- o_invalidate_rect(w_current, sx[0], sy[0], sx[1], sy[1]);
-
- if (toplevel->net_style == THICK) {
- gdk_gc_set_line_attributes(w_current->gc, 0,
- GDK_LINE_SOLID,
- GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
- }
+ o_redraw_single (w_current, new_net);
o_cue_undraw_list(w_current, other_objects);
o_cue_draw_list(w_current, other_objects);
commit 1a8e62cded4076f9711f86e50b1749972bc01b87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 13 21:27:01 2008 +0000
gschem: Empty "misc" callbacks
Remove apparently left over debugging code
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index 9887871..b2a5a9f 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -3420,9 +3420,6 @@ DEFINE_I_CALLBACK(options_show_log_window)
*/
DEFINE_I_CALLBACK(misc)
{
- GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*) data;
-
- s_tile_print(w_current->toplevel);
}
/*! \todo Finish function documentation!!!
@@ -3434,14 +3431,6 @@ DEFINE_I_CALLBACK(misc)
*/
DEFINE_I_CALLBACK(misc2)
{
- GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*) data;
- OBJECT *first = o_select_return_first_object(w_current);
-
- if (first) {
- /*o_cue_draw_single(w_current, first);*/
- o_cue_undraw(w_current, first);
- s_conn_print(first->conn_list);
- }
}
/*! \todo Finish function documentation!!!
@@ -3453,7 +3442,6 @@ DEFINE_I_CALLBACK(misc2)
*/
DEFINE_I_CALLBACK(misc3)
{
-
}
/*! \todo Finish function documentation!!!
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs