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

Corrected "Zoom Auto" in GAL with empty board.

This commit is contained in:
Maciej Suminski 2015-04-30 10:46:06 +02:00
parent 6379d80636
commit 3e46f2233a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/tools/pcbnew_control.cpp
View File

@ -100,18 +100,17 @@ int PCBNEW_CONTROL::ZoomFitScreen( const TOOL_EVENT& aEvent )
BOARD* board = getModel<BOARD>(); BOARD* board = getModel<BOARD>();
board->ComputeBoundingBox(); board->ComputeBoundingBox();
BOX2I boardBBox = board->ViewBBox(); BOX2I boardBBox = board->ViewBBox();
VECTOR2I screenSize = gal->GetScreenPixelSize();
if( boardBBox.GetSize().x == 0 || boardBBox.GetSize().y == 0 ) if( boardBBox.GetSize().x == 0 || boardBBox.GetSize().y == 0 )
{ {
// Empty view // Empty view
view->SetScale( 100000.0 ); view->SetCenter( view->ToWorld( VECTOR2D( screenSize.x / 2, screenSize.y / 2 ) ) );
view->SetCenter( VECTOR2D( 0, 0 ) ); view->SetScale( 17.0 );
} }
else else
{ {
// Autozoom to board // Autozoom to board
VECTOR2I screenSize = gal->GetScreenPixelSize();
double iuPerX = screenSize.x ? boardBBox.GetWidth() / screenSize.x : 1.0; double iuPerX = screenSize.x ? boardBBox.GetWidth() / screenSize.x : 1.0;
double iuPerY = screenSize.y ? boardBBox.GetHeight() / screenSize.y : 1.0; double iuPerY = screenSize.y ? boardBBox.GetHeight() / screenSize.y : 1.0;
@ -119,8 +118,8 @@ int PCBNEW_CONTROL::ZoomFitScreen( const TOOL_EVENT& aEvent )
double zoomFactor = gal->GetWorldScale() / gal->GetZoomFactor(); double zoomFactor = gal->GetWorldScale() / gal->GetZoomFactor();
double zoom = 1.0 / ( zoomFactor * bestZoom ); double zoom = 1.0 / ( zoomFactor * bestZoom );
view->SetScale( zoom );
view->SetCenter( boardBBox.Centre() ); view->SetCenter( boardBBox.Centre() );
view->SetScale( zoom );
} }
return 0; return 0;