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

add more constness to connecivity algo 

also make ForEachAnchor inlineable, like ForEachItem.
remove some unused function declarations.
This commit is contained in:
Oleg Endo 2020-04-13 04:10:57 +09:00 committed by Jon Evans
parent 3de5b98316
commit 4c7471eb79
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -747,16 +747,6 @@ void CN_CONNECTIVITY_ALGO::Clear()
} }
void CN_CONNECTIVITY_ALGO::ForEachAnchor( const std::function<void( CN_ANCHOR& )>& aFunc )
{
ForEachItem( [aFunc] ( CN_ITEM& item ) {
for( const auto& anchor : item.Anchors() )
aFunc( *anchor );
}
);
}
void CN_CONNECTIVITY_ALGO::SetProgressReporter( PROGRESS_REPORTER* aReporter ) void CN_CONNECTIVITY_ALGO::SetProgressReporter( PROGRESS_REPORTER* aReporter )
{ {
m_progressReporter = aReporter; m_progressReporter = aReporter;

26
pcbnew/connectivity/connectivity_algo.h
View File

@ -173,7 +173,7 @@ public:
CN_CONNECTIVITY_ALGO() {} CN_CONNECTIVITY_ALGO() {}
~CN_CONNECTIVITY_ALGO() { Clear(); } ~CN_CONNECTIVITY_ALGO() { Clear(); }
bool ItemExists( const BOARD_CONNECTED_ITEM* aItem ) bool ItemExists( const BOARD_CONNECTED_ITEM* aItem ) const
{ {
return m_itemMap.find( aItem ) != m_itemMap.end(); return m_itemMap.find( aItem ) != m_itemMap.end();
} }
@ -197,7 +197,7 @@ public:
*i = false; *i = false;
} }
void GetDirtyClusters( CLUSTERS& aClusters ) void GetDirtyClusters( CLUSTERS& aClusters ) const
{ {
for( const auto& cl : m_ratsnestClusters ) for( const auto& cl : m_ratsnestClusters )
{ {
@ -240,17 +240,25 @@ public:
*/ */
void FindIsolatedCopperIslands( std::vector<CN_ZONE_ISOLATED_ISLAND_LIST>& aZones ); void FindIsolatedCopperIslands( std::vector<CN_ZONE_ISOLATED_ISLAND_LIST>& aZones );
bool CheckConnectivity( std::vector<CN_DISJOINT_NET_ENTRY>& aReport );
const CLUSTERS& GetClusters(); const CLUSTERS& GetClusters();
int GetUnconnectedCount();
CN_LIST& ItemList() { return m_itemList; } const CN_LIST& ItemList() const
{
void ForEachAnchor( const std::function<void( CN_ANCHOR& )>& aFunc ); return m_itemList;
}
template <typename Func> template <typename Func>
void ForEachItem( Func&& aFunc ) void ForEachAnchor( Func&& aFunc ) const
{
for( auto&& item : m_itemList )
{
for( auto&& anchor : item->Anchors() )
aFunc( *anchor );
}
}
template <typename Func>
void ForEachItem( Func&& aFunc ) const
{ {
for( auto&& item : m_itemList ) for( auto&& item : m_itemList )
aFunc( *item ); aFunc( *item );

2
pcbnew/connectivity/connectivity_data.cpp
View File

@ -504,7 +504,7 @@ unsigned int CONNECTIVITY_DATA::GetPadCount( int aNet ) const
{ {
int n = 0; int n = 0;
for( auto pad : m_connAlgo->ItemList() ) for( auto&& pad : m_connAlgo->ItemList() )
{ {
if( !pad->Valid() || pad->Parent()->Type() != PCB_PAD_T) if( !pad->Valid() || pad->Parent()->Type() != PCB_PAD_T)
continue; continue;

12
pcbnew/connectivity/connectivity_items.h
View File

@ -425,11 +425,21 @@ public:
m_index.RemoveAll(); m_index.RemoveAll();
} }
using ITER = decltype(m_items)::iterator; using ITER = decltype( m_items )::iterator;
using CONST_ITER = decltype( m_items )::const_iterator;
ITER begin() { return m_items.begin(); }; ITER begin() { return m_items.begin(); };
ITER end() { return m_items.end(); }; ITER end() { return m_items.end(); };
CONST_ITER begin() const
{
return m_items.begin();
}
CONST_ITER end() const
{
return m_items.end();
}
CN_ITEM* operator[] ( int aIndex ) { return m_items[aIndex]; } CN_ITEM* operator[] ( int aIndex ) { return m_items[aIndex]; }
template <class T> template <class T>