Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use cairo_scale() for scaling to full printing resolution, correct transformation in Cairo graphics context for GTK+ printing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-30 09:17:04 +00:00
parent 87fe0f7505
commit eaeb99858d
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/graphicc.cpp
View File

@@ -1042,22 +1042,15 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
const wxDCImpl *impl = dc.GetImpl(); const wxDCImpl *impl = dc.GetImpl();
Init( (cairo_t*) impl->GetCairoContext() ); Init( (cairo_t*) impl->GetCairoContext() );
#if 0
wxGraphicsMatrix matrix = CreateMatrix();
wxPoint org = dc.GetDeviceOrigin(); wxPoint org = dc.GetDeviceOrigin();
matrix.Translate( org.x, org.y ); cairo_translate( m_context, org.x, org.y );
org = dc.GetLogicalOrigin();
matrix.Translate( -org.x, -org.y );
double sx,sy; double sx,sy;
dc.GetUserScale( &sx, &sy ); dc.GetUserScale( &sx, &sy );
matrix.Scale( sx, sy ); cairo_scale( m_context, sx, sy );
ConcatTransform( matrix );
#endif
org = dc.GetLogicalOrigin();
cairo_translate( m_context, -org.x, -org.y );
#endif #endif
} }

31
src/gtk/print.cpp
View File

@@ -1099,11 +1099,23 @@ bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )
// wxGtkPrinterDC // wxGtkPrinterDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#define wxCAIRO_SCALE 1
#if wxCAIRO_SCALE
#define XLOG2DEV(x) LogicalToDeviceX(x)
#define XLOG2DEVREL(x) LogicalToDeviceXRel(x)
#define YLOG2DEV(x) LogicalToDeviceY(x)
#define YLOG2DEVREL(x) LogicalToDeviceYRel(x)
#else
#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * m_DEV2PS) #define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * m_DEV2PS)
#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * m_DEV2PS) #define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * m_DEV2PS)
#define YLOG2DEV(x) ((double)(LogicalToDeviceY(x)) * m_DEV2PS) #define YLOG2DEV(x) ((double)(LogicalToDeviceY(x)) * m_DEV2PS)
#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS) #define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
#endif
IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl) IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl)
@@ -1122,15 +1134,22 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da
if (m_resolution < 0) if (m_resolution < 0)
m_resolution = (1 << (m_resolution+4)) *150; m_resolution = (1 << (m_resolution+4)) *150;
m_PS2DEV = (double)m_resolution / 72.0;
m_DEV2PS = 72.0 / (double)m_resolution;
m_context = gtk_print_context_create_pango_context( m_gpc ); m_context = gtk_print_context_create_pango_context( m_gpc );
m_layout = gtk_print_context_create_pango_layout ( m_gpc ); m_layout = gtk_print_context_create_pango_layout ( m_gpc );
m_fontdesc = pango_font_description_from_string( "Sans 12" ); m_fontdesc = pango_font_description_from_string( "Sans 12" );
m_cairo = gtk_print_context_get_cairo_context ( m_gpc ); m_cairo = gtk_print_context_get_cairo_context ( m_gpc );
#if wxCAIRO_SCALE
m_PS2DEV = 1.0;
m_DEV2PS = 1.0;
gs_cairo->cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
#else
m_PS2DEV = (double)m_resolution / 72.0;
m_DEV2PS = 72.0 / (double)m_resolution;
#endif
m_currentRed = 0; m_currentRed = 0;
m_currentBlue = 0; m_currentBlue = 0;
m_currentGreen = 0; m_currentGreen = 0;
@@ -2227,9 +2246,9 @@ void wxGtkPrinterDCImpl::DoGetSize(int* width, int* height) const
GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc ); GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
if (width) if (width)
*width = wxRound( gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * m_PS2DEV ); *width = wxRound( (double)gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * (double)m_resolution / 72.0 );
if (height) if (height)
*height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_POINTS ) * m_PS2DEV ); *height = wxRound( (double)gtk_page_setup_get_paper_height( setup, GTK_UNIT_POINTS ) * (double)m_resolution / 72.0 );
} }
void wxGtkPrinterDCImpl::DoGetSizeMM(int *width, int *height) const void wxGtkPrinterDCImpl::DoGetSizeMM(int *width, int *height) const
@@ -2363,9 +2382,9 @@ void wxGtkPrintPreview::DetermineScaling()
// Get width and height in points (1/72th of an inch) // Get width and height in points (1/72th of an inch)
wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
sizeDevUnits.x = wxRound((double)sizeDevUnits.x * (double)m_resolution / 72.0); sizeDevUnits.x = wxRound((double)sizeDevUnits.x * (double)m_resolution / 72.0);
sizeDevUnits.y = wxRound((double)sizeDevUnits.y * (double)m_resolution / 72.0); sizeDevUnits.y = wxRound((double)sizeDevUnits.y * (double)m_resolution / 72.0);
wxSize sizeTenthsMM(paper->GetSize()); wxSize sizeTenthsMM(paper->GetSize());
wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10); wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);