haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'fit to page' for print outs

This commit is contained in:
Maciej Suminski 2018-10-06 21:34:51 +02:00
parent d3ea63e133
commit b727b310b4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/board_printout.cpp
View File

@ -94,10 +94,12 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
auto painter = getPainter( gal ); auto painter = getPainter( gal );
std::unique_ptr<KIGFX::VIEW> view( m_view->DataReference() ); std::unique_ptr<KIGFX::VIEW> view( m_view->DataReference() );
// Target paper size
wxRect pageSizePx = GetLogicalPageRect(); wxRect pageSizePx = GetLogicalPageRect();
VECTOR2D pageSizeIn( (double) pageSizePx.width / dc->GetPPI().x, const VECTOR2D pageSizeIn( (double) pageSizePx.width / dc->GetPPI().x,
(double) pageSizePx.height / dc->GetPPI().y ); (double) pageSizePx.height / dc->GetPPI().y );
galPrint->SetSheetSize( pageSizeIn ); galPrint->SetSheetSize( pageSizeIn );
const VECTOR2D pageSizeIU( milsToIU( pageSizeIn.x * 1000 ), milsToIU( pageSizeIn.y * 1000 ) );
view->SetGAL( gal ); view->SetGAL( gal );
view->SetPainter( painter.get() ); view->SetPainter( painter.get() );
@ -124,10 +126,11 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
setupViewLayers( view, m_settings.m_layerSet ); setupViewLayers( view, m_settings.m_layerSet );
setupPainter( painter ); setupPainter( painter );
BOX2I bBox; // determine printout bounding box
auto sheetSizeMils = m_settings.m_pageInfo.GetSizeMils(); auto sheetSizeMils = m_settings.m_pageInfo.GetSizeMils();
VECTOR2I sheetSizeIU( milsToIU( sheetSizeMils.GetWidth() ), milsToIU( sheetSizeMils.GetHeight() ) ); VECTOR2I sheetSizeIU( milsToIU( sheetSizeMils.GetWidth() ), milsToIU( sheetSizeMils.GetHeight() ) );
BOX2I bBox;
// Determine printout bounding box
if( m_settings.PrintBorderAndTitleBlock() ) if( m_settings.PrintBorderAndTitleBlock() )
{ {
bBox = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) ); bBox = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) );
@ -151,8 +154,8 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
} }
else else
{ {
double scaleX = (double) sheetSizeIU.x / bBox.GetWidth(); double scaleX = (double) pageSizeIU.x / bBox.GetWidth();
double scaleY = (double) sheetSizeIU.y / bBox.GetHeight(); double scaleY = (double) pageSizeIU.y / bBox.GetHeight();
m_settings.m_scale = std::min( scaleX, scaleY ); m_settings.m_scale = std::min( scaleX, scaleY );
} }
} }