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

This is a quick fix to the Windows printing function. 

Tested with pdf and a color laser printer.
Still some bugs: the grid needs to be fixed.
This commit is contained in:
Holger Vogt 2020-10-15 17:41:58 +02:00
parent af2f3790f1
commit a836f81d62
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/frontend/wdisp/winprint.c
View File

@ -56,6 +56,8 @@ static HDC PrinterDC = NULL; /* Device Context */
static COLORREF ColorTable[NumPrintColors]; /* color memory */ static COLORREF ColorTable[NumPrintColors]; /* color memory */
static int PrinterWidth = 1000; /* paper width */ static int PrinterWidth = 1000; /* paper width */
static int PrinterHeight = 1000; /* paper height */ static int PrinterHeight = 1000; /* paper height */
static int xoffset; /* offset from left boundary */
static int yoffset; /* offset from top */
/****************************************************************************** /******************************************************************************
printer initialization printer initialization
@ -201,6 +203,12 @@ int WPRINT_Init(void)
/* Farben initialisieren */ /* Farben initialisieren */
wincolor_init(ColorTable, NumPrintColors); wincolor_init(ColorTable, NumPrintColors);
/* if grid/text color is white, change to black */
if (ColorTable[1] == RGB(255, 255, 255))
ColorTable[1] = 0;
ColorTable[0] = RGB(255, 255, 255);
/* LineStyles initialisieren */ /* LineStyles initialisieren */
LineTable[0] = PS_SOLID; LineTable[0] = PS_SOLID;
LineTable[1] = PS_DOT; /* Gitter */ LineTable[1] = PS_DOT; /* Gitter */
@ -262,7 +270,7 @@ int WPRINT_NewViewport(GRAPH * graph)
/* Font-Parameter abfragen */ /* Font-Parameter abfragen */
if (GetTextMetrics( PrinterDC, &tm)) { if (GetTextMetrics( PrinterDC, &tm)) {
graph->fontheight = tm.tmHeight; graph->fontheight = tm.tmHeight;
graph->fontwidth = tm.tmAveCharWidth; graph->fontwidth = (int)(tm.tmAveCharWidth * 1.2);
} }
/* Setze den Linien-Index */ /* Setze den Linien-Index */
@ -275,8 +283,11 @@ int WPRINT_NewViewport(GRAPH * graph)
/* Absolut-Parameter setzen */ /* Absolut-Parameter setzen */
graph->absolute.xpos = 0; graph->absolute.xpos = 0;
graph->absolute.ypos = 0; graph->absolute.ypos = 0;
graph->absolute.width = PrinterWidth; graph->absolute.width = (int)(PrinterWidth * .9);
graph->absolute.height = PrinterHeight; graph->absolute.height = (int)(PrinterHeight * .9);
xoffset = (int)(PrinterWidth * .05);
yoffset = (int)(PrinterHeight * -.05);
/* Druckauftrag anmelden */ /* Druckauftrag anmelden */
di.cbSize = sizeof( DOCINFO); di.cbSize = sizeof( DOCINFO);
@ -291,14 +302,14 @@ int WPRINT_NewViewport(GRAPH * graph)
align = GetTextAlign( PrinterDC); align = GetTextAlign( PrinterDC);
SetTextAlign( PrinterDC, TA_RIGHT | TA_TOP | TA_NOUPDATECP); SetTextAlign( PrinterDC, TA_RIGHT | TA_TOP | TA_NOUPDATECP);
#ifdef EXT_ASC #ifdef EXT_ASC
TextOut(PrinterDC, PrinterWidth - graph->fontwidth, 1, graph->plotname, TextOut(PrinterDC, PrinterWidth - graph->fontwidth, -1*yoffset, graph->plotname,
(int)strlen(graph->plotname)); (int)strlen(graph->plotname));
#else #else
const int n_byte_wide = 2 * (int) strlen(graph->plotname) + 1; const int n_byte_wide = 2 * (int) strlen(graph->plotname) + 1;
wchar_t * const wtext = TMALLOC(wchar_t, n_byte_wide); wchar_t * const wtext = TMALLOC(wchar_t, n_byte_wide);
MultiByteToWideChar(CP_UTF8, 0, graph->plotname, -1, wtext, MultiByteToWideChar(CP_UTF8, 0, graph->plotname, -1, wtext,
n_byte_wide); n_byte_wide);
TextOutW(PrinterDC, PrinterWidth - graph->fontwidth, 1, wtext, TextOutW(PrinterDC, PrinterWidth - graph->fontwidth -xoffset, -1*yoffset, wtext,
n_byte_wide); n_byte_wide);
txfree(wtext); txfree(wtext);
#endif #endif
@ -336,6 +347,11 @@ int WPRINT_DrawLine(int x1, int y1, int x2, int y2, bool isgrid)
{ {
NG_IGNORE(isgrid); NG_IGNORE(isgrid);
x1 = x1 + xoffset;
x2 = x2 + xoffset;
y1 = y1 + yoffset;
y2 = y2 + yoffset;
tpPrintData pd; tpPrintData pd;
HPEN OldPen; HPEN OldPen;
HPEN NewPen; HPEN NewPen;
@ -349,7 +365,10 @@ int WPRINT_DrawLine(int x1, int y1, int x2, int y2, bool isgrid)
ColIndex = pd->ColorIndex; ColIndex = pd->ColorIndex;
MoveToEx(PrinterDC, x1, PrinterHeight - y1, NULL); MoveToEx(PrinterDC, x1, PrinterHeight - y1, NULL);
NewPen = CreatePen( LineTable[pd->LineIndex], 0, ColorTable[ColIndex] ); if (isgrid)
NewPen = CreatePen( LineTable[pd->LineIndex], 0, ColorTable[ColIndex] );
else
NewPen = CreatePen( LineTable[pd->LineIndex], 10, ColorTable[ColIndex] );
OldPen = SelectObject(PrinterDC, NewPen); OldPen = SelectObject(PrinterDC, NewPen);
LineTo(PrinterDC, x2, PrinterHeight - y2); LineTo(PrinterDC, x2, PrinterHeight - y2);
OldPen = SelectObject(PrinterDC, OldPen); OldPen = SelectObject(PrinterDC, OldPen);
@ -381,6 +400,9 @@ int WPRINT_Arc(int x0, int y0, int radius, double theta, double delta_theta)
pd = pPrintData(currentgraph); pd = pPrintData(currentgraph);
if (!pd) return 0; if (!pd) return 0;
x0 = x0 + xoffset;
y0 = y0 + yoffset;
ColIndex = pd->ColorIndex; ColIndex = pd->ColorIndex;
direction = AD_COUNTERCLOCKWISE; direction = AD_COUNTERCLOCKWISE;
@ -407,7 +429,7 @@ int WPRINT_Arc(int x0, int y0, int radius, double theta, double delta_theta)
ye = (int)(dy0 + (r * sin(theta + delta_theta))); ye = (int)(dy0 + (r * sin(theta + delta_theta)));
/* Zeichnen */ /* Zeichnen */
NewPen = CreatePen( LineTable[pd->LineIndex], 0, ColorTable[ColIndex] ); NewPen = CreatePen( LineTable[pd->LineIndex], 10, ColorTable[ColIndex] );
OldPen = SelectObject(PrinterDC, NewPen); OldPen = SelectObject(PrinterDC, NewPen);
Arc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye); Arc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);
OldPen = SelectObject(PrinterDC, OldPen); OldPen = SelectObject(PrinterDC, OldPen);
@ -426,6 +448,9 @@ int WPRINT_Text(char * text, int x, int y, int degrees)
pd = pPrintData(currentgraph); pd = pPrintData(currentgraph);
if (!pd) return 0; if (!pd) return 0;
x = x + xoffset;
y = y + yoffset;
ColIndex = pd->ColorIndex; ColIndex = pd->ColorIndex;
SetTextColor( PrinterDC, ColorTable[ColIndex]); SetTextColor( PrinterDC, ColorTable[ColIndex]);