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

Fix a collision name in a windows header (GROUP). Windows specific.

Browse Source 
Changed to GROUP_PLACEMENT (No actual code change)
This commit is contained in:
jean-pierre charras 2025-05-08 11:15:55 +02:00
parent 71417fbe3b
commit 4de6be8124
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/api/api_pcb_enums.cpp
View File

@ -396,7 +396,7 @@ types::PlacementRuleSourceType ToProtoEnum( RULE_AREA_PLACEMENT_SOURCE_TYPE aVal
case RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS: case RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS:
return types::PlacementRuleSourceType::PRST_COMPONENT_CLASS; return types::PlacementRuleSourceType::PRST_COMPONENT_CLASS;
case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP: case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT:
return types::PlacementRuleSourceType::PRST_GROUP; return types::PlacementRuleSourceType::PRST_GROUP;
default: default:
@ -419,7 +419,7 @@ RULE_AREA_PLACEMENT_SOURCE_TYPE FromProtoEnum( types::PlacementRuleSourceType aV
return RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS; return RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS;
case types::PlacementRuleSourceType::PRST_GROUP: case types::PlacementRuleSourceType::PRST_GROUP:
return RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP; return RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT;
default: default:
wxCHECK_MSG( false, RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME, wxCHECK_MSG( false, RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME,

2
pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp
View File

@ -126,7 +126,7 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS
sheetRowIdx++; sheetRowIdx++;
else if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS ) else if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS )
componentClassRowIdx++; componentClassRowIdx++;
else if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP ) else if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT )
groupIdx++; groupIdx++;
} }

8
pcbnew/dialogs/dialog_rule_area_properties.cpp
View File

@ -227,7 +227,7 @@ void DIALOG_RULE_AREA_PROPERTIES::OnComponentClassClicked( wxCommandEvent& event
void DIALOG_RULE_AREA_PROPERTIES::OnGroupClicked( wxCommandEvent& event ) void DIALOG_RULE_AREA_PROPERTIES::OnGroupClicked( wxCommandEvent& event )
{ {
m_lastPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP; m_lastPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT;
} }
@ -344,8 +344,8 @@ bool DIALOG_RULE_AREA_PROPERTIES::TransferDataToWindow()
m_placementProperties->m_GroupRb->SetValue( true ); m_placementProperties->m_GroupRb->SetValue( true );
setupCurrentSourceSelection( m_placementProperties->m_groupCombo ); setupCurrentSourceSelection( m_placementProperties->m_groupCombo );
m_originalPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP; m_originalPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT;
m_lastPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP; m_lastPlacementSourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT;
} }
// Handle most-useful notebook page selection // Handle most-useful notebook page selection
@ -475,7 +475,7 @@ bool DIALOG_RULE_AREA_PROPERTIES::TransferDataFromWindow()
else if( m_placementProperties->m_GroupRb->GetValue() ) else if( m_placementProperties->m_GroupRb->GetValue() )
{ {
m_zonesettings.SetRuleAreaPlacementEnabled( true ); m_zonesettings.SetRuleAreaPlacementEnabled( true );
setPlacementSource( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP ); setPlacementSource( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT );
} }
else else
{ {

2
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp
View File

@ -2627,7 +2627,7 @@ void PCB_IO_KICAD_SEXPR::format( const ZONE* aZone ) const
m_out->Print( "(component_class %s)", m_out->Print( "(component_class %s)",
m_out->Quotew( aZone->GetRuleAreaPlacementSource() ).c_str() ); m_out->Quotew( aZone->GetRuleAreaPlacementSource() ).c_str() );
break; break;
case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP: case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT:
m_out->Print( "(group %s)", m_out->Print( "(group %s)",
m_out->Quotew( aZone->GetRuleAreaPlacementSource() ).c_str() ); m_out->Quotew( aZone->GetRuleAreaPlacementSource() ).c_str() );
break; break;

2
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
View File

@ -7197,7 +7197,7 @@ ZONE* PCB_IO_KICAD_SEXPR_PARSER::parseZONE( BOARD_ITEM_CONTAINER* aParent )
} }
case T_group: case T_group:
{ {
zone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP ); zone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT );
NeedSYMBOL(); NeedSYMBOL();
zone->SetRuleAreaPlacementSource( FromUTF8() ); zone->SetRuleAreaPlacementSource( FromUTF8() );
break; break;

6
pcbnew/tools/multichannel_tool.cpp
View File

@ -107,7 +107,7 @@ bool MULTICHANNEL_TOOL::identifyComponentsInRuleArea( ZONE* aRul
ruleText = wxT( "A.hasComponentClass('" ) + aRuleArea->GetRuleAreaPlacementSource() ruleText = wxT( "A.hasComponentClass('" ) + aRuleArea->GetRuleAreaPlacementSource()
+ wxT( "')" ); + wxT( "')" );
break; break;
case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP: case RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT:
ruleText = wxT( "A.memberOfGroup('" ) + aRuleArea->GetRuleAreaPlacementSource() + wxT( "')" ); ruleText = wxT( "A.memberOfGroup('" ) + aRuleArea->GetRuleAreaPlacementSource() + wxT( "')" );
break; break;
} }
@ -357,7 +357,7 @@ void MULTICHANNEL_TOOL::QuerySheetsAndComponentClasses()
{ {
RULE_AREA ent; RULE_AREA ent;
ent.m_sourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP; ent.m_sourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT;
ent.m_generateEnabled = false; ent.m_generateEnabled = false;
ent.m_groupName = groupName; ent.m_groupName = groupName;
ent.m_components = queryComponentsInGroup( ent.m_groupName ); ent.m_components = queryComponentsInGroup( ent.m_groupName );
@ -1218,7 +1218,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
} }
else else
{ {
newZone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP ); newZone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT );
newZone->SetRuleAreaPlacementSource( ra.m_groupName ); newZone->SetRuleAreaPlacementSource( ra.m_groupName );
} }

2
pcbnew/zone.cpp
View File

@ -1857,7 +1857,7 @@ static struct ZONE_DESC
rapstMap.Undefined( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME ); rapstMap.Undefined( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME );
rapstMap.Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME, _HKI( "Sheet Name" ) ) rapstMap.Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME, _HKI( "Sheet Name" ) )
.Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS, _HKI( "Component Class" ) ) .Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS, _HKI( "Component Class" ) )
.Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP, _HKI( "Group" ) ); .Map( RULE_AREA_PLACEMENT_SOURCE_TYPE::GROUP_PLACEMENT, _HKI( "Group" ) );
} }
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();

2
pcbnew/zone_settings.h
View File

@ -75,7 +75,7 @@ enum class RULE_AREA_PLACEMENT_SOURCE_TYPE
{ {
SHEETNAME = 0, SHEETNAME = 0,
COMPONENT_CLASS, COMPONENT_CLASS,
GROUP GROUP_PLACEMENT
}; };
/** /**