realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

multi-channel tool: copy only routing fully within rule area

Browse Source 
Tracks segments of arbitrary lenght were replicated as long as some
part was inside the reference rule are. Now only track segments fully
within the rule area are replicated. This improves performance,
consistency (e.g. only zone fills fully within rule area are copied) and
usablity. Regarding the usability: if a channel is replicated and then
connected to something else these wires were often messed up if another
replication (some internal update) was necessary. Now the chance that
external connections going into the rule area survive an replication is higher.
This commit is contained in:
Alexander Boehm 2025-04-27 07:39:09 +02:00 committed by eurofun1
parent 56bd7e4427
commit 6e06125719
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pcbnew/tools/multichannel_tool.cpp
View File

@ -615,44 +615,17 @@ wxString MULTICHANNEL_TOOL::stripComponentIndex( const wxString& aRef ) const
}
int MULTICHANNEL_TOOL::findRoutedConnections( std::set<BOARD_ITEM*>& aOutput,
int MULTICHANNEL_TOOL::findRouting( std::set<BOARD_ITEM*>& aOutput,
std::shared_ptr<CONNECTIVITY_DATA> aConnectivity,
const SHAPE_POLY_SET& aRAPoly,
RULE_AREA* aRA,
FOOTPRINT* aFp,
const REPEAT_LAYOUT_OPTIONS& aOpts ) const
{
std::set<BOARD_ITEM*> conns;
for( PAD* pad : aFp->Pads() )
{
auto connectedItems = aConnectivity->GetConnectedItems( pad, EXCLUDE_ZONES | IGNORE_NETS );
for( BOARD_CONNECTED_ITEM* item : connectedItems )
conns.insert( item );
}
int count = 0;
for( BOARD_ITEM* item : conns )
{
// fixme: respect layer sets assigned to each RA
if( item->Type() == PCB_PAD_T )
continue;
std::shared_ptr<SHAPE> effShape = item->GetEffectiveShape( item->GetLayer() );
if( effShape->Collide( &aRAPoly, 0 ) )
{
aOutput.insert( item );
count++;
}
}
// The user also will consider tracks and vias that are inside the source area but
// not connected to any of the source pads to count as "routing" (e.g. stitching vias)
int count = 0;
PCBEXPR_COMPILER compiler( new PCBEXPR_UNIT_RESOLVER );
PCBEXPR_UCODE ucode;
PCBEXPR_CONTEXT ctx, preflightCtx;
@ -718,7 +691,6 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
FOOTPRINT* targetAnchorFp = nullptr;
VECTOR2I disp = aTargetArea->m_center - aRefArea->m_center;
EDA_ANGLE rot = EDA_ANGLE( 0 );
if( aOpts.m_anchorFp )
{
for( auto& fpPair : aMatches )
@ -765,21 +737,13 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
wxLogTrace( traceMultichannelTool, wxT("copying routing: %d fps\n"), (int) aMatches.size() );
for( auto& fpPair : aMatches )
{
findRoutedConnections( targetRouting, connectivity, targetPoly, aTargetArea,
fpPair.second, aOpts );
findRoutedConnections( refRouting, connectivity, refPoly, aRefArea, fpPair.first,
aOpts );
wxLogTrace( traceMultichannelTool, wxT("target-routes %d\n"), (int) targetRouting.size() );
}
findRouting( targetRouting, connectivity, targetPoly, aTargetArea, aOpts );
findRouting( refRouting, connectivity, refPoly, aRefArea, aOpts );
for( BOARD_ITEM* item : targetRouting )
{
if( item->IsLocked() && !aOpts.m_includeLockedItems )
continue;
// item already removed
if( aCommit->GetStatus( item ) != 0 )
continue;

5
pcbnew/tools/multichannel_tool.h
View File

@ -145,9 +145,8 @@ private:
bool copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatches, BOARD_COMMIT* aCommit, RULE_AREA* aRefArea,
RULE_AREA* aTargetArea, REPEAT_LAYOUT_OPTIONS aOpts, std::unordered_set<BOARD_ITEM*>& aAffectedItems,
std::unordered_set<BOARD_ITEM*>& aGroupableItems );
int findRoutedConnections( std::set<BOARD_ITEM*>& aOutput,
std::shared_ptr<CONNECTIVITY_DATA> aConnectivity,
const SHAPE_POLY_SET& aRAPoly, RULE_AREA* aRA, FOOTPRINT* aFp,
int findRouting( std::set<BOARD_ITEM*>& aOutput, std::shared_ptr<CONNECTIVITY_DATA> aConnectivity,
const SHAPE_POLY_SET& aRAPoly, RULE_AREA* aRA,
const REPEAT_LAYOUT_OPTIONS& aOpts ) const;
void fixupNet( BOARD_CONNECTED_ITEM* aRef, BOARD_CONNECTED_ITEM* aTarget,
TMATCH::COMPONENT_MATCHES& aComponentMatches );