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

pcbnew: Tracks cleanup use connectivity database 

Rather than duplicating the connectivity calculations in determining
whether a track is dangling, we utilize the current database to find the
number of connected items for an anchor item when feasible.

Multiple anchors such as tracks still need additional logic.

Fixes: lp:1805479
* https://bugs.launchpad.net/kicad/+bug/1805479
This commit is contained in:
Seth Hillbrand 2018-11-26 22:04:14 -07:00
parent 72f17ad7f0
commit 7b2f245283
2 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pcbnew/connectivity/connectivity_items.cpp
View File

@ -253,50 +253,27 @@ bool CN_ANCHOR::IsDangling() const
if( !m_cluster ) if( !m_cluster )
return true; return true;
// Calculate the item count connected to this anchor.
// m_cluster groups all items connected, but they are not necessary connected
// at this coordinate point (they are only candidates)
BOARD_CONNECTED_ITEM* item_ref = Parent();
LSET layers = item_ref->GetLayerSet() & LSET::AllCuMask();
// the number of items connected to item_ref at ths anchor point
int connected_items_count = 0;
// the minimal number of items connected to item_ref // the minimal number of items connected to item_ref
// at this anchor point to decide the anchor is *not* dangling // at this anchor point to decide the anchor is *not* dangling
int minimal_count = 1; size_t minimal_count = 1;
size_t connected_count = m_item->ConnectedItems().size();
// a via can be removed if connected to only one other item. // a via can be removed if connected to only one other item.
// the minimal_count is therefore 2 if( Parent()->Type() == PCB_VIA_T )
if( item_ref->Type() == PCB_VIA_T ) return connected_count < 2;
minimal_count = 2;
for( CN_ITEM* item : *m_cluster ) if( m_item->AnchorCount() == 1 )
return connected_count < minimal_count;
// Only items with multiple anchors might have additional items connected that we
// should ignore for this calculation.
for( auto item : m_item->ConnectedItems() )
{ {
if( !item->Valid() ) if( !item->Parent()->HitTest( wxPoint( Pos().x, Pos().y ) ) )
continue; connected_count--;
BOARD_CONNECTED_ITEM* brd_item = item->Parent();
if( brd_item == item_ref )
continue;
// count only items on the same layer at this coordinate (especially for zones)
if( !( brd_item->GetLayerSet() & layers ).any() )
continue;
if( brd_item->Type() == PCB_ZONE_AREA_T )
{
ZONE_CONTAINER* zone = static_cast<ZONE_CONTAINER*>( brd_item );
if( zone->HitTestInsideZone( wxPoint( Pos() ) ) )
connected_items_count++;
}
else if( brd_item->HitTest( wxPoint( Pos() ) ) )
connected_items_count++;
} }
return connected_items_count < minimal_count; return connected_count < minimal_count;
} }

5
pcbnew/connectivity/connectivity_items.h
View File

@ -152,11 +152,12 @@ typedef std::vector<CN_ANCHOR_PTR> CN_ANCHORS;
// basic connectivity item // basic connectivity item
class CN_ITEM : public INTRUSIVE_LIST<CN_ITEM> class CN_ITEM : public INTRUSIVE_LIST<CN_ITEM>
{ {
public:
using CONNECTED_ITEMS = std::set<CN_ITEM*>;
private: private:
BOARD_CONNECTED_ITEM* m_parent; BOARD_CONNECTED_ITEM* m_parent;
using CONNECTED_ITEMS = std::set<CN_ITEM*>;
///> list of items physically connected (touching) ///> list of items physically connected (touching)
CONNECTED_ITEMS m_connected; CONNECTED_ITEMS m_connected;