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

Fixed segfault in connectivity algo for boards with orphaned nets 

Fixes: lp:1701347
* https://bugs.launchpad.net/kicad/+bug/1701347
This commit is contained in:
Tomasz Włostowski 2017-06-30 00:45:50 +02:00
parent bafb8c3688
commit d6820bc925
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/class_board.cpp
View File

@ -757,7 +757,11 @@ void BOARD::SetElementVisibility( GAL_LAYER_ID LAYER_aPCB, bool isEnabled )
// so the hide/show option is a per item selection // so the hide/show option is a per item selection
for( unsigned int net = 1; net < GetNetCount(); net++ ) for( unsigned int net = 1; net < GetNetCount(); net++ )
GetConnectivity()->GetRatsnestForNet( net )->SetVisible( visible ); {
auto rn = GetConnectivity()->GetRatsnestForNet( net );
if( rn )
rn->SetVisible( visible );
}
for( auto track : Tracks() ) for( auto track : Tracks() )
track->SetLocalRatsnestVisible( isEnabled ); track->SetLocalRatsnestVisible( isEnabled );

9
pcbnew/connectivity.cpp
View File

@ -566,3 +566,12 @@ const std::vector<BOARD_CONNECTED_ITEM*> CONNECTIVITY_DATA::GetConnectedItems(
return rv; return rv;
} }
RN_NET* CONNECTIVITY_DATA::GetRatsnestForNet( int aNet )
{
if ( aNet < 0 || aNet >= m_nets.size() )
{
return nullptr;
}
return m_nets[ aNet ];
}

5
pcbnew/connectivity.h
View File

@ -122,10 +122,7 @@ public:
* Function GetRatsnestForNet() * Function GetRatsnestForNet()
* Returns the ratsnest, expressed as a set of graph edges for a given net. * Returns the ratsnest, expressed as a set of graph edges for a given net.
*/ */
RN_NET* GetRatsnestForNet( int aNet ) RN_NET* GetRatsnestForNet( int aNet );
{
return m_nets[aNet];
}
/** /**
* Function PropagateNets() * Function PropagateNets()

3
pcbnew/ratsnest.cpp
View File

@ -103,6 +103,9 @@ void PCB_BASE_FRAME::DrawGeneralRatsnest( wxDC* aDC, int aNetcode )
{ {
RN_NET* net = connectivity->GetRatsnestForNet( i ); RN_NET* net = connectivity->GetRatsnestForNet( i );
if( !net )
continue;
if( ( aNetcode <= 0 ) || ( aNetcode == i ) ) if( ( aNetcode <= 0 ) || ( aNetcode == i ) )
{ {
for( const auto& edge : net->GetEdges() ) for( const auto& edge : net->GetEdges() )

3
pcbnew/ratsnest_viewitem.cpp
View File

@ -86,6 +86,9 @@ void RATSNEST_VIEWITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const
{ {
RN_NET* net = m_data->GetRatsnestForNet( i ); RN_NET* net = m_data->GetRatsnestForNet( i );
if( !net )
continue;
// Draw the "static" ratsnest // Draw the "static" ratsnest
if( i != highlightedNet ) if( i != highlightedNet )
gal->SetStrokeColor( color ); // using the default ratsnest color for not highlighted gal->SetStrokeColor( color ); // using the default ratsnest color for not highlighted