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

Don't allow the pad preview canvas to become too large. 

Also offset canvas with pad so that hole stays in centre.

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

(cherry picked from commit 3bd4c0c5dc)
This commit is contained in:
Jeff Young 2020-06-02 22:48:07 +01:00
parent bfe4d9f3f4
commit 78d66a9ac3
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -1340,18 +1340,27 @@ void DIALOG_PAD_PROPERTIES::redraw()
if( bbox.GetSize().x > 0 && bbox.GetSize().y > 0 )
{
// gives a size to the full drawable area
BOX2I drawbox;
drawbox.Move( m_dummyPad->GetPosition() );
drawbox.Inflate( bbox.GetSize().x*2, bbox.GetSize().y*2 );
// The origin always goes in the middle of the canvas; we want offsetting the pad
// shape to move the pad, not the hole
bbox.Move( -m_dummyPad->GetPosition() );
int maxXExtent = std::max( abs( bbox.GetLeft() ), abs( bbox.GetRight() ) );
int maxYExtent = std::max( abs( bbox.GetTop() ), abs( bbox.GetBottom() ) );
view->SetBoundary( drawbox );
// Don't blow up the GAL on too-large numbers
if( maxXExtent > INT_MAX / 4 )
maxXExtent = INT_MAX / 4;
if( maxYExtent > INT_MAX / 4 )
maxYExtent = INT_MAX / 4;
BOX2D viewBox, canvasBox;
viewBox.Inflate( maxXExtent * 1.4, maxYExtent * 1.4 ); // add a margin
canvasBox.Inflate( maxXExtent * 2.0, maxYExtent * 2.0 );
view->SetBoundary( canvasBox );
// Autozoom
view->SetViewport( BOX2D( bbox.GetOrigin(), bbox.GetSize() ) );
// Add a margin
view->SetScale( m_panelShowPadGal->GetView()->GetScale() * 0.7 );
view->SetViewport( viewBox );
m_panelShowPadGal->StartDrawing();
m_panelShowPadGal->Refresh();