[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-243-g182110f)
The branch, master has been updated
via 182110f690c51eb53ea1799fd022e87322d742e3 (commit)
via 039e012397f2638d1577dd7c80fb862a5503dbfd (commit)
via bd7a0be7431df1a2a03027edb96cfde558256cb1 (commit)
from 2f36675adb75051526074f5bed7d18481e8c8159 (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/a_pan.c | 16 ++++++++--------
gschem/src/o_misc.c | 9 ++++++---
2 files changed, 14 insertions(+), 11 deletions(-)
=================
Commit Messages
=================
commit 182110f690c51eb53ea1799fd022e87322d742e3
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Move variables closer to where they are used, for clarity
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
:100644 100644 c3d7750... b4fc9cf... M gschem/src/o_misc.c
commit 039e012397f2638d1577dd7c80fb862a5503dbfd
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix searching for hidden text.
searching (and finding) hidden text no longer produces random results
by looking at uninitialized data.
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
:100644 100644 29b24ce... c3d7750... M gschem/src/o_misc.c
commit bd7a0be7431df1a2a03027edb96cfde558256cb1
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Update optional debug printing to work with the latest code
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
:100644 100644 a6c27e2... be64ca9... M gschem/src/a_pan.c
=========
Changes
=========
commit 182110f690c51eb53ea1799fd022e87322d742e3
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Move variables closer to where they are used, for clarity
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index c3d7750..b4fc9cf 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -365,7 +365,6 @@ int o_edit_find_text (GSCHEM_TOPLEVEL *w_current, const GList *o_list,
int page_control = 0;
int pcount = 0;
int rv;
- int x1, y1, x2, y2;
int text_screen_height;
const GList *iter;
@@ -423,6 +422,8 @@ int o_edit_find_text (GSCHEM_TOPLEVEL *w_current, const GList *o_list,
/* replaced strcmp with strstr to simplify the search */
if (strstr (str,stext)) {
if (!skiplast) {
+ int x1, y1, x2, y2;
+
a_zoom(w_current, ZOOM_FULL, DONTCARE, A_PAN_DONT_REDRAW);
g_assert( world_get_single_object_bounds (toplevel, o_current, &x1, &y1, &x2, &y2) );
text_screen_height = SCREENabs (w_current, y2 - y1);
commit 039e012397f2638d1577dd7c80fb862a5503dbfd
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix searching for hidden text.
searching (and finding) hidden text no longer produces random results
by looking at uninitialized data.
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 29b24ce..c3d7750 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -416,13 +416,15 @@ int o_edit_find_text (GSCHEM_TOPLEVEL *w_current, const GList *o_list,
}
}
- if (o_current->type == OBJ_TEXT) {
+ if (o_current->type == OBJ_TEXT &&
+ (o_is_visible (toplevel, o_current) || toplevel->show_hidden_text)) {
+
const gchar *str = o_text_get_string (toplevel, o_current);
/* replaced strcmp with strstr to simplify the search */
if (strstr (str,stext)) {
if (!skiplast) {
a_zoom(w_current, ZOOM_FULL, DONTCARE, A_PAN_DONT_REDRAW);
- world_get_single_object_bounds (toplevel, o_current, &x1, &y1, &x2, &y2);
+ g_assert( world_get_single_object_bounds (toplevel, o_current, &x1, &y1, &x2, &y2) );
text_screen_height = SCREENabs (w_current, y2 - y1);
/* this code will zoom/pan till the text screen height is about */
/* 50 pixels high, perhaps a future enhancement will be to make */
commit bd7a0be7431df1a2a03027edb96cfde558256cb1
Author: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Update optional debug printing to work with the latest code
Signed-off-by: Dima Kogan <dima@xxxxxxxxxxxxxxx>
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Affects-bug: lp-845380
diff --git a/gschem/src/a_pan.c b/gschem/src/a_pan.c
index a6c27e2..be64ca9 100644
--- a/gschem/src/a_pan.c
+++ b/gschem/src/a_pan.c
@@ -143,13 +143,13 @@ void a_pan_general(GSCHEM_TOPLEVEL *w_current, double world_cx, double world_cy,
#if DEBUG
printf("zoom_old: %f, zoom_new: %f \n ",zoom_old, zoom_new);
printf("left: %d, right: %d, top: %d, bottom: %d\n",
- w_current->page_current->left, w_current->page_current->right,
- w_current->page_current->top, w_current->page_current->bottom);
+ toplevel->page_current->left, toplevel->page_current->right,
+ toplevel->page_current->top, toplevel->page_current->bottom);
printf("aspect: %f\n",
- (float) fabs(w_current->page_current->right
- - w_current->page_current->left) /
- (float) fabs(w_current->page_current->bottom
- - w_current->page_current->top ));
+ (float) fabs(toplevel->page_current->right
+ - toplevel->page_current->left) /
+ (float) fabs(toplevel->page_current->bottom
+ - toplevel->page_current->top ));
#endif
/* set_window */
@@ -209,8 +209,8 @@ void a_pan_mouse(GSCHEM_TOPLEVEL *w_current, int diff_x, int diff_y)
world_cy = page_cy + WORLDabs (w_current, diff_y);
#if DEBUG
- printf(" world_cx=%f, world_cy=%f, world_dx=%d, world_dy=%d\n",
- world_cx, world_cy, world_dx, world_dy);
+ printf(" world_cx=%f, world_cy=%f\n",
+ world_cx, world_cy);
#endif
a_pan_general(w_current, world_cx, world_cy, 1, 0);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs