electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multichannel tool: rename ZONE* from m_area to m_zone for clarity

Browse Source
This commit is contained in:
Mike Williams
2025-08-20 15:20:13 -04:00
parent 5da6e482ed
commit fbb9b296e3
4 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/dialogs/dialog_multichannel_repeat_layout.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ DIALOG_MULTICHANNEL_REPEAT_LAYOUT::DIALOG_MULTICHANNEL_REPEAT_LAYOUT (
{
m_board = aFrame->GetBoard();
auto data = m_parentTool->GetData();
m_refRAName->SetLabelText( data->m_refRA->m_area->GetZoneName() );
m_refRAName->SetLabelText( data->m_refRA->m_zone->GetZoneName() );
for( auto& ra : data->m_compatMap )
{
pcbnew/tools/multichannel_tool.cpp
+43 -41
View File
@@ -384,7 +384,7 @@ void MULTICHANNEL_TOOL::FindExistingRuleAreas()
RULE_AREA area;
area.m_existsAlready = true;
area.m_area = zone;
area.m_zone = zone;
identifyComponentsInRuleArea( zone, area.m_components );
@@ -500,7 +500,7 @@ int MULTICHANNEL_TOOL::CheckRACompatibility( ZONE *aRefZone )
for( RULE_AREA& ra : m_areas.m_areas )
{
if( ra.m_area == aRefZone )
if( ra.m_zone == aRefZone )
{
m_areas.m_refRA = &ra;
break;
@@ -514,7 +514,7 @@ int MULTICHANNEL_TOOL::CheckRACompatibility( ZONE *aRefZone )
for( RULE_AREA& ra : m_areas.m_areas )
{
if( ra.m_area == m_areas.m_refRA->m_area )
if( ra.m_zone == m_areas.m_refRA->m_zone )
continue;
m_areas.m_compatMap[&ra] = RULE_AREA_COMPAT_DATA();
@@ -546,7 +546,7 @@ int MULTICHANNEL_TOOL::RepeatLayout( const TOOL_EVENT& aEvent, RULE_AREA& aRefAr
compat.m_affectedItems, compat.m_groupableItems ) )
{
auto errMsg = wxString::Format( _( "Copy Rule Area contents failed between rule areas '%s' and '%s'." ),
m_areas.m_refRA->m_area->GetZoneName(), aTargetArea.m_area->GetZoneName() );
m_areas.m_refRA->m_zone->GetZoneName(), aTargetArea.m_zone->GetZoneName() );
commit.Revert();
@@ -585,9 +585,10 @@ int MULTICHANNEL_TOOL::RepeatLayout( const TOOL_EVENT& aEvent, ZONE* aRefZone )
m_areas.m_options, targetArea.second.m_affectedItems,
targetArea.second.m_groupableItems ) )
{
auto errMsg = wxString::Format( _( "Copy Rule Area contents failed between rule areas '%s' and '%s'." ),
m_areas.m_refRA->m_area->GetZoneName(),
targetArea.first->m_area->GetZoneName() );
auto errMsg = wxString::Format(
_( "Copy Rule Area contents failed between rule areas '%s' and '%s'." ),
m_areas.m_refRA->m_zone->GetZoneName(),
targetArea.first->m_zone->GetZoneName() );
commit.Revert();
@@ -677,13 +678,13 @@ int MULTICHANNEL_TOOL::findRouting( std::set<BOARD_CONNECTED_ITEM*>&
bool restoreBlankName = false;
if( aRA->m_area->GetZoneName().IsEmpty() )
if( aRA->m_zone->GetZoneName().IsEmpty() )
{
restoreBlankName = true;
aRA->m_area->SetZoneName( aRA->m_area->m_Uuid.AsString() );
aRA->m_zone->SetZoneName( aRA->m_zone->m_Uuid.AsString() );
}
wxString ruleText = wxString::Format( wxT( "A.enclosedByArea('%s')" ), aRA->m_area->GetZoneName() );
wxString ruleText = wxString::Format( wxT( "A.enclosedByArea('%s')" ), aRA->m_zone->GetZoneName() );
auto testAndAdd =
[&]( BOARD_CONNECTED_ITEM* aItem )
@@ -708,7 +709,7 @@ int MULTICHANNEL_TOOL::findRouting( std::set<BOARD_CONNECTED_ITEM*>&
}
if( restoreBlankName )
aRA->m_area->SetZoneName( wxEmptyString );
aRA->m_zone->SetZoneName( wxEmptyString );
return count;
}
@@ -720,8 +721,8 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
std::unordered_set<BOARD_ITEM*>& aGroupableItems )
{
// copy RA shapes first
SHAPE_LINE_CHAIN refOutline = aRefArea->m_area->Outline()->COutline( 0 );
SHAPE_LINE_CHAIN targetOutline = aTargetArea->m_area->Outline()->COutline( 0 );
SHAPE_LINE_CHAIN refOutline = aRefArea->m_zone->Outline()->COutline( 0 );
SHAPE_LINE_CHAIN targetOutline = aTargetArea->m_zone->Outline()->COutline( 0 );
FOOTPRINT* targetAnchorFp = nullptr;
VECTOR2I disp = aTargetArea->m_center - aRefArea->m_center;
@@ -761,10 +762,10 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
auto connectivity = board()->GetConnectivity();
aCommit->Modify( aTargetArea->m_area );
aCommit->Modify( aTargetArea->m_zone );
aAffectedItems.insert( aTargetArea->m_area );
aGroupableItems.insert( aTargetArea->m_area );
aAffectedItems.insert( aTargetArea->m_zone );
aGroupableItems.insert( aTargetArea->m_zone );
if( aOpts.m_copyRouting )
{
@@ -798,7 +799,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
if( aCommit->GetStatus( item ) != 0 )
continue;
if( aTargetArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( aTargetArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
{
aAffectedItems.insert( item );
aCommit->Remove( item );
@@ -811,10 +812,10 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
continue;
if( aOpts.m_connectedRoutingOnly && !refc.contains( item->GetNetCode() ) )
continue;
if( !aRefArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( !aRefArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
continue;
if( !aTargetArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( !aTargetArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
continue;
BOARD_CONNECTED_ITEM* copied = static_cast<BOARD_CONNECTED_ITEM*>( item->Clone() );
@@ -835,8 +836,8 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
std::set<BOARD_ITEM*> sourceItems;
std::set<BOARD_ITEM*> targetItems;
findOtherItemsInRuleArea( aRefArea->m_area, sourceItems );
findOtherItemsInRuleArea( aTargetArea->m_area, targetItems );
findOtherItemsInRuleArea( aRefArea->m_zone, sourceItems );
findOtherItemsInRuleArea( aTargetArea->m_zone, targetItems );
for( BOARD_ITEM* item : targetItems )
{
@@ -852,7 +853,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
if( item->Type() != PCB_ZONE_T )
{
if( aTargetArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( aTargetArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
{
aAffectedItems.insert( item );
aCommit->Remove( item );
@@ -868,7 +869,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
for( const PCB_LAYER_ID& layer : zoneLayers )
{
if( !aTargetArea->m_area->GetLayerSet().Contains( layer ) )
if( !aTargetArea->m_zone->GetLayerSet().Contains( layer ) )
layerMismatch = true;
}
@@ -892,10 +893,9 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
if( item->Type() != PCB_ZONE_T )
{
if( !aRefArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( !aRefArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
continue;
if( !aTargetArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
if( !aTargetArea->m_zone->GetLayerSet().Contains( item->GetLayer() ) )
continue;
if( item->Type() == PCB_GROUP_T )
@@ -913,8 +913,8 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
for( const PCB_LAYER_ID& layer : zoneLayers )
{
if( !aRefArea->m_area->GetLayerSet().Contains( layer )
|| !aTargetArea->m_area->GetLayerSet().Contains( layer ) )
if( !aRefArea->m_zone->GetLayerSet().Contains( layer )
|| !aTargetArea->m_zone->GetLayerSet().Contains( layer ) )
{
layerMismatch = true;
}
@@ -949,13 +949,13 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
FOOTPRINT* refFP = fpPair.first;
FOOTPRINT* targetFP = fpPair.second;
if( !aRefArea->m_area->GetLayerSet().Contains( refFP->GetLayer() ) )
if( !aRefArea->m_zone->GetLayerSet().Contains( refFP->GetLayer() ) )
{
wxLogTrace( traceMultichannelTool, wxT( "discard ref:%s (ref layer)\n" ),
refFP->GetReference() );
continue;
}
if( !aTargetArea->m_area->GetLayerSet().Contains( refFP->GetLayer() ) )
if( !aTargetArea->m_zone->GetLayerSet().Contains( refFP->GetLayer() ) )
{
wxLogTrace( traceMultichannelTool, wxT( "discard ref:%s (target layer)\n" ),
refFP->GetReference() );
@@ -996,10 +996,10 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
}
}
aTargetArea->m_area->RemoveAllContours();
aTargetArea->m_area->AddPolygon( newTargetOutline );
aTargetArea->m_area->UnHatchBorder();
aTargetArea->m_area->HatchBorder();
aTargetArea->m_zone->RemoveAllContours();
aTargetArea->m_zone->AddPolygon( newTargetOutline );
aTargetArea->m_zone->UnHatchBorder();
aTargetArea->m_zone->HatchBorder();
return true;
}
@@ -1173,7 +1173,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
ra.m_groupName, zone->GetZoneName() );
}
ra.m_oldArea = zone;
ra.m_oldZone = zone;
ra.m_existsAlready = true;
}
}
@@ -1238,10 +1238,12 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
newZone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
if( ra.m_existsAlready )
commit.Remove( ra.m_oldArea );
{
commit.Remove( ra.m_oldZone );
}
ra.m_area = newZone.release();
commit.Add( ra.m_area );
ra.m_zone = newZone.release();
commit.Add( ra.m_zone );
}
// fixme: handle corner cases where the items belonging to a Rule Area already
@@ -1262,7 +1264,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
std::copy( ra.m_components.begin(), ra.m_components.end(), std::inserter( toPrune, toPrune.begin() ) );
if( ra.m_existsAlready )
toPrune.insert( ra.m_area );
toPrune.insert( ra.m_zone );
pruneExistingGroups( commit, toPrune );
@@ -1270,8 +1272,8 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
commit.Add( group );
commit.Modify( ra.m_area );
group->AddItem( ra.m_area );
commit.Modify( ra.m_zone );
group->AddItem( ra.m_zone );
for( FOOTPRINT* fp : ra.m_components )
{
pcbnew/tools/multichannel_tool.h
+2 -2
View File
@@ -64,8 +64,8 @@ struct RULE_AREA_COMPAT_DATA
struct RULE_AREA
{
PLACEMENT_SOURCE_T m_sourceType = PLACEMENT_SOURCE_T::SHEETNAME;
ZONE* m_oldArea = nullptr;
ZONE* m_area = nullptr;
ZONE* m_oldZone = nullptr;
ZONE* m_zone = nullptr;
std::set<FOOTPRINT*> m_components;
bool m_existsAlready = false;
bool m_generateEnabled = false;
pcbnew/tools/pcb_control.cpp
+33 -33
View File
@@ -1472,22 +1472,22 @@ int PCB_CONTROL::ApplyDesignBlockLayout( const TOOL_EVENT& aEvent )
},
nullptr, GENERAL_COLLECTOR::AllBoardItems );
dbRA.m_area = new ZONE( board() );
dbRA.m_zone = new ZONE( board() );
//dbRA.m_area->SetZoneName( wxString::Format( wxT( "design-block-source-%s" ), group->GetDesignBlockLibId().GetUniStringLibId() ) );
dbRA.m_area->SetIsRuleArea( true );
dbRA.m_area->SetLayerSet( LSET::AllCuMask() );
dbRA.m_area->SetPlacementAreaEnabled( true );
dbRA.m_area->SetDoNotAllowZoneFills( false );
dbRA.m_area->SetDoNotAllowVias( false );
dbRA.m_area->SetDoNotAllowTracks( false );
dbRA.m_area->SetDoNotAllowPads( false );
dbRA.m_area->SetDoNotAllowFootprints( false );
dbRA.m_area->SetPlacementAreaSourceType( PLACEMENT_SOURCE_T::GROUP_PLACEMENT );
dbRA.m_area->SetPlacementAreaSource( group->GetDesignBlockLibId().GetUniStringLibId() );
dbRA.m_area->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
dbRA.m_area->AddPolygon( generateBoundingBox( allDbItems ) );
dbRA.m_center = dbRA.m_area->Outline()->COutline( 0 ).Centre();
tempCommit.Add( dbRA.m_area );
dbRA.m_zone->SetIsRuleArea( true );
dbRA.m_zone->SetLayerSet( LSET::AllCuMask() );
dbRA.m_zone->SetPlacementAreaEnabled( true );
dbRA.m_zone->SetDoNotAllowZoneFills( false );
dbRA.m_zone->SetDoNotAllowVias( false );
dbRA.m_zone->SetDoNotAllowTracks( false );
dbRA.m_zone->SetDoNotAllowPads( false );
dbRA.m_zone->SetDoNotAllowFootprints( false );
dbRA.m_zone->SetPlacementAreaSourceType( PLACEMENT_SOURCE_T::GROUP_PLACEMENT );
dbRA.m_zone->SetPlacementAreaSource( group->GetDesignBlockLibId().GetUniStringLibId() );
dbRA.m_zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
dbRA.m_zone->AddPolygon( generateBoundingBox( allDbItems ) );
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;
@@ -1514,23 +1514,23 @@ int PCB_CONTROL::ApplyDesignBlockLayout( const TOOL_EVENT& aEvent )
}
}
destRA.m_area = new ZONE( board() );
destRA.m_area->SetZoneName(
destRA.m_zone = new ZONE( board() );
destRA.m_zone->SetZoneName(
wxString::Format( wxT( "design-block-dest-%s" ), group->GetDesignBlockLibId().GetUniStringLibId() ) );
destRA.m_area->SetIsRuleArea( true );
destRA.m_area->SetLayerSet( LSET::AllCuMask() );
destRA.m_area->SetPlacementAreaEnabled( true );
destRA.m_area->SetDoNotAllowZoneFills( false );
destRA.m_area->SetDoNotAllowVias( false );
destRA.m_area->SetDoNotAllowTracks( false );
destRA.m_area->SetDoNotAllowPads( false );
destRA.m_area->SetDoNotAllowFootprints( false );
destRA.m_area->SetPlacementAreaSourceType( PLACEMENT_SOURCE_T::GROUP_PLACEMENT );
destRA.m_area->SetPlacementAreaSource( group->GetName() );
destRA.m_area->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
destRA.m_area->AddPolygon( generateBoundingBox( group->GetItems() ) );
destRA.m_center = destRA.m_area->Outline()->COutline( 0 ).Centre();
tempCommit.Add( dbRA.m_area );
destRA.m_zone->SetIsRuleArea( true );
destRA.m_zone->SetLayerSet( LSET::AllCuMask() );
destRA.m_zone->SetPlacementAreaEnabled( true );
destRA.m_zone->SetDoNotAllowZoneFills( false );
destRA.m_zone->SetDoNotAllowVias( false );
destRA.m_zone->SetDoNotAllowTracks( false );
destRA.m_zone->SetDoNotAllowPads( false );
destRA.m_zone->SetDoNotAllowFootprints( false );
destRA.m_zone->SetPlacementAreaSourceType( PLACEMENT_SOURCE_T::GROUP_PLACEMENT );
destRA.m_zone->SetPlacementAreaSource( group->GetName() );
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>();
@@ -1540,8 +1540,8 @@ int PCB_CONTROL::ApplyDesignBlockLayout( const TOOL_EVENT& aEvent )
// Get rid of the temporary design blocks and rule areas
tempCommit.Revert();
delete dbRA.m_area;
delete destRA.m_area;
delete dbRA.m_zone;
delete destRA.m_zone;
}
// We're done, remove SKIP_STRUCT