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

Remove diff-pair-gap handling from single-line-router. 

We can't really support it until we do min/max/opt shoving and
dragging.

Fixes https://gitlab.com/kicad/code/kicad/issues/6932
This commit is contained in:
Jeff Young 2021-01-05 16:41:35 +00:00
parent d975f2f6aa
commit 88d42724e6
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/router/pns_kicad_iface.cpp
View File

@ -82,7 +82,9 @@ public:
virtual bool DpNetPair( const PNS::ITEM* aItem, int& aNetP, int& aNetN ) override; virtual bool DpNetPair( const PNS::ITEM* aItem, int& aNetP, int& aNetN ) override;
virtual bool IsDiffPair( const PNS::ITEM* aA, const PNS::ITEM* aB ) override; virtual bool IsDiffPair( const PNS::ITEM* aA, const PNS::ITEM* aB ) override;
virtual bool QueryConstraint( PNS::CONSTRAINT_TYPE aType, const PNS::ITEM* aItemA, const PNS::ITEM* aItemB, int aLayer, PNS::CONSTRAINT* aConstraint ) override; virtual bool QueryConstraint( PNS::CONSTRAINT_TYPE aType, const PNS::ITEM* aItemA,
const PNS::ITEM* aItemB, int aLayer,
PNS::CONSTRAINT* aConstraint ) override;
virtual wxString NetName( int aNet ) override; virtual wxString NetName( int aNet ) override;
private: private:
@ -282,18 +284,6 @@ int PNS_PCBNEW_RULE_RESOLVER::Clearance( const PNS::ITEM* aA, const PNS::ITEM* a
PNS::CONSTRAINT constraint; PNS::CONSTRAINT constraint;
int rv = 0; int rv = 0;
if( aB && IsDiffPair( aA, aB ) )
{
// for diff pairs, we use the gap value for shoving/dragging
if( QueryConstraint( PNS::CONSTRAINT_TYPE::CT_DIFF_PAIR_GAP, aA, aB, aA->Layer(),
&constraint ) )
{
rv = constraint.m_Value.Opt();
m_clearanceCache[ key ] = rv;
return rv;
}
}
if( isCopper( aA ) && ( !aB || isCopper( aB ) ) ) if( isCopper( aA ) && ( !aB || isCopper( aB ) ) )
{ {
if( QueryConstraint( PNS::CONSTRAINT_TYPE::CT_CLEARANCE, aA, aB, aA->Layer(), if( QueryConstraint( PNS::CONSTRAINT_TYPE::CT_CLEARANCE, aA, aB, aA->Layer(),