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

Code formatting and warning fixes

This commit is contained in:
Maciej Suminski 2017-06-23 19:22:44 +02:00
parent 3aaf26da2e
commit 72eff0941e
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/class_board.cpp
View File

@ -750,19 +750,24 @@ void BOARD::SetElementVisibility( GAL_LAYER_ID LAYER_aPCB, bool isEnabled )
switch( LAYER_aPCB )
{
case LAYER_RATSNEST:
{
{
bool visible = IsElementVisible( LAYER_RATSNEST );
// we must clear or set the CH_VISIBLE flags to hide/show ratsnest
// because we have a tool to show/hide ratsnest relative to a pad or a module
// so the hide/show option is a per item selection
for ( int net = 1; net < GetNetCount(); net++ )
for( unsigned int net = 1; net < GetNetCount(); net++ )
GetConnectivity()->GetRatsnestForNet( net )->SetVisible( visible );
for ( auto track : Tracks() )
for( auto track : Tracks() )
track->SetLocalRatsnestVisible( isEnabled );
for( auto mod : Modules() )
for ( auto pad : mod->Pads() )
{
for( auto pad : mod->Pads() )
pad->SetLocalRatsnestVisible( isEnabled );
}
for( int i = 0; i<GetAreaCount(); i++ )
{
auto zone = GetArea( i );
@ -772,7 +777,8 @@ void BOARD::SetElementVisibility( GAL_LAYER_ID LAYER_aPCB, bool isEnabled )
m_Status_Pcb = 0;
break;
}
}
default:
;
}

4
pcbnew/connectivity.cpp
View File

@ -440,10 +440,10 @@ unsigned int CONNECTIVITY_DATA::GetNodeCount( int aNet ) const
if( aNet < 0 )
{
for( const auto& net : m_nets )
for( const auto& net : m_nets )
sum += net->GetNodeCount();
}
else if( aNet < m_nets.size() )
else if( aNet < (int) m_nets.size() )
{
sum = m_nets[aNet]->GetNodeCount();
}

2
pcbnew/connectivity_algo.cpp
View File

@ -831,7 +831,7 @@ void CN_CONNECTIVITY_ALGO::markNetAsDirty( int aNet )
if( aNet <= 0 )
return;
if(m_dirtyNets.size() <= aNet )
if( (int) m_dirtyNets.size() <= aNet )
m_dirtyNets.resize( aNet + 1 );
m_dirtyNets[aNet] = true;

4
pcbnew/connectivity_algo.h
View File

@ -574,8 +574,8 @@ public:
return m_cachedPoly->BBox();
}
virtual int AnchorCount() const;
virtual const VECTOR2I GetAnchor( int n ) const;
virtual int AnchorCount() const override;
virtual const VECTOR2I GetAnchor( int n ) const override;
private:
std::vector<VECTOR2I> m_testOutlinePoints;

2
pcbnew/edit.cpp
View File

@ -1451,8 +1451,8 @@ void PCB_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
SetToolID( id, wxCURSOR_PENCIL, _( "Add tracks" ) );
else
SetToolID( id, wxCURSOR_QUESTION_ARROW, _( "Add tracks" ) );
Compile_Ratsnest( &dc, true );
Compile_Ratsnest( &dc, true );
break;
case ID_PCB_MODULE_BUTT:

8
pcbnew/ratsnest_data.cpp
View File

@ -248,7 +248,7 @@ public:
mstEdges.emplace_back( src, dst, getDistance( src, dst ) );
}
for( int i = 0; i < anchorChains.size(); i++ )
for( unsigned int i = 0; i < anchorChains.size(); i++ )
{
auto& chain = anchorChains[i];
@ -260,7 +260,7 @@ public:
return a->GetCluster().get() < b->GetCluster().get();
} );
for( auto j = 1; j < chain.size(); j++ )
for( unsigned int j = 1; j < chain.size(); j++ )
{
const auto& prevNode = chain[j - 1];
const auto& curNode = chain[j];
@ -368,7 +368,7 @@ void RN_NET::AddCluster( CN_CLUSTER_PTR aCluster )
{
bool isZone = dynamic_cast<CN_ZONE*>(item) != nullptr;
auto& anchors = item->Anchors();
int nAnchors = isZone ? 1 : anchors.size();
unsigned int nAnchors = isZone ? 1 : anchors.size();
if( nAnchors > anchors.size() )
nAnchors = anchors.size();
@ -376,7 +376,7 @@ void RN_NET::AddCluster( CN_CLUSTER_PTR aCluster )
//printf("item %p anchors : %d\n", item, anchors.size() );
//printf("add item %p anchors : %d net : %d\n", item, item->Anchors().size(), item->Parent()->GetNetCode() );
for( int i = 0; i < nAnchors; i++ )
for( unsigned int i = 0; i < nAnchors; i++ )
{
// printf("add anchor %p\n", anchors[i].get() );