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

Don't modify dp-tuning when doing skew tuning. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15901
This commit is contained in:
Jeff Young 2023-10-22 17:06:15 +01:00
parent 09e92fc3fc
commit 5da35d7750
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/generators/pcb_tuning_pattern.cpp
View File

@ -679,7 +679,7 @@ static std::optional<PNS::LINE> getPNSLine( const VECTOR2I& aStart, const VECTOR
if( !startItem || !endItem ) if( !startItem || !endItem )
return std::nullopt; return std::nullopt;
PNS::LINE line = world->AssembleLine( startItem, nullptr, false, true ); PNS::LINE line = world->AssembleLine( startItem );
SHAPE_LINE_CHAIN oldChain = line.CLine(); SHAPE_LINE_CHAIN oldChain = line.CLine();
wxCHECK( line.ContainsLink( endItem ), std::nullopt ); wxCHECK( line.ContainsLink( endItem ), std::nullopt );
@ -711,7 +711,7 @@ bool PCB_TUNING_PATTERN::initBaseLine( PNS::ROUTER* aRouter, int aLayer, BOARD*
if( !startItem || !endItem || startSnapPoint == endSnapPoint ) if( !startItem || !endItem || startSnapPoint == endSnapPoint )
return false; return false;
PNS::LINE line = world->AssembleLine( startItem, nullptr, false, true ); PNS::LINE line = world->AssembleLine( startItem );
const SHAPE_LINE_CHAIN& chain = line.CLine(); const SHAPE_LINE_CHAIN& chain = line.CLine();
wxASSERT( line.ContainsLink( endItem ) ); wxASSERT( line.ContainsLink( endItem ) );
@ -1034,6 +1034,7 @@ void PCB_TUNING_PATTERN::EditPush( GENERATOR_TOOL* aTool, BOARD* aBoard,
PNS::ROUTER* router = aTool->Router(); PNS::ROUTER* router = aTool->Router();
SHAPE_LINE_CHAIN bounds = getRectShape(); SHAPE_LINE_CHAIN bounds = getRectShape();
PICKED_ITEMS_LIST groupUndoList; PICKED_ITEMS_LIST groupUndoList;
int epsilon = aBoard->GetDesignSettings().GetDRCEpsilon();
if( router->RoutingInProgress() ) if( router->RoutingInProgress() )
{ {
@ -1060,8 +1061,8 @@ void PCB_TUNING_PATTERN::EditPush( GENERATOR_TOOL* aTool, BOARD* aBoard,
{ {
PCB_TRACK* track = dynamic_cast<PCB_TRACK*>( item ); PCB_TRACK* track = dynamic_cast<PCB_TRACK*>( item );
if( track && bounds.PointInside( track->GetPosition(), 2 ) if( track && bounds.PointInside( track->GetPosition(), epsilon )
&& bounds.PointInside( track->GetEnd(), 2 ) ) && bounds.PointInside( track->GetEnd(), epsilon ) )
{ {
AddItem( item ); AddItem( item );
groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::REGROUP ) ); groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::REGROUP ) );

3
pcbnew/router/pns_joint.h
View File

@ -105,6 +105,9 @@ public:
LINKED_ITEM* seg1 = static_cast<LINKED_ITEM*>( m_linkedItems[0] ); LINKED_ITEM* seg1 = static_cast<LINKED_ITEM*>( m_linkedItems[0] );
LINKED_ITEM* seg2 = static_cast<LINKED_ITEM*>( m_linkedItems[1] ); LINKED_ITEM* seg2 = static_cast<LINKED_ITEM*>( m_linkedItems[1] );
if( !aAllowLockedSegs && ( seg1->IsLocked() || seg2->IsLocked() ) )
return false;
// joints between segments of different widths are not considered trivial. // joints between segments of different widths are not considered trivial.
return seg1->Width() == seg2->Width(); return seg1->Width() == seg2->Width();
} }