luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

separate svg and postscript 

suitable text placement for svg
This commit is contained in:
Holger Vogt 2020-08-15 21:55:00 +02:00
parent 87b59d22a5
commit dacd727d87
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontend/plotting/grid.c
View File

@ -131,7 +131,6 @@ gr_fixgrid(GRAPH *graph, double xdelta, double ydelta, int xtype, int ytype)
void void
gr_redrawgrid(GRAPH *graph) gr_redrawgrid(GRAPH *graph)
{ {
SetColor(1); SetColor(1);
SetLinestyle(1); SetLinestyle(1);
/* draw labels */ /* draw labels */
@ -141,7 +140,13 @@ gr_redrawgrid(GRAPH *graph)
(int)(graph->absolute.width * 0.35), (int)(graph->absolute.width * 0.35),
graph->fontheight, 0); graph->fontheight, 0);
#else #else
if (eq(dispdev->name, "postscript") || eq(dispdev->name, "svg")) if (eq(dispdev->name, "postscript"))
{
DevDrawText(graph->grid.xlabel,
(int)(graph->absolute.width * 0.35),
graph->fontheight, 0);
}
else if (eq(dispdev->name, "svg"))
{ {
DevDrawText(graph->grid.xlabel, DevDrawText(graph->grid.xlabel,
(int)(graph->absolute.width * 0.35), (int)(graph->absolute.width * 0.35),
@ -236,10 +241,10 @@ gr_redrawgrid(GRAPH *graph)
/* svg for non-Windows */ /* svg for non-Windows */
else if (eq(dispdev->name, "svg")) { else if (eq(dispdev->name, "svg")) {
DevDrawText(graph->grid.ylabel, DevDrawText(graph->grid.ylabel,
graph->fontwidth, 2 * graph->fontwidth,
/* vertical text, midpoint in y is aligned midpoint /* vertical text, midpoint in y is aligned midpoint
* of utf-8 text string */ * of text string */
graph->absolute.height - (int)(mbstowcs(NULL, graph->grid.ylabel, 0) * graph->fontwidth / 2), (graph->absolute.height - (int)strlen(graph->grid.ylabel) * graph->fontwidth) / 2,
90); 90);
} }
#else #else
@ -256,16 +261,12 @@ gr_redrawgrid(GRAPH *graph)
fprintf(stderr, "%s could not be converted\n", graph->grid.ylabel); fprintf(stderr, "%s could not be converted\n", graph->grid.ylabel);
} }
else { else {
SIZE sz; int textlen = graph->fontwidth * wlen;
TEXTMETRICW tmw;
tpWindowData wd = graph->devdep;
GetTextMetricsW(wd->hDC, &tmw);
GetTextExtentPoint32W(wd->hDC, wtext, wlen, &sz);
// printf("length: %d, deviation: %d\n", sz.cx, sz.cx - graph->fontwidth*wlen);
DevDrawText(graph->grid.ylabel, DevDrawText(graph->grid.ylabel,
graph->fontwidth, (int)(2 * graph->fontwidth),
/*vertical text, midpoint in y is aligned midpoint of text string */ //vertical text, midpoint in y is aligned midpoint of text string
(graph->absolute.height - (int)(1.2 * sz.cx + tmw.tmOverhang)) / 2, 90); (graph->absolute.height - (int)(1.2 * textlen)) / 2, 90);
} }
txfree(wtext); txfree(wtext);
} }