[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-68-gd1e77cc)
The branch, master has been updated
via d1e77cc6b87f6bd78cfc38630c292ac2c0f1f09b (commit)
via aa91395ad62805ec4112d602406888a328c43519 (commit)
via 6a0fb625ba8dfd3d8dceb1b44055d4920e4b2658 (commit)
from 4595948e41b2d195eb78a820fc15d0d8596067a4 (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 | 4 -
gschem/include/x_states.h | 42 +++++-----
gschem/src/i_basic.c | 5 -
gschem/src/o_attrib.c | 182 --------------------------------------------
gschem/src/o_basic.c | 55 -------------
gschem/src/o_text.c | 9 --
gschem/src/x_event.c | 29 -------
gschem/tests/states_1.sch | 146 +++++++++++++++--------------------
libgeda/include/struct.h | 2 -
libgeda/src/s_toplevel.c | 3 -
10 files changed, 81 insertions(+), 396 deletions(-)
=================
Commit Messages
=================
commit d1e77cc6b87f6bd78cfc38630c292ac2c0f1f09b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:44:18 2007 +0100
Remove the redundant toplevel variables current_{show,visible}.
These variables were previously used for an interactive method of attrib
placement which has since been removed. The current_visible variable was
also tested during non-attribute text placement, but to no effect.
Whilst the file-format does technically allow invisible text, gschem's UI
pesesnts no way to achieve it, so removing this variable does no harm. The
ability to correctly load schematics with invisible text remains.
:100644 100644 2fecb84... 711c37d... M gschem/src/o_text.c
:100644 100644 93d5a97... 2743824... M libgeda/include/struct.h
:100644 100644 74a2872... b53040a... M libgeda/src/s_toplevel.c
commit aa91395ad62805ec4112d602406888a328c43519
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:36:19 2007 +0100
Remove the unused states for attrib placement: DRAWATTRIB and ENDATTRIB.
Also removes the functions:
o_attrib_{start|end|rubberattrib} which are no longer used after this.
:100644 100644 9df8b2d... 3e8b1bc... M gschem/include/prototype.h
:100644 100644 b26dc63... ef2db64... M gschem/include/x_states.h
:100644 100644 7e2c35c... 0f2813a... M gschem/src/i_basic.c
:100644 100644 dfb4132... 6127d64... M gschem/src/o_attrib.c
:100644 100644 66a01a6... 7d94c0c... M gschem/src/o_basic.c
:100644 100644 5635ba0... 644f1b7... M gschem/src/x_event.c
:100644 100644 584d22d... 29d32b2... M gschem/tests/states_1.sch
commit 6a0fb625ba8dfd3d8dceb1b44055d4920e4b2658
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:35:53 2007 +0100
Remove the unused function o_erasebounding().
:100644 100644 9c6dfa2... 9df8b2d... M gschem/include/prototype.h
:100644 100644 57f2e55... 66a01a6... M gschem/src/o_basic.c
=========
Changes
=========
commit d1e77cc6b87f6bd78cfc38630c292ac2c0f1f09b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:44:18 2007 +0100
Remove the redundant toplevel variables current_{show,visible}.
These variables were previously used for an interactive method of attrib
placement which has since been removed. The current_visible variable was
also tested during non-attribute text placement, but to no effect.
Whilst the file-format does technically allow invisible text, gschem's UI
pesesnts no way to achieve it, so removing this variable does no harm. The
ability to correctly load schematics with invisible text remains.
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 2fecb84..711c37d 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -415,15 +415,6 @@ void o_text_end(TOPLEVEL *w_current)
w_current->text_size,
VISIBLE, SHOW_NAME_VALUE);
- /* if the text is invisible then you need to erase the outline
- left by the place */
- if (w_current->current_visible == INVISIBLE) {
- o_drawbounding(
- w_current,
- w_current->page_current->attrib_place_head->next,
- NULL,
- x_get_darkcolor(w_current->bb_color), FALSE);
- }
/*! \todo you need to erase the bounding box if have that mode
set!!! */
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 93d5a97..2743824 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -422,8 +422,6 @@ struct st_toplevel {
double pixbuf_wh_ratio; /* width/height ratio of the pixbuf */
char *pixbuf_filename;
- int current_visible; /* in o_attrib.c */
- int current_show;
/* have to decided on attribute list stuff */
/* if it should go in here or not */
/* leave outside for now */
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 74a2872..b53040a 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -72,9 +72,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->current_attribute = NULL;
- toplevel->current_visible = -1; /* not sure on these */
- toplevel->current_show = -1;
-
toplevel->internal_symbol_name = NULL;
toplevel->RC_list = NULL;
commit aa91395ad62805ec4112d602406888a328c43519
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:36:19 2007 +0100
Remove the unused states for attrib placement: DRAWATTRIB and ENDATTRIB.
Also removes the functions:
o_attrib_{start|end|rubberattrib} which are no longer used after this.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 9df8b2d..3e8b1bc 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -465,9 +465,6 @@ void o_arc_erase_grips(TOPLEVEL *w_current, OBJECT *o_current);
void o_attrib_add_selected(TOPLEVEL *w_current, SELECTION *selection, OBJECT *selected);
void o_attrib_toggle_visibility(TOPLEVEL *w_current, GList *list);
void o_attrib_toggle_show_name_value(TOPLEVEL *w_current, GList *list, int new_show_name_value);
-void o_attrib_start(TOPLEVEL *w_current, int screen_x, int screen_y);
-void o_attrib_end(TOPLEVEL *w_current);
-void o_attrib_rubberattrib(TOPLEVEL *w_current);
OBJECT *o_attrib_add_attrib(TOPLEVEL *w_current, char *text_string, int visibility, int show_name_value, OBJECT *object);
/* o_basic.c */
void o_redraw_all(TOPLEVEL *w_current);
diff --git a/gschem/include/x_states.h b/gschem/include/x_states.h
index b26dc63..ef2db64 100644
--- a/gschem/include/x_states.h
+++ b/gschem/include/x_states.h
@@ -54,28 +54,26 @@ enum x_states {
ENDARC, /* 26 */
ENDPIN, /* 27 */
ENDCOMP, /* 28 */
- DRAWATTRIB, /* 29 */
- ENDATTRIB, /* 30 */
- DRAWTEXT, /* 31 */
- ENDTEXT, /* 32 */
- ENDROTATEP, /* 33 */
- ENDMIRROR, /* 34 */
- ZOOMBOXSTART, /* 35 */
- ZOOMBOXEND, /* 36 */
- STARTROUTENET, /* 37 */
- ENDROUTENET, /* 38 */
- MOUSEPAN, /* 39 */
- DRAWBUS, /* 40 */
- BUSCONT, /* 41 */
- STARTDRAWBUS, /* 42 */
- STARTPASTE, /* 43 */
- ENDPASTE, /* 44 */
- GRIPS, /* 45 */
- DRAWPICTURE, /* 46 */
- ENDPICTURE, /* 47 */
- MCOPY, /* 48 */
- STARTMCOPY, /* 49 */
- ENDMCOPY /* 50 */
+ DRAWTEXT, /* 29 */
+ ENDTEXT, /* 30 */
+ ENDROTATEP, /* 31 */
+ ENDMIRROR, /* 32 */
+ ZOOMBOXSTART, /* 33 */
+ ZOOMBOXEND, /* 34 */
+ STARTROUTENET, /* 35 */
+ ENDROUTENET, /* 36 */
+ MOUSEPAN, /* 37 */
+ DRAWBUS, /* 38 */
+ BUSCONT, /* 39 */
+ STARTDRAWBUS, /* 40 */
+ STARTPASTE, /* 41 */
+ ENDPASTE, /* 42 */
+ GRIPS, /* 43 */
+ DRAWPICTURE, /* 44 */
+ ENDPICTURE, /* 45 */
+ MCOPY, /* 46 */
+ STARTMCOPY, /* 47 */
+ ENDMCOPY /* 48 */
};
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index 7e2c35c..0f2813a 100644
--- a/gschem/src/i_basic.c
+++ b/gschem/src/i_basic.c
@@ -78,9 +78,6 @@ static const char *i_status_string(TOPLEVEL *w_current)
case SBOX:
case GRIPS:
return _("Select Mode");
- case DRAWATTRIB:
- case ENDATTRIB:
- return _("Attribute Mode"); /*EK* new */
case DRAWCOMP:
case ENDCOMP:
return _("Component Mode"); /*EK* new */
@@ -338,8 +335,6 @@ void i_update_toolbar(TOPLEVEL *w_current)
case(ENDARC): /*! \todo */
case(ENDPIN): /*! \todo */
case(ENDCOMP): /*! \todo */
- case(DRAWATTRIB): /*! \todo */
- case(ENDATTRIB): /*! \todo */
case(DRAWTEXT): /*! \todo */
case(ENDTEXT): /*! \todo */
case(ENDROTATEP): /*! \todo */
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index dfb4132..6127d64 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -183,188 +183,6 @@ void o_attrib_toggle_show_name_value(TOPLEVEL *w_current,
o_undo_savestate(w_current, UNDO_ALL);
}
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_attrib_start(TOPLEVEL *w_current, int screen_x, int screen_y)
-{
- int x, y;
- char *value;
-
- w_current->last_x = w_current->start_x = fix_x(w_current, screen_x);
- w_current->last_y = w_current->start_y = fix_y(w_current, screen_y);
-
- w_current->last_drawb_mode = -1;
-
- /* make sure list is null first, so that you don't have a mem leak */
- SCREENtoWORLD(w_current,
- w_current->start_x,
- w_current->start_y,
- &x,
- &y);
-
- /* remove the old attrib list if it exists */
- /* without killing the head structure */
- o_list_delete_rest(w_current,
- w_current->page_current->attrib_place_head);
-
- /*! \todo change this so that it only changes the value not the
- * whole thing */
- /* attribute names are case sensitive */
-
- value = strstr(w_current->current_attribute, "=");
-
- if (value == NULL) {
- fprintf(stderr,
- _("ERROR! you can't get an attribute without an ='s\n"));
- exit(-1);
- }
-
- switch(w_current->text_caps) {
- case(LOWER):
- string_tolower(value, value);
- break;
-
- case(UPPER):
- string_toupper(value, value);
- break;
-
- case(BOTH):
- default:
- /* do nothing */
- break;
- }
-
- /* here you need to add OBJ_TEXT when it's done */
- w_current->page_current->attrib_place_tail = (OBJECT *)
- o_text_add(
- w_current,
- w_current->page_current->attrib_place_head,
- /* type changed from TEXT to TEXT */
- OBJ_TEXT, w_current->detachedattr_color,
- x,
- y,
- LOWER_LEFT,
- 0, /* zero is angle */
- w_current->current_attribute,
- w_current->text_size,
- /* has to be visible so you can place it */
- /* visibility is set when you create the object */
- VISIBLE, w_current->current_show);
-
- o_drawbounding(w_current,
- w_current->page_current->attrib_place_head->next,
- NULL,
- x_get_darkcolor(w_current->bb_color), TRUE);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_attrib_end(TOPLEVEL *w_current)
-{
- int world_x, world_y; /* get consistant names hack */
- OBJECT *object;
-
- SCREENtoWORLD(w_current,
- w_current->last_x,
- w_current->last_y,
- &world_x,
- &world_y);
-
- world_x = snap_grid(w_current, world_x);
- world_y = snap_grid(w_current, world_y);
-
- /* here you need to add OBJ_TEXT when it's done */
- /* make this VIS and SHOW default configurable hack */
- w_current->page_current->object_tail =
- o_text_add(w_current, w_current->page_current->object_tail,
- /* type changed from TEXT to TEXT */
- OBJ_TEXT, w_current->detachedattr_color,
- world_x,
- world_y,
- LOWER_LEFT,
- 0, /* zero is angle */
- w_current->current_attribute,
- w_current->text_size,
- w_current->current_visible,
- w_current->current_show);
-
- /* if the attribute is invisible then you need to erase the
- * outline left by the place */
- if (w_current->current_visible == INVISIBLE) {
-
- o_drawbounding(w_current,
- w_current->page_current->
- attrib_place_head->next,
- NULL,
- x_get_darkcolor(w_current->bb_color), FALSE);
- }
-
- /*! \todo you need to erase the bounding box if have that mode
- * set!!! hack */
- /* erase the old bounding box / outline */
- if (w_current->actionfeedback_mode == OUTLINE) {
- o_drawbounding(w_current,
- w_current->page_current->
- attrib_place_head->next,
- NULL,
- x_get_color(w_current->text_color), FALSE);
- } else {
- o_drawbounding(w_current,
- w_current->page_current->
- attrib_place_head->next,
- NULL,
- x_get_darkcolor(w_current->select_color), FALSE);
- }
-
- w_current->override_color = -1;
-
- (*w_current->page_current->
- object_tail->draw_func)(w_current, w_current->page_current->object_tail);
-
- w_current->page_current->CHANGED = 1;
-
- /* here is where you attach the stuff */
- /* if an object is selected, else just place it */
-
- GList *iter = geda_list_get_glist( w_current->page_current->selection_list );
-
- if ( iter == NULL )
- object = NULL;
- else
- object = (OBJECT *)iter->data;
-
- if (object != NULL) {
- /* should attribute be selected? probably */
- /* this is probably okay, NEWSEL, since tail is a single obj */
- o_attrib_attach(w_current,
- w_current->page_current->object_head,
- w_current->page_current->object_tail,
- object);
- }
-
- o_selection_add( w_current->page_current->selection_list,
- w_current->page_current->object_tail );
- o_undo_savestate( w_current, UNDO_ALL );
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_attrib_rubberattrib(TOPLEVEL *w_current)
-{
- o_drawbounding(w_current,
- w_current->page_current->attrib_place_head->next,
- NULL,
- x_get_darkcolor(w_current->bb_color), FALSE);
-}
/*! \todo Finish function documentation!!!
* \brief
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 66a01a6..7d94c0c 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -70,8 +70,6 @@ void o_redraw_all(TOPLEVEL *w_current)
x_get_darkcolor(w_current->bb_color), FALSE);
break;
- case(DRAWATTRIB):
- case(ENDATTRIB):
case(DRAWTEXT):
case(ENDTEXT):
o_drawbounding(w_current, w_current->
@@ -678,7 +676,6 @@ int o_redraw_cleanstates(TOPLEVEL *w_current)
case(DRAWCOMP):
case(DRAWNET):
case(ENDARC):
- case(ENDATTRIB):
case(ENDBOX):
case(ENDCIRCLE):
case(ENDCOMP):
@@ -728,7 +725,6 @@ int o_redraw_cleanstates(TOPLEVEL *w_current)
case(PAN):
case(BUSCONT):
case(DRAWARC):
- case(DRAWATTRIB):
case(DRAWPICTURE):
case(DRAWPIN):
case(DRAWTEXT):
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 5635ba0..644f1b7 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -111,9 +111,6 @@ gint x_event_expose(GtkWidget *widget, GdkEventExpose *event,
case(ENDARC):
o_arc_rubberarc_xor(w_current);
break;
- case(ENDATTRIB): /*! \todo how to test ??? */
- o_attrib_rubberattrib(w_current);
- break;
case(ENDBOX):
o_box_rubberbox_xor(w_current);
break;
@@ -407,19 +404,6 @@ gint x_event_button_pressed(GtkWidget *widget, GdkEventButton *event,
i_update_toolbar(w_current);
break;
- case(ENDATTRIB):
- o_attrib_end(w_current);
- /* not sure on this one either... */
- /* keep it as well */
- w_current->inside_action = 0;
- i_set_state(w_current, SELECT);
- i_update_toolbar(w_current);
- /* the following happen inside attrib_end */
- /* therefore they are commeneted out here */
- /* o_redraw_single(object_tail);*/
- /* o_redraw_selected(); not sure on this */
- break;
-
case(ENDROTATEP):
prev_state = w_current->DONT_REDRAW;
w_current->DONT_REDRAW = 0;
@@ -1201,12 +1185,6 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
o_buffer_paste_rubberpaste(w_current, w_current->buffer_number);
break;
- case(DRAWATTRIB):
- o_attrib_start(w_current, (int) event->x, (int) event->y);
- w_current->event_state = ENDATTRIB;
- w_current->inside_action = 1;
- break;
-
case(DRAWTEXT):
w_current->complex_rotate = 0; /* reset to known state */
o_text_start(w_current, (int) event->x, (int) event->y);
@@ -1214,13 +1192,6 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
w_current->inside_action = 1;
break;
- case(ENDATTRIB):
- o_attrib_rubberattrib(w_current);
- w_current->last_x = fix_x(w_current, (int) event->x);
- w_current->last_y = fix_y(w_current, (int) event->y);
- o_attrib_rubberattrib(w_current);
- break;
-
case(ENDTEXT):
o_text_rubberattrib(w_current);
w_current->last_x = fix_x(w_current, (int) event->x);
diff --git a/gschem/tests/states_1.sch b/gschem/tests/states_1.sch
index 584d22d..29d32b2 100644
--- a/gschem/tests/states_1.sch
+++ b/gschem/tests/states_1.sch
@@ -1,13 +1,13 @@
-v 20021103
+v 20070818 1
C 17300 16400 0 0 0 title-C.sym
V 21250 30050 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 23350 31750 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 18450 29550 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 18000 29500 9 10 1 0 0 0
+T 18000 29500 9 10 1 0 0 0 1
SBOX
-T 20700 30000 9 10 1 0 0 0
+T 20700 30000 9 10 1 0 0 0 1
SELECT
-T 22600 31700 9 10 1 0 0 0
+T 22600 31700 9 10 1 0 0 0 1
STARTSELECT
L 19300 29600 20400 29900 3 0 0 0 -1 -1
L 21900 30600 22700 31200 3 0 0 0 -1 -1
@@ -23,33 +23,33 @@ L 22700 31200 22600 31200 3 0 0 0 -1 -1
L 22700 31200 22700 31100 3 0 0 0 -1 -1
V 22250 28150 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 24850 28150 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 19200 30000 9 10 1 0 0 0
+T 19200 30000 9 10 1 0 0 0 1
RELEASE
-T 22200 30600 9 10 1 0 0 0
+T 22200 30600 9 10 1 0 0 0 1
DOWN
-T 21400 32700 9 10 1 0 0 0
+T 21400 32700 9 10 1 0 0 0 1
MOTION
V 27350 28150 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 27350 25950 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 24850 25850 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 22250 25850 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
{
-T 21800 25800 5 10 1 1 0 0
+T 21800 25800 5 10 1 1 0 0 1
name=ENDCOPY
}
L 24000 28200 23100 28200 3 0 0 0 -1 -1
L 26500 28100 25700 28100 3 0 0 0 -1 -1
L 24000 25800 23100 25800 3 0 0 0 -1 -1
L 26500 25900 25700 25900 3 0 0 0 -1 -1
-T 21600 28100 9 10 1 0 0 0
+T 21600 28100 9 10 1 0 0 0 1
ENDMOVE
-T 24500 28100 9 10 1 0 0 0
+T 24500 28100 9 10 1 0 0 0 1
MOVE
-T 26500 28100 9 10 1 0 0 0
+T 26500 28100 9 10 1 0 0 0 1
STARTMOVE
-T 24400 25800 9 10 1 0 0 0
+T 24400 25800 9 10 1 0 0 0 1
COPY
-T 26600 25900 9 10 1 0 0 0
+T 26600 25900 9 10 1 0 0 0 1
STARTCOPY
L 21800 28900 21600 29300 3 0 0 0 -1 -1
L 21600 29300 21600 29100 3 0 0 0 -1 -1
@@ -62,26 +62,26 @@ L 23100 25800 23300 26000 3 0 0 0 -1 -1
L 23100 25800 23300 25600 3 0 0 0 -1 -1
L 25700 25900 25900 26100 3 0 0 0 -1 -1
L 25700 25900 25900 25700 3 0 0 0 -1 -1
-T 26000 28200 9 10 1 0 0 0
+T 26000 28200 9 10 1 0 0 0 1
BP
-T 23400 28300 9 10 1 0 0 0
+T 23400 28300 9 10 1 0 0 0 1
BR
-T 22000 29200 9 10 1 0 0 0
+T 22000 29200 9 10 1 0 0 0 1
BR
L 21500 26200 20700 26800 3 0 0 0 -1 -1
L 20700 26800 21000 29200 3 0 0 0 -1 -1
L 21000 29200 20800 29000 3 0 0 0 -1 -1
L 21000 29200 21100 29000 3 0 0 0 -1 -1
-T 20900 27200 9 10 1 0 0 0
+T 20900 27200 9 10 1 0 0 0 1
BR
-T 26000 26000 9 10 1 0 0 0
+T 26000 26000 9 10 1 0 0 0 1
BP
-T 23400 25900 9 10 1 0 0 0
+T 23400 25900 9 10 1 0 0 0 1
BR
B 28900 28000 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 22900 29900 9 10 1 0 0 0
+T 22900 29900 9 10 1 0 0 0 1
EDIT_SELECT
-T 29000 28100 9 10 1 0 0 0
+T 29000 28100 9 10 1 0 0 0 1
EDIT_MOVE
B 22900 29800 2000 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 22900 30000 22100 30000 3 0 0 0 -1 -1
@@ -94,59 +94,43 @@ B 28900 25800 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 28900 26000 28200 26000 3 0 0 0 -1 -1
L 28200 26000 28300 26100 3 0 0 0 -1 -1
L 28200 26000 28300 25900 3 0 0 0 -1 -1
-T 29000 25900 9 10 1 0 0 0
+T 29000 25900 9 10 1 0 0 0 1
EDIT_COPY
-T 32600 16800 9 8 1 0 0 0
+T 32600 16800 9 8 1 0 0 0 1
GSCHEM_STATES.SCH
-T 36700 16500 9 8 1 0 0 0
+T 36700 16500 9 8 1 0 0 0 1
SPE
V 22150 22950 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
{
-T 21500 22900 5 10 1 1 0 0
+T 21500 22900 5 10 1 1 0 0 1
name=DRAWCOMP
}
V 20350 24550 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
{
-T 19900 24500 5 10 1 1 0 0
+T 19900 24500 5 10 1 1 0 0 1
name=ENDCOMP
}
-V 20450 20850 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-{
-T 19800 20800 5 10 1 1 0 0
-name=ENDATTRIB
-}
V 20250 18750 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
{
-T 19700 18600 5 10 1 1 0 0
+T 19700 18600 5 10 1 1 0 0 1
name=STARTPAN
}
-L 19800 21400 18300 25200 3 0 0 0 -1 -1
L 18100 22800 18300 25200 3 0 0 0 -1 -1
L 18100 22800 19700 19500 3 0 0 0 -1 -1
-T 17800 24900 9 10 1 0 0 0
+T 17800 24900 9 10 1 0 0 0 1
BP
L 21500 23500 21000 24000 3 0 0 0 -1 -1
L 21000 24000 21100 23800 3 0 0 0 -1 -1
L 21000 24000 21200 23900 3 0 0 0 -1 -1
-L 18600 24400 18600 24200 3 0 0 0 -1 -1
-L 18600 24400 18800 24300 3 0 0 0 -1 -1
-T 21500 24000 9 10 1 0 0 0
+T 21500 24000 9 10 1 0 0 0 1
MOTION
-L 21900 20700 21300 20800 3 0 0 0 -1 -1
-L 21300 20800 21500 20900 3 0 0 0 -1 -1
-L 21300 20800 21500 20600 3 0 0 0 -1 -1
-V 22750 20550 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-{
-T 22100 20400 5 10 1 1 0 0
-name=DRAWATTRIB
-}
V 33950 20450 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
V 30950 20450 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 32900 20300 9 10 1 0 0 0
+T 32900 20300 9 10 1 0 0 0 1
STARTDRAWNET
-T 30400 20500 9 10 1 0 0 0
+T 30400 20500 9 10 1 0 0 0 1
DRAWNET
-T 30400 20200 9 10 1 0 0 0
+T 30400 20200 9 10 1 0 0 0 1
NETCONT
L 33200 20100 31800 20100 3 0 0 0 -1 -1
L 31800 20100 31700 20100 3 0 0 0 -1 -1
@@ -155,9 +139,9 @@ L 31700 20100 31900 20200 3 0 0 0 -1 -1
L 31700 20100 31900 20000 3 0 0 0 -1 -1
L 33100 20700 32900 20600 3 0 0 0 -1 -1
L 33100 20700 32900 20800 3 0 0 0 -1 -1
-T 32200 19900 9 10 1 0 0 0
+T 32200 19900 9 10 1 0 0 0 1
BP
-T 32100 20800 9 10 1 0 0 0
+T 32100 20800 9 10 1 0 0 0 1
B3P
L 30300 21000 30200 21200 3 0 0 0 -1 -1
L 30200 21200 30000 21300 3 0 0 0 -1 -1
@@ -168,7 +152,7 @@ L 29900 21000 30100 20900 3 0 0 0 -1 -1
L 30100 20900 30200 20800 3 0 0 0 -1 -1
L 30200 20800 30100 20800 3 0 0 0 -1 -1
L 30200 20800 30200 20900 3 0 0 0 -1 -1
-T 29800 21400 9 10 1 0 0 0
+T 29800 21400 9 10 1 0 0 0 1
BP
V 32250 27450 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 34700 26900 32900 26900 3 0 0 0 -1 -1
@@ -178,78 +162,70 @@ L 34800 27900 34700 27800 3 0 0 0 -1 -1
V 35450 27350 850 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 32900 26900 33000 27000 3 0 0 0 -1 -1
L 32900 26900 33000 26800 3 0 0 0 -1 -1
-T 33500 26700 9 10 1 0 0 0
+T 33500 26700 9 10 1 0 0 0 1
BP
-T 33600 28000 9 10 1 0 0 0
+T 33600 28000 9 10 1 0 0 0 1
BP
-T 31500 25500 9 10 1 0 0 0
+T 31500 25500 9 10 1 0 0 0 1
ENDLINE
-T 34500 25500 9 10 1 0 0 0
+T 34500 25500 9 10 1 0 0 0 1
DRAWLINE
-T 31500 25100 9 10 1 0 0 0
+T 31500 25100 9 10 1 0 0 0 1
ENDBOX
-T 34500 25100 9 10 1 0 0 0
+T 34500 25100 9 10 1 0 0 0 1
DRAWBOX
-T 31500 24700 9 10 1 0 0 0
+T 31500 24700 9 10 1 0 0 0 1
ENDCIRCLE
-T 34500 24700 9 10 1 0 0 0
+T 34500 24700 9 10 1 0 0 0 1
DRAWCIRCLE
-T 31500 24300 9 10 1 0 0 0
+T 31500 24300 9 10 1 0 0 0 1
ENDARC
-T 34500 24300 9 10 1 0 0 0
+T 34500 24300 9 10 1 0 0 0 1
DRAWARC
-T 32000 26100 9 10 1 0 0 0
+T 32000 26100 9 10 1 0 0 0 1
FITS IN THESE BOX'S
-T 31500 23900 9 10 1 0 0 0
+T 31500 23900 9 10 1 0 0 0 1
ENDPIN
-T 34500 23900 9 10 1 0 0 0
+T 34500 23900 9 10 1 0 0 0 1
DRAWPIN
-T 29100 30400 9 10 1 0 0 0
+T 29100 30400 9 10 1 0 0 0 1
I_CALLBACKS.C SETS
-T 29100 30000 9 10 1 0 0 0
+T 29100 30000 9 10 1 0 0 0 1
X_EVENT.C STATEMACHINE
-T 29100 29600 9 10 1 0 0 0
+T 29100 29600 9 10 1 0 0 0 1
X_STATES.H DEFINES
B 22100 18300 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
{
-T 22300 18400 5 10 1 1 0 0
+T 22300 18400 5 10 1 1 0 0 1
name=WIEW_PAN
}
-B 24100 20300 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
B 23500 22700 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
B 36700 27100 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
B 35500 20200 1800 400 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 29100 31500 9 10 1 0 0 0
+T 29100 31500 9 10 1 0 0 0 1
BP=BUTTON PRESSED
-T 29100 31000 9 10 1 0 0 0
+T 29100 31000 9 10 1 0 0 0 1
BR=BUTTON RELEASED
-T 21300 21300 9 10 1 0 0 0
-MOTION
L 22100 18500 21100 18600 3 0 0 0 -1 -1
L 21100 18600 21300 18700 3 0 0 0 -1 -1
L 21100 18600 21200 18400 3 0 0 0 -1 -1
-T 23500 22800 9 10 1 0 0 0
-DON'T CARE
-T 24100 20400 9 10 1 0 0 0
+T 23500 22800 9 10 1 0 0 0 1
DON'T CARE
L 35500 20400 34800 20400 3 0 0 0 -1 -1
-T 35700 20300 9 10 1 0 0 0
+T 35700 20300 9 10 1 0 0 0 1
ADD_NET
L 36700 27300 36300 27300 3 0 0 0 -1 -1
-T 36900 25500 9 10 1 0 0 0
+T 36900 25500 9 10 1 0 0 0 1
ADD_LINE
-T 36900 25100 9 10 1 0 0 0
+T 36900 25100 9 10 1 0 0 0 1
ADD_BOX
-T 36900 24700 9 10 1 0 0 0
+T 36900 24700 9 10 1 0 0 0 1
ADD_CIRCLE
-T 36900 24300 9 10 1 0 0 0
+T 36900 24300 9 10 1 0 0 0 1
ADD_ARC
-T 36900 23900 9 10 1 0 0 0
+T 36900 23900 9 10 1 0 0 0 1
ADD_PIN
L 23500 22900 23000 22900 3 0 0 0 -1 -1
-L 24100 20500 23600 20500 3 0 0 0 -1 -1
-L 23600 20500 23700 20600 3 0 0 0 -1 -1
-L 23600 20500 23700 20400 3 0 0 0 -1 -1
L 23000 22900 23100 23000 3 0 0 0 -1 -1
L 23000 22900 23100 22800 3 0 0 0 -1 -1
L 19000 27300 19800 25200 3 0 0 0 -1 -1
commit 6a0fb625ba8dfd3d8dceb1b44055d4920e4b2658
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:35:53 2007 +0100
Remove the unused function o_erasebounding().
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 9c6dfa2..9df8b2d 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -479,7 +479,6 @@ void o_erase_selected(TOPLEVEL *w_current);
void o_erase_single(TOPLEVEL *w_current, OBJECT *object);
void o_drawbounding(TOPLEVEL *w_current, OBJECT *o_list,
GList *o_glist, GdkColor *color, int firsttime);
-void o_erasebounding(TOPLEVEL *w_current, OBJECT *o_list, GList *s_list);
int o_erase_rubber(TOPLEVEL *w_current);
int o_redraw_cleanstates(TOPLEVEL *w_current);
/* o_box.c */
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 57f2e55..66a01a6 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -588,57 +588,6 @@ void o_drawbounding(TOPLEVEL *w_current, OBJECT *o_list, GList *o_glist,
}
}
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_erasebounding(TOPLEVEL *w_current, OBJECT *o_list, GList *s_list)
-{
- int diff_x, diff_y;
- int rleft, rtop, rright, rbottom;
- int w_rleft, w_rtop, w_rright, w_rbottom;
-
- if ( (o_list == NULL) && (s_list == NULL)) {
- /* this is an error condition */
- w_current->event_state = SELECT;
- w_current->inside_action = 0;
- return;
- }
-
- if (w_current->actionfeedback_mode == OUTLINE) {
- return;
- }
-
- if (o_list) {
- world_get_object_list_bounds(w_current, o_list,
- &w_rleft ,
- &w_rtop ,
- &w_rright ,
- &w_rbottom);
- } else if (s_list) {
- world_get_object_glist_bounds(w_current, s_list,
- &w_rleft ,
- &w_rtop ,
- &w_rright ,
- &w_rbottom);
- }
-
- diff_x = w_current->last_x - w_current->start_x;
- diff_y = w_current->last_y - w_current->start_y;
-
- gdk_gc_set_foreground(w_current->gc,
- x_get_color(w_current->background_color) );
- WORLDtoSCREEN( w_current, w_rleft, w_rtop,
- &rleft, &rtop );
- WORLDtoSCREEN( w_current, w_rright, w_rbottom,
- &rright, &rbottom );
- gdk_draw_rectangle(w_current->window, w_current->gc, FALSE,
- rleft + diff_x,
- rtop + diff_y,
- rright - rleft ,
- rbottom - rtop );
-}
/*! \todo Finish function documentation!!!
* \brief
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs