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

Pcb printing: fix incorrect pos. of the board when printed without worksheet. 

Fixes #13258
https://gitlab.com/kicad/code/kicad/issues/13258
This commit is contained in:
jean-pierre charras 2023-02-08 11:05:31 +01:00
parent ddd4178c62
commit ae2da76615
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/board_printout.cpp
View File

@ -143,34 +143,35 @@ 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( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) ); BOX2I drawingAreaBBox = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sheetSizeIU ) );
// When printing the board without worksheet items, move board center to the
// drawing area center.
if( !m_settings.PrintBorderAndTitleBlock() )
drawingAreaBBox = getBoundingBox();
view->SetLayerVisible( LAYER_DRAWINGSHEET, m_settings.PrintBorderAndTitleBlock() ); view->SetLayerVisible( LAYER_DRAWINGSHEET, m_settings.PrintBorderAndTitleBlock() );
// Fit to page // Fit to page (drawingAreaBBox)
if( m_settings.m_scale <= 0.0 ) if( m_settings.m_scale <= 0.0 )
{ {
if( !m_settings.PrintBorderAndTitleBlock() ) if( drawingAreaBBox.GetWidth() == 0 || drawingAreaBBox.GetHeight() == 0 )
bBox = getBoundingBox(); // Fit to "objects", new centre
if( bBox.GetWidth() == 0 || bBox.GetHeight() == 0 )
{ {
// Nothing to print // Nothing to print (empty board and no worksheet)
m_settings.m_scale = 1.0; m_settings.m_scale = 1.0;
} }
else else
{ {
double scaleX = (double) pageSizeIU.x / bBox.GetWidth(); double scaleX = (double) pageSizeIU.x / drawingAreaBBox.GetWidth();
double scaleY = (double) pageSizeIU.y / bBox.GetHeight(); double scaleY = (double) pageSizeIU.y / drawingAreaBBox.GetHeight();
m_settings.m_scale = std::min( scaleX, scaleY ); m_settings.m_scale = std::min( scaleX, scaleY );
} }
} }
setupGal( gal ); setupGal( gal );
galPrint->SetNativePaperSize( pageSizeIn, printCtx->HasNativeLandscapeRotation() ); galPrint->SetNativePaperSize( pageSizeIn, printCtx->HasNativeLandscapeRotation() );
gal->SetLookAtPoint( bBox.Centre() ); gal->SetLookAtPoint( drawingAreaBBox.Centre() );
gal->SetZoomFactor( m_settings.m_scale ); gal->SetZoomFactor( m_settings.m_scale );
gal->SetClearColor( dstSettings->GetBackgroundColor() ); gal->SetClearColor( dstSettings->GetBackgroundColor() );
gal->ClearScreen(); gal->ClearScreen();