haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Performance for large hierarchies: lookups 

Don't bother to sort sheet lists when we're just looking
up a UUID, sheet count, other symbol units, etc.
This commit is contained in:
Jeff Young 2024-06-06 11:31:22 +01:00
parent 68fbe98b1d
commit e543ff0578
15 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/cross-probing.cpp
View File

@ -907,7 +907,7 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
KIID uuid( payload ); KIID uuid( payload );
SCH_SHEET_PATH path; SCH_SHEET_PATH path;
if( SCH_ITEM* item = m_schematic->GetSheets().GetItem( uuid, &path ) ) if( SCH_ITEM* item = m_schematic->GetItem( uuid, &path ) )
{ {
if( item->Type() == SCH_SHEET_T ) if( item->Type() == SCH_SHEET_T )
payload = static_cast<SCH_SHEET*>( item )->GetShownName( false ); payload = static_cast<SCH_SHEET*>( item )->GetShownName( false );

2
eeschema/dialogs/dialog_erc.cpp
View File

@ -531,7 +531,7 @@ void DIALOG_ERC::OnERCItemSelected( wxDataViewEvent& aEvent )
{ {
const KIID& itemID = RC_TREE_MODEL::ToUUID( aEvent.GetItem() ); const KIID& itemID = RC_TREE_MODEL::ToUUID( aEvent.GetItem() );
SCH_SHEET_PATH sheet; SCH_SHEET_PATH sheet;
SCH_ITEM* item = m_parent->Schematic().GetSheets().GetItem( itemID, &sheet ); SCH_ITEM* item = m_parent->Schematic().GetItem( itemID, &sheet );
if( m_centerMarkerOnIdle ) if( m_centerMarkerOnIdle )
{ {

2
eeschema/dialogs/dialog_field_properties.cpp
View File

@ -672,7 +672,7 @@ void DIALOG_FIELD_PROPERTIES::UpdateField( SCH_COMMIT* aCommit, SCH_FIELD* aFiel
int unit = symbol->GetUnit(); int unit = symbol->GetUnit();
LIB_ID libId = symbol->GetLibId(); LIB_ID libId = symbol->GetLibId();
for( SCH_SHEET_PATH& sheet : editFrame->Schematic().GetSheets() ) for( SCH_SHEET_PATH& sheet : editFrame->Schematic().GetUnorderedSheets() )
{ {
SCH_SCREEN* screen = sheet.LastScreen(); SCH_SCREEN* screen = sheet.LastScreen();
std::vector<SCH_SYMBOL*> otherUnits; std::vector<SCH_SYMBOL*> otherUnits;

2
eeschema/dialogs/dialog_symbol_properties.cpp
View File

@ -785,7 +785,7 @@ bool DIALOG_SYMBOL_PROPERTIES::TransferDataFromWindow()
int unit = m_symbol->GetUnit(); int unit = m_symbol->GetUnit();
LIB_ID libId = m_symbol->GetLibId(); LIB_ID libId = m_symbol->GetLibId();
for( SCH_SHEET_PATH& sheet : GetParent()->Schematic().GetSheets() ) for( SCH_SHEET_PATH& sheet : GetParent()->Schematic().GetUnorderedSheets() )
{ {
SCH_SCREEN* screen = sheet.LastScreen(); SCH_SCREEN* screen = sheet.LastScreen();
std::vector<SCH_SYMBOL*> otherUnits; std::vector<SCH_SYMBOL*> otherUnits;

3
eeschema/dialogs/dialog_table_properties.cpp
View File

@ -239,11 +239,10 @@ void DIALOG_TABLE_PROPERTIES::getContextualTextVars( const wxString& aCrossRef,
{ {
if( !aCrossRef.IsEmpty() ) if( !aCrossRef.IsEmpty() )
{ {
SCH_SHEET_LIST sheets = m_frame->Schematic().GetSheets();
SCH_REFERENCE_LIST refs; SCH_REFERENCE_LIST refs;
SCH_SYMBOL* refSymbol = nullptr; SCH_SYMBOL* refSymbol = nullptr;
sheets.GetSymbols( refs ); m_frame->Schematic().GetUnorderedSheets().GetSymbols( refs );
for( int jj = 0; jj < (int) refs.GetCount(); jj++ ) for( int jj = 0; jj < (int) refs.GetCount(); jj++ )
{ {

1
eeschema/dialogs/dialog_text_properties.cpp
View File

@ -165,7 +165,6 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_BASE_FRAME* aParent, SCH_ITE
if( SCH_EDIT_FRAME* schematicEditor = dynamic_cast<SCH_EDIT_FRAME*>( m_frame ) ) if( SCH_EDIT_FRAME* schematicEditor = dynamic_cast<SCH_EDIT_FRAME*>( m_frame ) )
{ {
SCH_SHEET_LIST sheetList = schematicEditor->Schematic().GetSheets(); SCH_SHEET_LIST sheetList = schematicEditor->Schematic().GetSheets();
sheetList.SortByPageNumbers( false );
for( const SCH_SHEET_PATH& sheet : sheetList ) for( const SCH_SHEET_PATH& sheet : sheetList )
{ {

2
eeschema/files-io.cpp
View File

@ -1089,7 +1089,7 @@ bool SCH_EDIT_FRAME::SaveProject( bool aSaveAs )
// File doesn't exist yet; true if we just imported something // File doesn't exist yet; true if we just imported something
updateFileHistory = true; updateFileHistory = true;
} }
else if( !Schematic().GetSheets().IsModified() ) else if( !IsContentModified() )
{ {
return true; return true;
} }

14
eeschema/net_navigator.cpp
View File

@ -194,7 +194,8 @@ static wxString GetNetNavigatorItemText( const SCH_ITEM* aItem,
void SCH_EDIT_FRAME::MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemId aParentId, void SCH_EDIT_FRAME::MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemId aParentId,
const NET_NAVIGATOR_ITEM_DATA* aSelection ) const NET_NAVIGATOR_ITEM_DATA* aSelection,
bool aSingleSheetSchematic )
{ {
wxCHECK( !aNetName.IsEmpty(), /* void */ ); wxCHECK( !aNetName.IsEmpty(), /* void */ );
wxCHECK( m_schematic, /* void */ ); wxCHECK( m_schematic, /* void */ );
@ -229,7 +230,7 @@ void SCH_EDIT_FRAME::MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemI
m_netNavigator->SelectItem( sheetId ); m_netNavigator->SelectItem( sheetId );
// If there is only one sheet in the schematic, always expand the sheet tree. // If there is only one sheet in the schematic, always expand the sheet tree.
if( Schematic().GetSheets().size() == 1 ) if( aSingleSheetSchematic )
expandId = sheetId; expandId = sheetId;
for( const SCH_ITEM* item : subGraph->GetItems() ) for( const SCH_ITEM* item : subGraph->GetItems() )
@ -266,6 +267,7 @@ void SCH_EDIT_FRAME::RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelect
if( !m_netNavigator->IsShown() ) if( !m_netNavigator->IsShown() )
return; return;
bool singleSheetSchematic = m_schematic->GetUnorderedSheets().size() == 1;
size_t nodeCnt = 0; size_t nodeCnt = 0;
m_netNavigator->Freeze(); m_netNavigator->Freeze();
@ -290,7 +292,7 @@ void SCH_EDIT_FRAME::RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelect
nodeCnt++; nodeCnt++;
wxTreeItemId netId = m_netNavigator->AppendItem( rootId, wxTreeItemId netId = m_netNavigator->AppendItem( rootId,
UnescapeString( net.first.Name ) ); UnescapeString( net.first.Name ) );
MakeNetNavigatorNode( net.first.Name, netId, aSelection ); MakeNetNavigatorNode( net.first.Name, netId, aSelection, singleSheetSchematic );
} }
m_netNavigator->Expand( rootId ); m_netNavigator->Expand( rootId );
@ -307,7 +309,7 @@ void SCH_EDIT_FRAME::RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelect
wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 ); wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 );
MakeNetNavigatorNode( m_highlightedConn, rootId, aSelection ); MakeNetNavigatorNode( m_highlightedConn, rootId, aSelection, singleSheetSchematic );
} }
else else
{ {
@ -323,7 +325,7 @@ void SCH_EDIT_FRAME::RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelect
wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 ); wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 );
MakeNetNavigatorNode( m_highlightedConn, rootId, itemData ); MakeNetNavigatorNode( m_highlightedConn, rootId, itemData, singleSheetSchematic );
} }
} }
else else
@ -332,7 +334,7 @@ void SCH_EDIT_FRAME::RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelect
wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 ); wxTreeItemId rootId = m_netNavigator->AddRoot( UnescapeString( m_highlightedConn ), 0 );
MakeNetNavigatorNode( m_highlightedConn, rootId, aSelection ); MakeNetNavigatorNode( m_highlightedConn, rootId, aSelection, singleSheetSchematic );
} }
timer.Stop(); timer.Stop();

15
eeschema/sch_edit_frame.cpp
View File

@ -822,7 +822,7 @@ void SCH_EDIT_FRAME::AddCopyForRepeatItem( const SCH_ITEM* aItem )
EDA_ITEM* SCH_EDIT_FRAME::GetItem( const KIID& aId ) const EDA_ITEM* SCH_EDIT_FRAME::GetItem( const KIID& aId ) const
{ {
return Schematic().GetSheets().GetItem( aId ); return Schematic().GetItem( aId );
} }
@ -942,7 +942,7 @@ bool SCH_EDIT_FRAME::canCloseWindow( wxCloseEvent& aEvent )
// Shutdown blocks must be determined and vetoed as early as possible // Shutdown blocks must be determined and vetoed as early as possible
if( KIPLATFORM::APP::SupportsShutdownBlockReason() && aEvent.GetId() == wxEVT_QUERY_END_SESSION if( KIPLATFORM::APP::SupportsShutdownBlockReason() && aEvent.GetId() == wxEVT_QUERY_END_SESSION
&& Schematic().GetSheets().IsModified() ) && IsContentModified() )
{ {
return false; return false;
} }
@ -990,9 +990,7 @@ bool SCH_EDIT_FRAME::canCloseWindow( wxCloseEvent& aEvent )
if( !Schematic().IsValid() ) if( !Schematic().IsValid() )
return false; return false;
SCH_SHEET_LIST sheetlist = Schematic().GetSheets(); if( IsContentModified() )
if( sheetlist.IsModified() )
{ {
wxFileName fileName = Schematic().RootScreen()->GetFileName(); wxFileName fileName = Schematic().RootScreen()->GetFileName();
wxString msg = _( "Save changes to '%s' before closing?" ); wxString msg = _( "Save changes to '%s' before closing?" );
@ -1013,7 +1011,7 @@ bool SCH_EDIT_FRAME::canCloseWindow( wxCloseEvent& aEvent )
void SCH_EDIT_FRAME::doCloseWindow() void SCH_EDIT_FRAME::doCloseWindow()
{ {
SCH_SHEET_LIST sheetlist = Schematic().GetSheets(); SCH_SHEET_LIST sheetlist = Schematic().GetUnorderedSheets();
// Shutdown all running tools // Shutdown all running tools
if( m_toolManager ) if( m_toolManager )
@ -2201,7 +2199,7 @@ const BOX2I SCH_EDIT_FRAME::GetDocumentExtents( bool aIncludeAllVisible ) const
bool SCH_EDIT_FRAME::IsContentModified() const bool SCH_EDIT_FRAME::IsContentModified() const
{ {
return Schematic().GetSheets().IsModified(); return Schematic().GetUnorderedSheets().IsModified();
} }
@ -2216,9 +2214,8 @@ void SCH_EDIT_FRAME::FocusOnItem( SCH_ITEM* aItem )
{ {
static KIID lastBrightenedItemID( niluuid ); static KIID lastBrightenedItemID( niluuid );
SCH_SHEET_LIST sheetList = Schematic().GetSheets();
SCH_SHEET_PATH dummy; SCH_SHEET_PATH dummy;
SCH_ITEM* lastItem = sheetList.GetItem( lastBrightenedItemID, &dummy ); SCH_ITEM* lastItem = Schematic().GetItem( lastBrightenedItemID, &dummy );
if( lastItem && lastItem != aItem ) if( lastItem && lastItem != aItem )
{ {

3
eeschema/sch_edit_frame.h
View File

@ -871,7 +871,8 @@ public:
void RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelection = nullptr ); void RefreshNetNavigator( const NET_NAVIGATOR_ITEM_DATA* aSelection = nullptr );
void MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemId aParentId, void MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemId aParentId,
const NET_NAVIGATOR_ITEM_DATA* aSelection = nullptr ); const NET_NAVIGATOR_ITEM_DATA* aSelection,
bool aSingleSheetSchematic );
void SelectNetNavigatorItem( const NET_NAVIGATOR_ITEM_DATA* aSelection = nullptr ); void SelectNetNavigatorItem( const NET_NAVIGATOR_ITEM_DATA* aSelection = nullptr );

3
eeschema/sch_field.cpp
View File

@ -855,11 +855,10 @@ void SCH_FIELD::OnScintillaCharAdded( SCINTILLA_TRICKS* aScintillaTricks,
} }
else else
{ {
SCH_SHEET_LIST sheets = schematic->GetSheets();
SCH_REFERENCE_LIST refs; SCH_REFERENCE_LIST refs;
SCH_SYMBOL* refSymbol = nullptr; SCH_SYMBOL* refSymbol = nullptr;
sheets.GetSymbols( refs ); schematic->GetUnorderedSheets().GetSymbols( refs );
for( size_t jj = 0; jj < refs.GetCount(); jj++ ) for( size_t jj = 0; jj < refs.GetCount(); jj++ )
{ {

3
eeschema/sch_sheet.cpp
View File

@ -297,8 +297,7 @@ bool SCH_SHEET::ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, in
} }
else if( token->IsSameAs( wxT( "##" ) ) ) else if( token->IsSameAs( wxT( "##" ) ) )
{ {
SCH_SHEET_LIST sheetList = schematic->GetSheets(); *token = wxString::Format( wxT( "%d" ), (int) schematic->GetUnorderedSheets().size() );
*token = wxString::Format( wxT( "%d" ), (int) sheetList.size() );
return true; return true;
} }
else if( token->IsSameAs( wxT( "SHEETPATH" ) ) ) else if( token->IsSameAs( wxT( "SHEETPATH" ) ) )

29
eeschema/schematic.cpp
View File

@ -72,7 +72,7 @@ SCHEMATIC::SCHEMATIC( PROJECT* aPrj ) :
int unit = symbol->GetUnit(); int unit = symbol->GetUnit();
LIB_ID libId = symbol->GetLibId(); LIB_ID libId = symbol->GetLibId();
for( SCH_SHEET_PATH& sheet : GetSheets() ) for( SCH_SHEET_PATH& sheet : GetUnorderedSheets() )
{ {
std::vector<SCH_SYMBOL*> otherUnits; std::vector<SCH_SYMBOL*> otherUnits;
@ -314,7 +314,7 @@ std::vector<SCH_MARKER*> SCHEMATIC::ResolveERCExclusions()
for( auto it = settings.m_ErcExclusions.begin(); it != settings.m_ErcExclusions.end(); ) for( auto it = settings.m_ErcExclusions.begin(); it != settings.m_ErcExclusions.end(); )
{ {
SCH_MARKER* testMarker = SCH_MARKER::DeserializeFromString( this, *it ); SCH_MARKER* testMarker = SCH_MARKER::DeserializeFromString( sheetList, *it );
if( !testMarker ) if( !testMarker )
{ {
@ -367,7 +367,7 @@ std::vector<SCH_MARKER*> SCHEMATIC::ResolveERCExclusions()
for( const wxString& serialized : settings.m_ErcExclusions ) for( const wxString& serialized : settings.m_ErcExclusions )
{ {
SCH_MARKER* marker = SCH_MARKER::DeserializeFromString( this, serialized ); SCH_MARKER* marker = SCH_MARKER::DeserializeFromString( sheetList, serialized );
if( marker ) if( marker )
{ {
@ -384,7 +384,7 @@ std::vector<SCH_MARKER*> SCHEMATIC::ResolveERCExclusions()
std::shared_ptr<BUS_ALIAS> SCHEMATIC::GetBusAlias( const wxString& aLabel ) const std::shared_ptr<BUS_ALIAS> SCHEMATIC::GetBusAlias( const wxString& aLabel ) const
{ {
for( const SCH_SHEET_PATH& sheet : GetSheets() ) for( const SCH_SHEET_PATH& sheet : GetUnorderedSheets() )
{ {
for( const std::shared_ptr<BUS_ALIAS>& alias : sheet.LastScreen()->GetBusAliases() ) for( const std::shared_ptr<BUS_ALIAS>& alias : sheet.LastScreen()->GetBusAliases() )
{ {
@ -418,11 +418,10 @@ std::set<wxString> SCHEMATIC::GetNetClassAssignmentCandidates()
bool SCHEMATIC::ResolveCrossReference( wxString* token, int aDepth ) const bool SCHEMATIC::ResolveCrossReference( wxString* token, int aDepth ) const
{ {
SCH_SHEET_LIST sheetList = GetSheets();
wxString remainder; wxString remainder;
wxString ref = token->BeforeFirst( ':', &remainder ); wxString ref = token->BeforeFirst( ':', &remainder );
SCH_SHEET_PATH sheetPath; SCH_SHEET_PATH sheetPath;
SCH_ITEM* refItem = sheetList.GetItem( KIID( ref ), &sheetPath ); SCH_ITEM* refItem = GetItem( KIID( ref ), &sheetPath );
if( refItem && refItem->Type() == SCH_SYMBOL_T ) if( refItem && refItem->Type() == SCH_SYMBOL_T )
{ {
@ -455,7 +454,7 @@ std::map<int, wxString> SCHEMATIC::GetVirtualPageToSheetNamesMap() const
{ {
std::map<int, wxString> namesMap; std::map<int, wxString> namesMap;
for( const SCH_SHEET_PATH& sheet : GetSheets() ) for( const SCH_SHEET_PATH& sheet : GetUnorderedSheets() )
{ {
if( sheet.size() == 1 ) if( sheet.size() == 1 )
namesMap[sheet.GetVirtualPageNumber()] = _( "<root sheet>" ); namesMap[sheet.GetVirtualPageNumber()] = _( "<root sheet>" );
@ -471,7 +470,7 @@ std::map<int, wxString> SCHEMATIC::GetVirtualPageToSheetPagesMap() const
{ {
std::map<int, wxString> pagesMap; std::map<int, wxString> pagesMap;
for( const SCH_SHEET_PATH& sheet : GetSheets() ) for( const SCH_SHEET_PATH& sheet : GetUnorderedSheets() )
pagesMap[sheet.GetVirtualPageNumber()] = sheet.GetPageNumber(); pagesMap[sheet.GetVirtualPageNumber()] = sheet.GetPageNumber();
return pagesMap; return pagesMap;
@ -515,12 +514,11 @@ wxString SCHEMATIC::ConvertRefsToKIIDs( const wxString& aSource ) const
if( isCrossRef ) if( isCrossRef )
{ {
SCH_SHEET_LIST sheetList = GetSheets();
wxString remainder; wxString remainder;
wxString ref = token.BeforeFirst( ':', &remainder ); wxString ref = token.BeforeFirst( ':', &remainder );
SCH_REFERENCE_LIST references; SCH_REFERENCE_LIST references;
sheetList.GetSymbols( references ); GetUnorderedSheets().GetSymbols( references );
for( size_t jj = 0; jj < references.GetCount(); jj++ ) for( size_t jj = 0; jj < references.GetCount(); jj++ )
{ {
@ -571,12 +569,11 @@ wxString SCHEMATIC::ConvertKIIDsToRefs( const wxString& aSource ) const
if( isCrossRef ) if( isCrossRef )
{ {
SCH_SHEET_LIST sheetList = GetSheets();
wxString remainder; wxString remainder;
wxString ref = token.BeforeFirst( ':', &remainder ); wxString ref = token.BeforeFirst( ':', &remainder );
SCH_SHEET_PATH refSheetPath; SCH_SHEET_PATH refSheetPath;
SCH_ITEM* refItem = sheetList.GetItem( KIID( ref ), &refSheetPath ); SCH_ITEM* refItem = GetItem( KIID( ref ), &refSheetPath );
if( refItem && refItem->Type() == SCH_SYMBOL_T ) if( refItem && refItem->Type() == SCH_SYMBOL_T )
{ {
@ -728,10 +725,10 @@ wxString SCHEMATIC::GetOperatingPoint( const wxString& aNetName, int aPrecision,
void SCHEMATIC::FixupJunctions() void SCHEMATIC::FixupJunctions()
{ {
for( const SCH_SHEET_PATH& sheet : GetSheets() ) SCH_SCREENS screens( Root() );
{
SCH_SCREEN* screen = sheet.LastScreen();
for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
{
std::deque<EDA_ITEM*> allItems; std::deque<EDA_ITEM*> allItems;
for( auto item : screen->Items() ) for( auto item : screen->Items() )
@ -830,7 +827,7 @@ void SCHEMATIC::RecordERCExclusions()
void SCHEMATIC::ResolveERCExclusionsPostUpdate() void SCHEMATIC::ResolveERCExclusionsPostUpdate()
{ {
SCH_SHEET_LIST sheetList = GetSheets(); SCH_SHEET_LIST sheetList = GetUnorderedSheets();
for( SCH_MARKER* marker : ResolveERCExclusions() ) for( SCH_MARKER* marker : ResolveERCExclusions() )
{ {

12
eeschema/schematic.h
View File

@ -102,6 +102,18 @@ public:
return SCH_SHEET_LIST( m_rootSheet ); return SCH_SHEET_LIST( m_rootSheet );
} }
SCH_SHEET_LIST GetUnorderedSheets() const
{
SCH_SHEET_LIST sheets;
sheets.BuildSheetList( m_rootSheet, false );
return sheets;
}
SCH_ITEM* GetItem( const KIID& aID, SCH_SHEET_PATH* aPathOut = nullptr ) const
{
return GetUnorderedSheets().GetItem( aID, aPathOut );
}
SCH_SHEET& Root() const SCH_SHEET& Root() const
{ {
return *m_rootSheet; return *m_rootSheet;

2
eeschema/tools/sch_navigate_tool.cpp
View File

@ -201,7 +201,7 @@ bool SCH_NAVIGATE_TOOL::CanGoPrevious()
bool SCH_NAVIGATE_TOOL::CanGoNext() bool SCH_NAVIGATE_TOOL::CanGoNext()
{ {
return m_frame->GetCurrentSheet().GetVirtualPageNumber() return m_frame->GetCurrentSheet().GetVirtualPageNumber()
< (int) m_frame->Schematic().GetSheets().size(); < (int) m_frame->Schematic().GetUnorderedSheets().size();
} }