qi-hardware/fped
1
0
Fork 0
mirror of git://projects.qi-hardware.com/fped.git synced 2024-11-22 17:59:21 +02:00
Code

Full-page postscript now includes all packages (not just the first one).

Browse Source 
Measurement lines now have a fixed size, so they can't scale to invisibility.

- Makefile: don't pass CFLAGS twice when making dependencies
- postscript.c (postscript): moved iteration over packages to new function
  ps_for_all_pkg, for sharing with postscript_fullpage
- postscript.c (postscript_fullpage): print all packages
- postscript.c (ps_meas): use real size for measurement lines
- postscript.c (PS_MEAS_LINE): changed measurement line width from 0.015 scaled
  mm to 0.1 real mm



git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5851 99fdad57-331a-0410-800a-d7fa5415bdb3
This commit is contained in:
werner 2010-02-23 01:02:19 +00:00
parent 140b60d074
commit aaba06fb24
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -91,7 +91,7 @@ endif
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $*.c -o $*.o $(CC) -c $(CFLAGS) $*.c -o $*.o
$(DEPEND) $(CFLAGS) $*.c | \ $(DEPEND) $*.c | \
sed -e \ sed -e \
'/^\(.*:\)\? */{p;s///;s/ *\\\?$$/ /;s/ */:\n/g;H;}' \ '/^\(.*:\)\? */{p;s///;s/ *\\\?$$/ /;s/ */:\n/g;H;}' \
-e '$${g;p;}' -e d >$*.d; \ -e '$${g;p;}' -e d >$*.d; \

32
postscript.c
View File

@ -72,7 +72,7 @@
#define PS_VEC_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */ #define PS_VEC_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */
#define PS_VEC_BASE_OFFSET mm_to_units(0.5) /* real mm */ #define PS_VEC_BASE_OFFSET mm_to_units(0.5) /* real mm */
#define PS_MEAS_LINE mm_to_units(0.015) #define PS_MEAS_LINE mm_to_units(0.1) /* real mm */
#define PS_MEAS_ARROW_LEN mm_to_units(0.15) #define PS_MEAS_ARROW_LEN mm_to_units(0.15)
#define PS_MEAS_ARROW_ANGLE 30 #define PS_MEAS_ARROW_ANGLE 30
#define PS_MEAS_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */ #define PS_MEAS_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */
@ -386,7 +386,8 @@ static void ps_meas(FILE *file, const struct inst *inst,
a0 = inst->base; a0 = inst->base;
b0 = inst->u.meas.end; b0 = inst->u.meas.end;
project_meas(inst, &a1, &b1); project_meas(inst, &a1, &b1);
fprintf(file, "1 setlinecap 0 setgray %d setlinewidth\n", PS_MEAS_LINE); fprintf(file, "1 setlinecap 0 setgray %d realsize setlinewidth\n",
PS_MEAS_LINE);
fprintf(file, " %d %d moveto\n", a0.x, a0.y); fprintf(file, " %d %d moveto\n", a0.x, a0.y);
fprintf(file, " %d %d lineto\n", a1.x, a1.y); fprintf(file, " %d %d lineto\n", a1.x, a1.y);
fprintf(file, " %d %d lineto\n", b1.x, b1.y); fprintf(file, " %d %d lineto\n", b1.x, b1.y);
@ -1004,7 +1005,8 @@ static void epilogue(FILE *file)
} }
int postscript(FILE *file) static int ps_for_all_pkg(FILE *file,
void (*fn)(FILE *file, const struct pkg *pkg, int page))
{ {
struct pkg *pkg; struct pkg *pkg;
int pages; int pages;
@ -1016,7 +1018,7 @@ int postscript(FILE *file)
pages = 0; pages = 0;
for (pkg = pkgs; pkg; pkg = pkg->next) for (pkg = pkgs; pkg; pkg = pkg->next)
if (pkg->name) if (pkg->name)
ps_package(file, pkg, ++pages); fn(file, pkg, ++pages);
epilogue(file); epilogue(file);
fflush(file); fflush(file);
@ -1024,18 +1026,23 @@ int postscript(FILE *file)
} }
int postscript(FILE *file)
{
return ps_for_all_pkg(file, ps_package);
}
/* /*
* Experimental. Doesn't work properly. * Experimental. Doesn't work properly.
*/ */
int postscript_fullpage(FILE *file) static void ps_package_fullpage(FILE *file, const struct pkg *pkg, int page)
{ {
unit_type cx, cy; unit_type cx, cy;
struct bbox bbox; struct bbox bbox;
double fx, fy, f; double fx, fy, f;
prologue(file, 1); ps_page(file, page, pkg);
ps_page(file, 1, pkgs);
active_params = postscript_params; active_params = postscript_params;
bbox = inst_get_bbox(); bbox = inst_get_bbox();
cx = (bbox.min.x+bbox.max.x)/2; cx = (bbox.min.x+bbox.max.x)/2;
@ -1044,9 +1051,12 @@ int postscript_fullpage(FILE *file)
fy = 2.0*PAGE_HALF_HEIGHT/(bbox.max.y-bbox.min.y); fy = 2.0*PAGE_HALF_HEIGHT/(bbox.max.y-bbox.min.y);
f = fx < fy ? fx : fy; f = fx < fy ? fx : fy;
fprintf(file, "%d %d translate\n", (int) (-cx*f), (int) (-cy*f)); fprintf(file, "%d %d translate\n", (int) (-cx*f), (int) (-cy*f));
ps_draw_package(file, pkgs->next, f); ps_draw_package(file, pkg, f);
fprintf(file, "showpage\n"); fprintf(file, "showpage\n");
epilogue(file); }
fflush(file);
return !ferror(file);
int postscript_fullpage(FILE *file)
{
return ps_for_all_pkg(file, ps_package_fullpage);
} }