luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix unbalanced gsave/grestore in psprint (setting colors of empty text strings)

This commit is contained in:
stefan schippers 2023-04-27 00:36:50 +02:00
parent d9d66c1c90
commit 2189aaa932
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/psprint.c
View File

@ -371,6 +371,7 @@ static void set_lw(void)
static void set_ps_colors(unsigned int pixel)
{
dbg(1, "set_ps_colors(): setting color %u\n", pixel);
if(color_ps) fprintf(fd, "%g %g %g RGB\n",
(double)ps_colors[pixel].red/256.0, (double)ps_colors[pixel].green/256.0,
(double)ps_colors[pixel].blue/256.0);
@ -533,9 +534,11 @@ static void ps_draw_string_line(int layer, char *s, double x, double y, double s
unsigned char c, offset;
double line_delta;
double lines;
set_ps_colors(layer);
dbg(1, "ps_draw_string_line(): drawing |%s| on layer %d\n", s, layer);
if(s==NULL) return;
if(llength==0) return;
fprintf(fd, "GS\n");
set_ps_colors(layer);
line_delta = lineno*fontheight;
lines = (no_of_lines-1)*fontheight;
@ -555,7 +558,6 @@ static void ps_draw_string_line(int layer, char *s, double x, double y, double s
else if(rot==2 && flip==1) {iy=iy-fontheight-lines+line_delta+fontascent;}
else if(rot==3 && flip==1) {ix+=line_delta+fontascent;}
fprintf(fd, "GS\n");
fprintf(fd, "/%s", ps_font_family);
fprintf(fd, " FF\n");
fprintf(fd, "%g SCF\n", size * xctx->mooz);
@ -1163,6 +1165,7 @@ void create_ps(char **psfile, int what)
ps_drawpolygon(c, NOW, xctx->poly[c][i].x, xctx->poly[c][i].y, xctx->poly[c][i].points,
xctx->poly[c][i].fill, xctx->poly[c][i].dash);
}
dbg(1, "create_ps(): starting drawing symbols on layer %d\n", c);
for(i=0;i<xctx->instances; ++i)
ps_draw_symbol(i,c,what,0,0,0.0,0.0);
}

4
src/spice_netlist.c
View File

@ -53,7 +53,7 @@ void hier_psprint(char **res, int what) /* netlister driver */
if((what & 1) && !ps_draw(1)) return; /* prolog */
xctx->push_undo();
str_hash_init(&subckt_table, HASHSIZE);
zoom_full(0, 0, 1, 0.97);
zoom_full(0, 0, 3, 0.97);
if(what & 1) ps_draw(2); /* page */
if(what & 2) { /* print cellname */
my_strcat(_ALLOC_ID_, res, hier_psprint_mtime(xctx->sch[xctx->currsch]));
@ -117,7 +117,7 @@ void hier_psprint(char **res, int what) /* netlister driver */
xctx->pop_undo(0, 0);
my_strncpy(xctx->current_name, rel_sym_path(xctx->sch[xctx->currsch]), S(xctx->current_name));
if(what & 1) ps_draw(4); /* trailer */
zoom_full(0, 0, 1, 0.97);
zoom_full(0, 0, 3, 0.97);
draw();
}