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

Handle nets in recoverBaseline(). 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16360
This commit is contained in:
Jeff Young 2023-12-14 15:29:42 +00:00
parent 5704b3f422
commit ec7e3c5bd6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcbnew/generators/pcb_tuning_pattern.cpp
View File

@ -1089,18 +1089,24 @@ bool PCB_TUNING_PATTERN::recoverBaseline( PNS::ROUTER* aRouter )
if( baselineValid() ) if( baselineValid() )
{ {
PNS::LINE recoverLine; NETINFO_ITEM* recoverNet = GetBoard()->FindNet( m_lastNetName );
PNS::LINE recoverLine;
recoverLine.SetLayer( m_layer ); recoverLine.SetLayer( m_layer );
recoverLine.SetWidth( lineWidth ); recoverLine.SetWidth( lineWidth );
recoverLine.Line() = *m_baseLine; recoverLine.Line() = *m_baseLine;
recoverLine.SetNet( recoverNet );
branch->Add( recoverLine, false ); branch->Add( recoverLine, false );
if( m_tuningMode == DIFF_PAIR || m_tuningMode == DIFF_PAIR_SKEW ) if( m_tuningMode == DIFF_PAIR || m_tuningMode == DIFF_PAIR_SKEW )
{ {
NETINFO_ITEM* recoverCoupledNet = GetBoard()->DpCoupledNet( recoverNet );
PNS::LINE recoverLineCoupled; PNS::LINE recoverLineCoupled;
recoverLineCoupled.SetLayer( m_layer ); recoverLineCoupled.SetLayer( m_layer );
recoverLineCoupled.SetWidth( lineWidth ); recoverLineCoupled.SetWidth( lineWidth );
recoverLineCoupled.Line() = *m_baseLineCoupled; recoverLineCoupled.Line() = *m_baseLineCoupled;
recoverLineCoupled.SetNet( recoverCoupledNet );
branch->Add( recoverLineCoupled, false ); branch->Add( recoverLineCoupled, false );
} }
} }
@ -1147,15 +1153,18 @@ bool PCB_TUNING_PATTERN::resetToBaseline( PNS::ROUTER* aRouter, int aLayer,
for( PNS::LINKED_ITEM* pnsItem : pnsLine->Links() ) for( PNS::LINKED_ITEM* pnsItem : pnsLine->Links() )
{ {
if( BOARD_ITEM* item = pnsItem->Parent() ) if( BOARD_ITEM* item = pnsItem->Parent() )
{
aFrame->GetCanvas()->GetView()->Hide( item, true, true ); aFrame->GetCanvas()->GetView()->Hide( item, true, true );
//m_removedItems.insert( item );
}
} }
branch->Remove( *pnsLine ); branch->Remove( *pnsLine );
PNS::LINE straightLine( *pnsLine, straightChain ); NETINFO_ITEM* net = GetBoard()->FindNet( m_lastNetName );
PNS::LINE straightLine( *pnsLine, straightChain );
if( aPrimary )
straightLine.SetNet( net );
else
straightLine.SetNet( GetBoard()->DpCoupledNet( net ) );
branch->Add( straightLine, false ); branch->Add( straightLine, false );
@ -1364,8 +1373,6 @@ void PCB_TUNING_PATTERN::EditRevert( GENERATOR_TOOL* aTool, BOARD* aBoard,
{ {
ClearFlags( IN_EDIT ); ClearFlags( IN_EDIT );
const std::vector<GENERATOR_PNS_CHANGES>& pnsCommits = aTool->GetRouterChanges();
for( const GENERATOR_PNS_CHANGES& pnsCommit : aTool->GetRouterChanges() ) for( const GENERATOR_PNS_CHANGES& pnsCommit : aTool->GetRouterChanges() )
{ {
for( BOARD_ITEM* item : pnsCommit.removedItems ) for( BOARD_ITEM* item : pnsCommit.removedItems )