AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected preview scale calculation (patch from Daniel Walter)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-07-02 12:56:34 +00:00
parent 64c1effefa
commit f2a59080e9
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/printwin.cpp
View File

@ -352,28 +352,27 @@ bool wxWindowsPrintPreview::Print(bool interactive)
void wxWindowsPrintPreview::DetermineScaling() void wxWindowsPrintPreview::DetermineScaling()
{ {
HDC dc = ::GetDC(NULL); ScreenHDC dc;
int screenWidth = ::GetDeviceCaps(dc, HORZSIZE); int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
int screenYRes = ::GetDeviceCaps(dc, VERTRES); int screenXRes = ::GetDeviceCaps(dc, HORZRES);
int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX); int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY); int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY); m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
::ReleaseDC(NULL, dc);
// Get a device context for the currently selected printer // Get a device context for the currently selected printer
wxPrinterDC printerDC(m_printDialogData.GetPrintData()); wxPrinterDC printerDC(m_printDialogData.GetPrintData());
int printerWidth = 150; int printerWidth = 150;
int printerHeight wxDUMMY_INITIALIZE(250);
int printerXRes = 1500; int printerXRes = 1500;
int printerYRes = 2500; int printerYRes = 2500;
dc = GetHdcOf(printerDC); if ( printerDC.Ok() )
if ( dc )
{ {
HDC dc = GetHdcOf(printerDC);
printerWidth = ::GetDeviceCaps(dc, HORZSIZE); printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
printerHeight = ::GetDeviceCaps(dc, VERTSIZE); int printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
printerXRes = ::GetDeviceCaps(dc, HORZRES); printerXRes = ::GetDeviceCaps(dc, HORZRES);
printerYRes = ::GetDeviceCaps(dc, VERTRES); printerYRes = ::GetDeviceCaps(dc, VERTRES);
@ -383,18 +382,29 @@ void wxWindowsPrintPreview::DetermineScaling()
m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY); m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight); m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0) if ( logPPIPrinterX == 0 ||
logPPIPrinterY == 0 ||
printerWidth == 0 ||
printerHeight == 0 )
{
m_isOk = false; m_isOk = false;
}
} }
else else
{
m_isOk = false; m_isOk = false;
}
m_pageWidth = printerXRes; m_pageWidth = printerXRes;
m_pageHeight = printerYRes; m_pageHeight = printerYRes;
// At 100%, the page should look about page-size on the screen. // At 100%, the page should look about page-size on the screen.
m_previewScale = (float)((float)screenWidth/(float)printerWidth); //
m_previewScale = m_previewScale * (float)((float)screenYRes/(float)printerYRes); // TODO: the scale could be different in vertical and horizontal directions
float screenDPI = (float)screenXRes / screenWidth;
float printerDPI = (float)printerXRes / printerWidth;
m_previewScale = screenDPI / printerDPI;
} }
/**************************************************************************** /****************************************************************************