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

design blocks: fix PADs getting copied in routing, enable by default

Browse Source
This commit is contained in:
Mike Williams 2025-09-02 13:57:55 -04:00
parent 8709f73b98
commit 202619cd43
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/advanced_config.cpp
View File

@ -262,7 +262,7 @@ ADVANCED_CFG::ADVANCED_CFG()
m_CompactSave = false;
m_UpdateUIEventInterval = 0;
m_ShowRepairSchematic = false;
m_EnablePcbDesignBlocks = false;
m_EnablePcbDesignBlocks = true;
m_EnableGenerators = false;
m_EnableLibWithText = false;
m_EnableLibDir = false;

38
pcbnew/tools/multichannel_tool.cpp
View File

@ -711,9 +711,14 @@ int MULTICHANNEL_TOOL::findRoutingInRuleArea( RULE_AREA* aRuleArea, std::set<BOA
// rather than querying the board for items that are inside the area.
if( aRuleArea->m_sourceType == PLACEMENT_SOURCE_T::DESIGN_BLOCK )
{
// Get all board connected items that are from the design bloc
// Get all board connected items that are from the design block, except pads,
// which shouldn't be copied
for( EDA_ITEM* item : aRuleArea->m_designBlockItems )
{
// Include any connected items except pads.
if( item->Type() == PCB_PAD_T )
continue;
if( BOARD_CONNECTED_ITEM* bci = dynamic_cast<BOARD_CONNECTED_ITEM*>( item ) )
aOutput.insert( bci );
}
@ -819,10 +824,29 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( RULE_AREA* aRefArea, RULE_AREA* aT
auto connectivity = board()->GetConnectivity();
aCommit->Modify( aTargetArea->m_zone );
// Only stage changes for a target Rule Area zone if it actually belongs to the board.
// In some workflows (e.g. ApplyDesignBlockLayout), the target area is a temporary zone
// and is not added to the BOARD.
bool targetZoneOnBoard = false;
aCompatData.m_affectedItems.insert( aTargetArea->m_zone );
aCompatData.m_groupableItems.insert( aTargetArea->m_zone );
if( aTargetArea->m_zone )
{
for( ZONE* z : board()->Zones() )
{
if( z == aTargetArea->m_zone )
{
targetZoneOnBoard = true;
break;
}
}
}
if( targetZoneOnBoard )
{
aCommit->Modify( aTargetArea->m_zone );
aCompatData.m_affectedItems.insert( aTargetArea->m_zone );
aCompatData.m_groupableItems.insert( aTargetArea->m_zone );
}
if( aOpts.m_copyRouting )
{
@ -849,6 +873,9 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( RULE_AREA* aRefArea, RULE_AREA* aT
for( BOARD_CONNECTED_ITEM* item : targetRouting )
{
// Never remove pads as part of routing copy.
if( item->Type() == PCB_PAD_T )
continue;
if( item->IsLocked() && !aOpts.m_includeLockedItems )
continue;
if( aOpts.m_connectedRoutingOnly && !targc.contains( item->GetNetCode() ) )
@ -866,6 +893,9 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( RULE_AREA* aRefArea, RULE_AREA* aT
for( BOARD_CONNECTED_ITEM* item : refRouting )
{
// Never copy pads as part of routing copy.
if( item->Type() == PCB_PAD_T )
continue;
if( item->IsLocked() && !aOpts.m_includeLockedItems )
continue;
if( aOpts.m_connectedRoutingOnly && !refc.contains( item->GetNetCode() ) )

2
pcbnew/tools/pcb_control.cpp
View File

@ -1477,7 +1477,6 @@ int PCB_CONTROL::ApplyDesignBlockLayout( const TOOL_EVENT& aEvent )
dbRA.m_zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
dbRA.m_zone->AddPolygon( generateBoundingBox( dbRA.m_designBlockItems ) );
dbRA.m_center = dbRA.m_zone->Outline()->COutline( 0 ).Centre();
tempCommit.Add( dbRA.m_zone );
// Create the destination rule area for the group
RULE_AREA destRA;
@ -1520,7 +1519,6 @@ int PCB_CONTROL::ApplyDesignBlockLayout( const TOOL_EVENT& aEvent )
destRA.m_zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
destRA.m_zone->AddPolygon( generateBoundingBox( group->GetItems() ) );
destRA.m_center = destRA.m_zone->Outline()->COutline( 0 ).Centre();
tempCommit.Add( dbRA.m_zone );
// Use the multichannel tool to repeat the layout
MULTICHANNEL_TOOL* mct = m_toolMgr->GetTool<MULTICHANNEL_TOOL>();