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

pcbnew printing: Handle scaling correctly 

When scaling, we need to consider both the sheet size in pcbnew and the
paper size in the printer settings.  When scaling 1:1, the output box
should always be the sheet

Fixes https://gitlab.com/kicad/code/kicad/issues/10913

Fixes https://gitlab.com/kicad/code/kicad/issues/12530
This commit is contained in:
Seth Hillbrand 2022-12-09 09:51:11 -08:00
parent 96a9ec4a0c
commit c5d8dffca4
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/board_printout.cpp
View File

@ -143,20 +143,9 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
VECTOR2I sheetSizeMils = m_settings.m_pageInfo.GetSizeMils(); VECTOR2I sheetSizeMils = m_settings.m_pageInfo.GetSizeMils();
VECTOR2I sheetSizeIU( milsToIU( sheetSizeMils.x ), VECTOR2I sheetSizeIU( milsToIU( sheetSizeMils.x ),
milsToIU( sheetSizeMils.y ) ); milsToIU( sheetSizeMils.y ) );
BOX2I bBox; BOX2I bBox = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) );
// Determine printout bounding box
if( m_settings.PrintBorderAndTitleBlock() )
{
bBox = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) );
view->SetLayerVisible( LAYER_DRAWINGSHEET, true );
}
else
{
bBox = getBoundingBox();
view->SetLayerVisible( LAYER_DRAWINGSHEET, false );
}
view->SetLayerVisible( LAYER_DRAWINGSHEET, m_settings.PrintBorderAndTitleBlock() );
// Fit to page // Fit to page
if( m_settings.m_scale <= 0.0 ) if( m_settings.m_scale <= 0.0 )
@ -166,10 +155,17 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
// Nothing to print // Nothing to print
m_settings.m_scale = 1.0; m_settings.m_scale = 1.0;
} }
else if( !m_settings.PrintBorderAndTitleBlock() )
{
BOX2I content_box = getBoundingBox();
double scaleX = (double) pageSizeIU.x / content_box.GetWidth();
double scaleY = (double) pageSizeIU.y / content_box.GetHeight();
m_settings.m_scale = std::min( scaleX, scaleY );
}
else else
{ {
double scaleX = (double) pageSizeIU.x / bBox.GetWidth(); double scaleX = (double) pageSizeIU.x / sheetSizeIU.x;
double scaleY = (double) pageSizeIU.y / bBox.GetHeight(); double scaleY = (double) pageSizeIU.y / sheetSizeIU.y;
m_settings.m_scale = std::min( scaleX, scaleY ); m_settings.m_scale = std::min( scaleX, scaleY );
} }
} }