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

router: Refactor m_padToDieLength out of meander placer base.

This commit is contained in:
Alex 2022-12-01 17:59:18 +03:00
parent 3b25fdc212
commit e56064696b
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/router/pns_dp_meander_placer.cpp
View File

@ -120,8 +120,6 @@ bool DP_MEANDER_PLACER::Start( const VECTOR2I& aP, ITEM* aStartItem )
if( m_endPad_n ) if( m_endPad_n )
m_padToDieN += m_endPad_n->GetPadToDie(); m_padToDieN += m_endPad_n->GetPadToDie();
m_padToDieLength = std::max( m_padToDieP, m_padToDieN );
m_world->Remove( m_originPair.PLine() ); m_world->Remove( m_originPair.PLine() );
m_world->Remove( m_originPair.NLine() ); m_world->Remove( m_originPair.NLine() );

1
pcbnew/router/pns_meander_placer.cpp
View File

@ -40,6 +40,7 @@ MEANDER_PLACER::MEANDER_PLACER( ROUTER* aRouter ) :
m_initialSegment = nullptr; m_initialSegment = nullptr;
m_lastLength = 0; m_lastLength = 0;
m_lastStatus = TOO_SHORT; m_lastStatus = TOO_SHORT;
m_padToDieLength = 0;
} }

3
pcbnew/router/pns_meander_placer.h
View File

@ -118,6 +118,9 @@ protected:
MEANDERED_LINE m_result; MEANDERED_LINE m_result;
LINKED_ITEM* m_initialSegment; LINKED_ITEM* m_initialSegment;
///< Total length added by pad to die size.
int m_padToDieLength;
long long int m_lastLength; long long int m_lastLength;
TUNING_STATUS m_lastStatus; TUNING_STATUS m_lastStatus;
}; };

1
pcbnew/router/pns_meander_placer_base.cpp
View File

@ -32,7 +32,6 @@ MEANDER_PLACER_BASE::MEANDER_PLACER_BASE( ROUTER* aRouter ) :
{ {
m_world = nullptr; m_world = nullptr;
m_currentWidth = 0; m_currentWidth = 0;
m_padToDieLength = 0;
m_startPad_n = nullptr; m_startPad_n = nullptr;
m_startPad_p = nullptr; m_startPad_p = nullptr;
m_endPad_n = nullptr; m_endPad_n = nullptr;

3
pcbnew/router/pns_meander_placer_base.h
View File

@ -154,9 +154,6 @@ protected:
///< Pointer to world to search colliding items. ///< Pointer to world to search colliding items.
NODE* m_world; NODE* m_world;
///< Total length added by pad to die size.
int m_padToDieLength;
///< Width of the meandered trace(s). ///< Width of the meandered trace(s).
int m_currentWidth; int m_currentWidth;

6
pcbnew/router/pns_meander_skew_placer.cpp
View File

@ -107,13 +107,11 @@ bool MEANDER_SKEW_PLACER::Start( const VECTOR2I& aP, ITEM* aStartItem )
if ( m_originPair.NetP() == m_originLine.Net() ) if ( m_originPair.NetP() == m_originLine.Net() )
{ {
m_padToDieLength = m_padToDieP;
m_coupledLength = m_padToDieN + lineLength( m_tunedPathN, m_startPad_n, m_endPad_n ); m_coupledLength = m_padToDieN + lineLength( m_tunedPathN, m_startPad_n, m_endPad_n );
m_tunedPath = m_tunedPathP; m_tunedPath = m_tunedPathP;
} }
else else
{ {
m_padToDieLength = m_padToDieN;
m_coupledLength = m_padToDieP + lineLength( m_tunedPathP, m_startPad_p, m_endPad_p ); m_coupledLength = m_padToDieP + lineLength( m_tunedPathP, m_startPad_p, m_endPad_p );
m_tunedPath = m_tunedPathN; m_tunedPath = m_tunedPathN;
} }
@ -125,9 +123,9 @@ bool MEANDER_SKEW_PLACER::Start( const VECTOR2I& aP, ITEM* aStartItem )
long long int MEANDER_SKEW_PLACER::origPathLength() const long long int MEANDER_SKEW_PLACER::origPathLength() const
{ {
if ( m_originPair.NetP() == m_originLine.Net() ) if ( m_originPair.NetP() == m_originLine.Net() )
return m_padToDieLength + lineLength( m_tunedPath, m_startPad_p, m_endPad_p ); return m_padToDieP + lineLength( m_tunedPath, m_startPad_p, m_endPad_p );
return m_padToDieLength + lineLength( m_tunedPath, m_startPad_n, m_endPad_n ); return m_padToDieN + lineLength( m_tunedPath, m_startPad_n, m_endPad_n );
} }