[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: .cvsignore
User: pcjc2
Date: 07/02/11 18:59:06
Modified: . Tag: noscreen .cvsignore Makefile.am f_basic.c
f_print.c o_arc_basic.c o_text_basic.c s_toplevel.c
Added: . Tag: noscreen o_embed.c
Log:
Sync with trunc
Revision Changes Path
No revision
No revision
1.1.6.1 +0 -1 eda/geda/gaf/libgeda/src/.cvsignore
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .cvsignore
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- .cvsignore 27 Oct 2002 19:24:24 -0000 1.1
+++ .cvsignore 11 Feb 2007 23:59:03 -0000 1.1.6.1
@@ -1,4 +1,3 @@
-*.c
*.lo
.deps
.libs
1.57.6.1 +4 -2 eda/geda/gaf/libgeda/src/Makefile.am
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Makefile.am
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.57.6.1
diff -u -b -r1.57 -r1.57.6.1
--- Makefile.am 25 Aug 2006 01:00:13 -0000 1.57
+++ Makefile.am 11 Feb 2007 23:59:03 -0000 1.57.6.1
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.57 2006/08/25 01:00:13 ahvezda Exp $
+# $Id: Makefile.am,v 1.57.6.1 2007/02/11 23:59:03 pcjc2 Exp $
#
# NOTE: Don't forget that in the libtool distribution, files in this
# directory are distributed by the demo_distfiles variable in the top
@@ -17,7 +17,8 @@
o_arc_basic.c o_attrib.c o_basic.c o_box_basic.c \
o_circle_basic.c o_complex_basic.c o_line_basic.c o_list.c \
o_net_basic.c o_selection.c o_bus_basic.c o_text_basic.c \
- o_pin_basic.c o_image.c u_basic.c s_attrib.c s_basic.c \
+ o_pin_basic.c o_image.c o_embed.c \
+ u_basic.c s_attrib.c s_basic.c \
s_clib.c s_encoding.c s_hierarchy.c s_papersizes.c s_stretch.c \
s_log.c \
s_page.c s_slib.c s_color.c s_undo.c s_conn.c \
@@ -26,6 +27,7 @@
INCLUDES = -I$(top_srcdir)/include @LIBGEDA_CFLAGS@
libgeda_la_LDFLAGS = @LIBTOOL_FLAGS@ @LIBGEDA_LDFLAGS@
+LIBTOOL=@LIBTOOL@ --silent
EXTRA_DIST = create_proto
1.19.6.1 +1 -0 eda/geda/gaf/libgeda/src/f_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: f_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/f_basic.c,v
retrieving revision 1.19
retrieving revision 1.19.6.1
diff -u -b -r1.19 -r1.19.6.1
--- f_basic.c 15 Jul 2006 17:00:51 -0000 1.19
+++ f_basic.c 11 Feb 2007 23:59:03 -0000 1.19.6.1
@@ -25,6 +25,7 @@
#endif
#include <sys/param.h>
+#include <limits.h>
#include <stdlib.h>
#include <time.h>
#include <sys/types.h>
1.25.6.1 +18 -9 eda/geda/gaf/libgeda/src/f_print.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: f_print.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/f_print.c,v
retrieving revision 1.25
retrieving revision 1.25.6.1
diff -u -b -r1.25 -r1.25.6.1
--- f_print.c 30 Aug 2006 11:06:17 -0000 1.25
+++ f_print.c 11 Feb 2007 23:59:03 -0000 1.25.6.1
@@ -91,7 +91,7 @@
* \param [in] fp The postscript document to write to.
* \param [in] paper_size_x The width of the document on paper in inches.
* \param [in] paper_size_y The height of the document on paper in inches.
- * \return 1 on success, 0 on failure.
+ * \return 0 on success, -1 on failure.
*/
int f_print_header(TOPLEVEL *w_current, FILE *fp,
int paper_size_x, int paper_size_y)
@@ -140,7 +140,7 @@
if(buf == NULL) {
s_log_message("Unable to allocate %d bytes in f_print_header()\n"
"Giving up on printing.\n",PROLOG_BUFFER_SIZE);
- return 0;
+ return -1;
}
/* Open the prolog file */
prolog = fopen(w_current->postscript_prolog,"r");
@@ -149,7 +149,7 @@
"in f_print_header()\n"
"Giving up on printing\n", w_current->postscript_prolog);
g_free(buf); /* If we got to here, the buffer was allocated. */
- return 0;
+ return -1;
}
/* Loop while reading file into buffer and dump it
* back out to the supplied file handle
@@ -165,7 +165,7 @@
"in f_print_header()\n"
"Giving up on printing\n", w_current->postscript_prolog);
g_free(buf); /* If we got to here, the buffer was allocated. */
- return 0;
+ return -1;
}
if(ferror(fp)) {
@@ -173,7 +173,7 @@
"in f_print_header()\n"
"Giving up on printing\n");
g_free(buf); /* If we got to here, the buffer was allocated. */
- return 0;
+ return -1;
}
g_free(buf); /* If we got to here, the buffer was allocated. */
@@ -232,7 +232,7 @@
}
/* Apply a translation to move the origin to where we want it */
- if (origin_x != 0 && origin_y != 0) {
+ if (origin_x != 0 || origin_y != 0) {
fprintf(fp, "%d %d translate\n", -origin_x, -origin_y);
}
@@ -376,6 +376,11 @@
}
result = f_print_stream(w_current, fp);
+
+ if (result != 0) {
+ /* If there was an error in f_print_stream, then unlink the output file. */
+ unlink(filename);
+ }
fclose (fp);
return result;
}
@@ -502,9 +507,13 @@
#endif
/* Output the header */
- f_print_header(w_current, fp,
+ if (f_print_header(w_current, fp,
w_current->paper_width,
- w_current->paper_height);
+ w_current->paper_height) != 0) {
+
+ /* There was an error in f_print_header */
+ return -1;
+ }
/* Output font re-encoding */
if (unicode_count) {
1.31.2.4 +20 -39 eda/geda/gaf/libgeda/src/o_arc_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_arc_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_arc_basic.c,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -b -r1.31.2.3 -r1.31.2.4
--- o_arc_basic.c 27 Dec 2006 20:30:51 -0000 1.31.2.3
+++ o_arc_basic.c 11 Feb 2007 23:59:04 -0000 1.31.2.4
@@ -1474,46 +1474,27 @@
color = image_black;
}
- start_angle = o_current->arc->start_angle;
- end_angle = o_current->arc->end_angle;
-
- if ( end_angle < 0) {
-
- if (end_angle >= 180) {
- start_angle = (start_angle - (end_angle)) % 360;
- } else {
- start_angle = (start_angle + (end_angle)) % 360;
- }
-
- end_angle = abs(end_angle);
-
- }
-
- end_angle = start_angle + end_angle;
-
-
-
-#if DEBUG
- printf("%d %d -- %d %d -- %d %d\n",
- o_current->arc->screen_x, o_current->arc->screen_y,
- o_current->arc->screen_width-o_current->arc->screen_x,
- o_current->arc->screen_height-o_current->arc->screen_y,
- start_angle, end_angle);
-#endif
-
- if (start_angle < end_angle) {
-
- start_angle = start_angle + 360;
- }
-
-#if DEBUG
- printf("%d %d -- %d %d -- %d %d\n",
- o_current->arc->screen_x, o_current->arc->screen_y,
- o_current->arc->screen_width-o_current->arc->screen_x,
- o_current->arc->screen_height-o_current->arc->screen_y,
- start_angle, end_angle);
-#endif
+ /* libgd angles are in opposite sense to gschem's internal angles */
+ /* Also, gschem's "end_angle" is actually the sweep of the arc, not absolute angle */
+ /* Intialise {start|end}_angle to the start of gschem's sweep */
+ start_angle = -o_current->arc->start_angle;
+ end_angle = -o_current->arc->start_angle;
+
+ /* libgd always sweeps arcs clockwise so we either update */
+ /* the start_angle, or end_angle as appropriate */
+ if ( o_current->arc->end_angle > 0 )
+ start_angle -= o_current->arc->end_angle;
+ else
+ end_angle -= o_current->arc->end_angle;
+
+ /* Ensure each angle is within 0-359. Negative angles make libgd blow up. */
+ start_angle = ( start_angle < 0 ) ? 360 - ( (-start_angle) % 360 ) : start_angle % 360;
+ end_angle = ( end_angle < 0 ) ? 360 - ( (-end_angle ) % 360 ) : end_angle % 360;
+
+ /* libgd docs state that end angle should always be larger than start_angle */
+ if (end_angle < start_angle)
+ end_angle += 360;
width = o_current->arc->screen_width;
height = o_current->arc->screen_height;
1.25.2.3 +2 -1 eda/geda/gaf/libgeda/src/o_text_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_text_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_text_basic.c,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -b -r1.25.2.2 -r1.25.2.3
--- o_text_basic.c 27 Dec 2006 20:10:44 -0000 1.25.2.2
+++ o_text_basic.c 11 Feb 2007 23:59:04 -0000 1.25.2.3
@@ -1753,7 +1753,8 @@
/* Collect pertinent info about the text location */
x = o_current->text->x;
y = o_current->text->y;
- font_size = (float) o_current->text->size/72.0*1000.0;
+ font_size = (((float)(o_current->text->size))
+ * w_current->postscript_font_scale / 72.0 * 1000.0);
fprintf(fp,"] %d %d %d %f text\n",angle,x,y,font_size);
1.15.2.1 +4 -0 eda/geda/gaf/libgeda/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/libgeda/src/s_toplevel.c,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- s_toplevel.c 5 Dec 2006 03:24:08 -0000 1.15
+++ s_toplevel.c 11 Feb 2007 23:59:04 -0000 1.15.2.1
@@ -238,6 +238,9 @@
toplevel->trwindow = NULL;
toplevel->trentry = NULL;
toplevel->tswindow = NULL;
+ toplevel->tshowwindow = NULL;
+ toplevel->thidewindow = NULL;
+ toplevel->tfindwindow = NULL;
toplevel->tsentry = NULL;
toplevel->abwindow = NULL;
@@ -329,6 +332,7 @@
toplevel->setpagedevice_pagesize = FALSE;
toplevel->postscript_prolog = NULL;
+ toplevel->postscript_font_scale = 1.0;
toplevel->stroke_color = 0;
No revision
No revision
1.1.2.1 +0 -0 eda/geda/gaf/libgeda/src/o_embed.c
(In the diff below, changes in quantity of whitespace are not shown.)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs