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

Prefer const &.

Browse Source
This commit is contained in:
Jeff Young 2025-08-30 12:12:43 +01:00
parent 6592c75345
commit 6f59821930
3 changed files with 51 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
eeschema/connection_graph.cpp
View File

@ -1743,8 +1743,7 @@ void CONNECTION_GRAPH::generateBusAliasMembers()
subgraph->StoreImplicitConnection( new_conn ); subgraph->StoreImplicitConnection( new_conn );
int code = assignNewNetCode( *new_conn ); int code = assignNewNetCode( *new_conn );
wxLogTrace( ConnTrace, wxS( "SG(%ld), Adding full local name (%s) with sg (%d) " wxLogTrace( ConnTrace, wxS( "SG(%ld), Adding full local name (%s) with sg (%d) on subsheet %s" ),
"on subsheet %s" ),
subgraph->m_code, name, code, subgraph->m_sheet.PathHumanReadable() ); subgraph->m_code, name, code, subgraph->m_sheet.PathHumanReadable() );
new_sg->m_driver_connection = new_conn; new_sg->m_driver_connection = new_conn;
@ -1777,13 +1776,10 @@ void CONNECTION_GRAPH::generateGlobalPowerPinSubGraphs()
std::unordered_map<int, CONNECTION_SUBGRAPH*> global_power_pin_subgraphs; std::unordered_map<int, CONNECTION_SUBGRAPH*> global_power_pin_subgraphs;
for( const auto& it : m_global_power_pins ) for( const auto& [sheet, pin] : m_global_power_pins )
{ {
SCH_SHEET_PATH sheet = it.first;
SCH_PIN* pin = it.second;
if( !pin->ConnectedItems( sheet ).empty() if( !pin->ConnectedItems( sheet ).empty()
&& !pin->GetLibPin()->GetParentSymbol()->IsGlobalPower() ) && !pin->GetLibPin()->GetParentSymbol()->IsGlobalPower() )
{ {
// ERC will warn about this: user has wired up an invisible pin // ERC will warn about this: user has wired up an invisible pin
continue; continue;
@ -1918,8 +1914,7 @@ void CONNECTION_GRAPH::processSubGraphs()
while( m_net_name_to_subgraphs_map.contains( new_name ) ) while( m_net_name_to_subgraphs_map.contains( new_name ) )
new_name = create_new_name( connection ); new_name = create_new_name( connection );
wxLogTrace( ConnTrace, wxLogTrace( ConnTrace, wxS( "%ld (%s) is weakly driven and not unique. Changing to %s." ),
wxS( "%ld (%s) is weakly driven and not unique. Changing to %s." ),
subgraph->m_code, name, new_name ); subgraph->m_code, name, new_name );
std::erase( *vec, subgraph ); std::erase( *vec, subgraph );
@ -1959,21 +1954,16 @@ void CONNECTION_GRAPH::processSubGraphs()
if( conflict ) if( conflict )
{ {
wxLogTrace( ConnTrace, wxLogTrace( ConnTrace, wxS( "%ld (%s) skipped for promotion due to potential conflict" ),
wxS( "%ld (%s) skipped for promotion due to potential "
"conflict" ),
subgraph->m_code, name ); subgraph->m_code, name );
} }
else else
{ {
UNITS_PROVIDER unitsProvider( schIUScale, EDA_UNITS::MM ); UNITS_PROVIDER unitsProvider( schIUScale, EDA_UNITS::MM );
wxLogTrace( ConnTrace, wxLogTrace( ConnTrace, wxS( "%ld (%s) weakly driven by unique sheet pin %s, promoting" ),
wxS( "%ld (%s) weakly driven by unique sheet pin %s, "
"promoting" ),
subgraph->m_code, name, subgraph->m_code, name,
subgraph->m_driver->GetItemDescription( &unitsProvider, subgraph->m_driver->GetItemDescription( &unitsProvider, true ) );
true ) );
subgraph->m_strong_driver = true; subgraph->m_strong_driver = true;
} }
@ -2059,8 +2049,7 @@ void CONNECTION_GRAPH::processSubGraphs()
continue; continue;
connections_to_check.push_back( c ); connections_to_check.push_back( c );
wxLogTrace( ConnTrace, wxLogTrace( ConnTrace, wxS( "%lu (%s): Adding secondary driver %s" ),
wxS( "%lu (%s): Adding secondary driver %s" ),
aSubgraph->m_code, aSubgraph->m_code,
aSubgraph->m_driver_connection->Name( true ), aSubgraph->m_driver_connection->Name( true ),
c->Name( true ) ); c->Name( true ) );
@ -2187,8 +2176,8 @@ void CONNECTION_GRAPH::processSubGraphs()
else else
assignNewNetCode( *subgraph->m_driver_connection ); assignNewNetCode( *subgraph->m_driver_connection );
wxLogTrace( ConnTrace, wxS( "Re-resolving drivers for %lu (%s)" ), subgraph->m_code, wxLogTrace( ConnTrace, wxS( "Re-resolving drivers for %lu (%s)" ),
subgraph->m_driver_connection->Name() ); subgraph->m_code, subgraph->m_driver_connection->Name() );
} }
} }
@ -2285,8 +2274,8 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
if( !subgraph->m_dirty ) if( !subgraph->m_dirty )
continue; continue;
wxLogTrace( ConnTrace, wxS( "Processing %lu (%s) for propagation" ), subgraph->m_code, wxLogTrace( ConnTrace, wxS( "Processing %lu (%s) for propagation" ),
subgraph->m_driver_connection->Name() ); subgraph->m_code, subgraph->m_driver_connection->Name() );
// For subgraphs that are driven by a global (power port or label) and have more // For subgraphs that are driven by a global (power port or label) and have more
// than one global driver, we need to seek out other subgraphs driven by the // than one global driver, we need to seek out other subgraphs driven by the
@ -2397,8 +2386,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
wxString old_name = match->Name(); wxString old_name = match->Name();
wxLogTrace( ConnTrace, wxS( "Updating %lu (%s) member %s to %s" ), wxLogTrace( ConnTrace, wxS( "Updating %lu (%s) member %s to %s" ),
parent->m_code, parent->m_driver_connection->Name(), parent->m_code, parent->m_driver_connection->Name(), old_name, conn->Name() );
old_name, conn->Name() );
match->Clone( *conn ); match->Clone( *conn );
@ -2497,9 +2485,8 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
} }
std::shared_ptr<NET_SETTINGS>& netSettings = m_schematic->Project().GetProjectFile().m_NetSettings; std::shared_ptr<NET_SETTINGS>& netSettings = m_schematic->Project().GetProjectFile().m_NetSettings;
std::map<wxString, std::set<wxString>> oldAssignments = std::map<wxString, std::set<wxString>> oldAssignments = netSettings->GetNetclassLabelAssignments();
netSettings->GetNetclassLabelAssignments(); std::set<wxString> affectedNetclassNetAssignments;
std::set<wxString> affectedNetclassNetAssignments;
netSettings->ClearNetclassLabelAssignments(); netSettings->ClearNetclassLabelAssignments();
@ -2528,11 +2515,8 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
{ {
for( SCH_ITEM* item : subgraph->m_items ) for( SCH_ITEM* item : subgraph->m_items )
{ {
std::vector<std::pair<wxString, SCH_ITEM*>> netclassesWithProviders = for( const auto& [name, provider] : subgraph->GetNetclassesForDriver( item ) )
subgraph->GetNetclassesForDriver( item ); netclasses.insert( name );
for( std::pair<wxString, SCH_ITEM*>& ncPair : netclassesWithProviders )
netclasses.insert( std::move( ncPair.first ) );
} }
} }
@ -2569,19 +2553,14 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
} }
}; };
for( const std::shared_ptr<SCH_CONNECTION>& member : for( const std::shared_ptr<SCH_CONNECTION>& member : subgraph->m_driver_connection->Members() )
subgraph->m_driver_connection->Members() )
{ {
// Check if this member itself is a bus (which can be the case // Check if this member itself is a bus (which can be the case for vector buses as members
// for vector buses as members of a bus, see // of a bus, see https://gitlab.com/kicad/code/kicad/-/issues/16545
// https://gitlab.com/kicad/code/kicad/-/issues/16545
if( member->IsBus() ) if( member->IsBus() )
{ {
for( const std::shared_ptr<SCH_CONNECTION>& nestedMember : for( const std::shared_ptr<SCH_CONNECTION>& nestedMember : member->Members() )
member->Members() )
{
processBusMember( nestedMember.get() ); processBusMember( nestedMember.get() );
}
} }
else else
{ {
@ -2768,8 +2747,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
if( aParent->GetNameForDriver( label ) == candidate->GetNameForDriver( pin ) ) if( aParent->GetNameForDriver( label ) == candidate->GetNameForDriver( pin ) )
{ {
wxLogTrace( ConnTrace, wxS( "%lu: found additional parent %lu (%s)" ), wxLogTrace( ConnTrace, wxS( "%lu: found additional parent %lu (%s)" ),
aParent->m_code, candidate->m_code, aParent->m_code, candidate->m_code, candidate->m_driver_connection->Name() );
candidate->m_driver_connection->Name() );
aParent->m_hier_children.insert( candidate ); aParent->m_hier_children.insert( candidate );
search_list.push_back( candidate ); search_list.push_back( candidate );
@ -2886,8 +2864,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
} }
else if( aSubgraph->m_hier_ports.empty() && aSubgraph->m_hier_pins.empty() ) else if( aSubgraph->m_hier_ports.empty() && aSubgraph->m_hier_pins.empty() )
{ {
wxLogTrace( ConnTrace, wxLogTrace( ConnTrace, wxS( "%lu (%s) has no hier pins or ports on sheet %s; marking clean" ),
wxS( "%lu (%s) has no hier pins or ports on sheet %s; marking clean" ),
aSubgraph->m_code, conn->Name(), aSubgraph->m_sheet.PathHumanReadable() ); aSubgraph->m_code, conn->Name(), aSubgraph->m_sheet.PathHumanReadable() );
aSubgraph->m_dirty = false; aSubgraph->m_dirty = false;
return; return;
@ -2912,8 +2889,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
// Now, find the best driver for this chain of subgraphs // Now, find the best driver for this chain of subgraphs
CONNECTION_SUBGRAPH* bestDriver = aSubgraph; CONNECTION_SUBGRAPH* bestDriver = aSubgraph;
CONNECTION_SUBGRAPH::PRIORITY highest = CONNECTION_SUBGRAPH::PRIORITY highest = CONNECTION_SUBGRAPH::GetDriverPriority( aSubgraph->m_driver );
CONNECTION_SUBGRAPH::GetDriverPriority( aSubgraph->m_driver );
bool bestIsStrong = ( highest >= CONNECTION_SUBGRAPH::PRIORITY::HIER_LABEL ); bool bestIsStrong = ( highest >= CONNECTION_SUBGRAPH::PRIORITY::HIER_LABEL );
wxString bestName = aSubgraph->m_driver_connection->Name(); wxString bestName = aSubgraph->m_driver_connection->Name();
@ -2959,7 +2935,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
{ {
wxLogTrace( ConnTrace, wxS( "%lu (%s) overridden by new driver %lu (%s)" ), wxLogTrace( ConnTrace, wxS( "%lu (%s) overridden by new driver %lu (%s)" ),
aSubgraph->m_code, aSubgraph->m_driver_connection->Name(), bestDriver->m_code, aSubgraph->m_code, aSubgraph->m_driver_connection->Name(), bestDriver->m_code,
bestDriver->m_driver_connection->Name() ); bestDriver->m_driver_connection->Name() );
} }
conn = bestDriver->m_driver_connection; conn = bestDriver->m_driver_connection;
@ -2988,8 +2964,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
{ {
for( CONNECTION_SUBGRAPH* subgraph : visited ) for( CONNECTION_SUBGRAPH* subgraph : visited )
{ {
SCH_CONNECTION* member = matchBusMember( subgraph->m_driver_connection, SCH_CONNECTION* member = matchBusMember( subgraph->m_driver_connection, stale_member );
stale_member );
if( !member ) if( !member )
{ {
@ -2999,8 +2974,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
} }
wxLogTrace( ConnTrace, wxS( "Updating %lu (%s) member %s to %s" ), subgraph->m_code, wxLogTrace( ConnTrace, wxS( "Updating %lu (%s) member %s to %s" ), subgraph->m_code,
subgraph->m_driver_connection->Name(), member->LocalName(), subgraph->m_driver_connection->Name(), member->LocalName(), stale_member->Name() );
stale_member->Name() );
member->Clone( *stale_member ); member->Clone( *stale_member );
@ -3014,29 +2988,23 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM* aItem, std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM* aItem,
CONNECTION_SUBGRAPH* aSubgraph ) CONNECTION_SUBGRAPH* aSubgraph )
{ {
std::shared_ptr<SCH_CONNECTION> c = std::shared_ptr<SCH_CONNECTION>( nullptr ); std::shared_ptr<SCH_CONNECTION> c = std::shared_ptr<SCH_CONNECTION>( nullptr );
switch( aItem->Type() ) switch( aItem->Type() )
{ {
case SCH_PIN_T: case SCH_PIN_T:
{ if( static_cast<SCH_PIN*>( aItem )->IsPower() )
SCH_PIN* pin = static_cast<SCH_PIN*>( aItem );
if( pin->IsPower() )
c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet ); c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet );
break; break;
}
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
case SCH_HIER_LABEL_T: case SCH_HIER_LABEL_T:
case SCH_LABEL_T: case SCH_LABEL_T:
{
c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet ); c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet );
break; break;
}
default: default:
break; break;
@ -3105,8 +3073,7 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection
} }
void CONNECTION_GRAPH::recacheSubgraphName( CONNECTION_SUBGRAPH* aSubgraph, void CONNECTION_GRAPH::recacheSubgraphName( CONNECTION_SUBGRAPH* aSubgraph, const wxString& aOldName )
const wxString& aOldName )
{ {
auto it = m_net_name_to_subgraphs_map.find( aOldName ); auto it = m_net_name_to_subgraphs_map.find( aOldName );
@ -3159,8 +3126,7 @@ std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigrati
for( unsigned i = 1; i < labels.size(); ++i ) for( unsigned i = 1; i < labels.size(); ++i )
{ {
if( static_cast<SCH_TEXT*>( labels.at( i ) )->GetShownText( sheet, if( static_cast<SCH_TEXT*>( labels.at( i ) )->GetShownText( sheet, false ) != first )
false ) != first )
{ {
different = true; different = true;
break; break;
@ -3398,8 +3364,7 @@ bool CONNECTION_GRAPH::ercCheckMultipleDrivers( const CONNECTION_SUBGRAPH* aSubg
if( driver->Type() == SCH_GLOBAL_LABEL_T if( driver->Type() == SCH_GLOBAL_LABEL_T
|| driver->Type() == SCH_HIER_LABEL_T || driver->Type() == SCH_HIER_LABEL_T
|| driver->Type() == SCH_LABEL_T || driver->Type() == SCH_LABEL_T
|| ( driver->Type() == SCH_PIN_T || ( driver->Type() == SCH_PIN_T && static_cast<SCH_PIN*>( driver )->IsPower() ) )
&& static_cast<SCH_PIN*>( driver )->IsPower() ) )
{ {
const wxString& primaryName = aSubgraph->GetNameForDriver( aSubgraph->m_driver ); const wxString& primaryName = aSubgraph->GetNameForDriver( aSubgraph->m_driver );
const wxString& secondaryName = aSubgraph->GetNameForDriver( driver ); const wxString& secondaryName = aSubgraph->GetNameForDriver( driver );
@ -3458,8 +3423,7 @@ bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSu
case SCH_HIER_LABEL_T: case SCH_HIER_LABEL_T:
{ {
SCH_TEXT* text = static_cast<SCH_TEXT*>( item ); SCH_TEXT* text = static_cast<SCH_TEXT*>( item );
conn.ConfigureFromLabel( EscapeString( text->GetShownText( &sheet, false ), conn.ConfigureFromLabel( EscapeString( text->GetShownText( &sheet, false ), CTX_NETNAME ) );
CTX_NETNAME ) );
if( conn.IsBus() ) if( conn.IsBus() )
bus_item = ( !bus_item ) ? item : bus_item; bus_item = ( !bus_item ) ? item : bus_item;
@ -3504,19 +3468,15 @@ bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSu
{ {
case SCH_TEXT_T: case SCH_TEXT_T:
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
{
if( !label && item->Connection( &sheet )->IsBus() ) if( !label && item->Connection( &sheet )->IsBus() )
label = item; label = item;
break; break;
}
case SCH_SHEET_PIN_T: case SCH_SHEET_PIN_T:
case SCH_HIER_LABEL_T: case SCH_HIER_LABEL_T:
{
if( !port && item->Connection( &sheet )->IsBus() ) if( !port && item->Connection( &sheet )->IsBus() )
port = item; port = item;
break; break;
}
default: default:
break; break;
@ -3580,11 +3540,10 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
switch( item->Type() ) switch( item->Type() )
{ {
case SCH_BUS_WIRE_ENTRY_T: case SCH_BUS_WIRE_ENTRY_T:
{
if( !bus_entry ) if( !bus_entry )
bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( item ); bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( item );
break; break;
}
default: default:
break; break;
@ -3851,8 +3810,7 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph
// Prefer the pin is part of a real component rather than some stray power symbol // Prefer the pin is part of a real component rather than some stray power symbol
// Or else we may fail walking connected components to a power symbol pin since we // Or else we may fail walking connected components to a power symbol pin since we
// reject starting at a power symbol // reject starting at a power symbol
if( test_pin->GetType() == ELECTRICAL_PINTYPE::PT_POWER_IN if( test_pin->GetType() == ELECTRICAL_PINTYPE::PT_POWER_IN && !test_pin->IsPower() )
&& !test_pin->IsPower() )
{ {
pin = test_pin; pin = test_pin;
break; break;
@ -3945,8 +3903,7 @@ bool CONNECTION_GRAPH::ercCheckDanglingWireEndpoints( const CONNECTION_SUBGRAPH*
auto report_error = [&]( VECTOR2I& location ) auto report_error = [&]( VECTOR2I& location )
{ {
std::shared_ptr<ERC_ITEM> ercItem = std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_UNCONNECTED_WIRE_ENDPOINT );
ERC_ITEM::Create( ERCE_UNCONNECTED_WIRE_ENDPOINT );
ercItem->SetItems( line ); ercItem->SetItems( line );
ercItem->SetSheetSpecificPath( sheet ); ercItem->SetSheetSpecificPath( sheet );
@ -3970,8 +3927,7 @@ bool CONNECTION_GRAPH::ercCheckDanglingWireEndpoints( const CONNECTION_SUBGRAPH*
auto report_error = [&]( VECTOR2I& location ) auto report_error = [&]( VECTOR2I& location )
{ {
std::shared_ptr<ERC_ITEM> ercItem = std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_UNCONNECTED_WIRE_ENDPOINT );
ERC_ITEM::Create( ERCE_UNCONNECTED_WIRE_ENDPOINT );
ercItem->SetItems( entry ); ercItem->SetItems( entry );
ercItem->SetSheetSpecificPath( sheet ); ercItem->SetSheetSpecificPath( sheet );
@ -4290,9 +4246,9 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
wxCHECK2( label, continue ); wxCHECK2( label, continue );
msg.Printf( msg.Printf( _( "Hierarchical label '%s' in root sheet cannot be connected to non-existent "
_( "Hierarchical label '%s' in root sheet cannot be connected to non-existent parent sheet" ), "parent sheet" ),
label->GetShownText( &sheet, true ) ); label->GetShownText( &sheet, true ) );
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_PIN_NOT_CONNECTED ); std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_PIN_NOT_CONNECTED );
ercItem->SetItems( item ); ercItem->SetItems( item );
ercItem->SetErrorMessage( msg ); ercItem->SetErrorMessage( msg );
@ -4344,7 +4300,7 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
SCH_HIERLABEL* label = static_cast<SCH_HIERLABEL*>( subItem ); SCH_HIERLABEL* label = static_cast<SCH_HIERLABEL*>( subItem );
wxString labelText = label->GetShownText( &parentSheetPath, false ); wxString labelText = label->GetShownText( &parentSheetPath, false );
if( !pins.count( labelText ) ) if( !pins.contains( labelText ) )
labels[ labelText ] = label; labels[ labelText ] = label;
else else
matchedPins.insert( labelText ); matchedPins.insert( labelText );
@ -4354,37 +4310,35 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
for( const wxString& matched : matchedPins ) for( const wxString& matched : matchedPins )
pins.erase( matched ); pins.erase( matched );
for( const std::pair<const wxString, SCH_SHEET_PIN*>& unmatched : pins ) for( const auto& [name, pin] : pins )
{ {
msg.Printf( _( "Sheet pin %s has no matching hierarchical label inside the sheet" ), msg.Printf( _( "Sheet pin %s has no matching hierarchical label inside the sheet" ),
UnescapeString( unmatched.first ) ); UnescapeString( name ) );
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_HIERACHICAL_LABEL ); std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_HIERACHICAL_LABEL );
ercItem->SetItems( unmatched.second ); ercItem->SetItems( pin );
ercItem->SetErrorMessage( msg ); ercItem->SetErrorMessage( msg );
ercItem->SetSheetSpecificPath( sheet ); ercItem->SetSheetSpecificPath( sheet );
ercItem->SetItemsSheetPaths( sheet ); ercItem->SetItemsSheetPaths( sheet );
SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ), SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ), pin->GetPosition() );
unmatched.second->GetPosition() );
sheet.LastScreen()->Append( marker ); sheet.LastScreen()->Append( marker );
errors++; errors++;
} }
for( const std::pair<const wxString, SCH_HIERLABEL*>& unmatched : labels ) for( const auto& [name, label] : labels )
{ {
msg.Printf( _( "Hierarchical label %s has no matching sheet pin in the parent sheet" ), msg.Printf( _( "Hierarchical label %s has no matching sheet pin in the parent sheet" ),
UnescapeString( unmatched.first ) ); UnescapeString( name ) );
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_HIERACHICAL_LABEL ); std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_HIERACHICAL_LABEL );
ercItem->SetItems( unmatched.second ); ercItem->SetItems( label );
ercItem->SetErrorMessage( msg ); ercItem->SetErrorMessage( msg );
ercItem->SetSheetSpecificPath( parentSheetPath ); ercItem->SetSheetSpecificPath( parentSheetPath );
ercItem->SetItemsSheetPaths( parentSheetPath ); ercItem->SetItemsSheetPaths( parentSheetPath );
SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ), SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ), label->GetPosition() );
unmatched.second->GetPosition() );
parentSheet->GetScreen()->Append( marker ); parentSheet->GetScreen()->Append( marker );
errors++; errors++;

2
eeschema/dialogs/dialog_erc.cpp
View File

@ -432,7 +432,7 @@ void DIALOG_ERC::OnRunERCClick( wxCommandEvent& event )
else else
ercItem->SetItems( aItemA->GetSymbol() ); ercItem->SetItems( aItemA->GetSymbol() );
SCH_MARKER* marker = new SCH_MARKER( ercItem, aItemA->GetSymbol()->GetPosition() ); SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ), aItemA->GetSymbol()->GetPosition() );
aItemA->GetSheetPath().LastScreen()->Append( marker ); aItemA->GetSheetPath().LastScreen()->Append( marker );
} ); } );

4
pcbnew/board_design_settings.cpp
View File

@ -1236,9 +1236,7 @@ bool BOARD_DESIGN_SETTINGS::LoadFromFile( const wxString& aDirectory )
auto drcName = auto drcName =
[]( int aCode ) -> std::string []( int aCode ) -> std::string
{ {
std::shared_ptr<DRC_ITEM> item = DRC_ITEM::Create( aCode ); return std::string( DRC_ITEM::Create( aCode )->GetSettingsKey().ToUTF8() );
wxString name = item->GetSettingsKey();
return std::string( name.ToUTF8() );
}; };
const std::string rs = "rule_severities."; const std::string rs = "rule_severities.";