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

Hierarchy: fix missing page numbers / sheet instances 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/15413
This commit is contained in:
Mike Williams 2023-08-14 13:38:26 -04:00
parent dc103b88d1
commit 11b469f16a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sch_sheet_path.cpp
View File

@ -1265,13 +1265,15 @@ void SCH_SHEET_LIST::AddNewSheetInstances( const SCH_SHEET_PATH& aPrefixSheetPat
SCH_SHEET_INSTANCE instance; SCH_SHEET_INSTANCE instance;
if( sheet->getInstance( instance, tmp.Path(), true ) // Add the instance if it doesn't already exist
&& !instance.m_PageNumber.IsEmpty() ) if( !sheet->getInstance( instance, tmp.Path(), true ) )
{ {
newSheetPath.SetPageNumber( instance.m_PageNumber ); sheet->addInstance( tmp );
usedPageNumbers.push_back( instance.m_PageNumber ); sheet->getInstance( instance, tmp.Path(), true );
} }
else
// Get a new page number if we don't have one
if( instance.m_PageNumber.IsEmpty() )
{ {
// Generate the next available page number. // Generate the next available page number.
do do
@ -1281,10 +1283,12 @@ void SCH_SHEET_LIST::AddNewSheetInstances( const SCH_SHEET_PATH& aPrefixSheetPat
} while( std::find( usedPageNumbers.begin(), usedPageNumbers.end(), pageNumber ) != } while( std::find( usedPageNumbers.begin(), usedPageNumbers.end(), pageNumber ) !=
usedPageNumbers.end() ); usedPageNumbers.end() );
instance.m_PageNumber = pageNumber;
newSheetPath.SetVirtualPageNumber( nextVirtualPageNumber ); newSheetPath.SetVirtualPageNumber( nextVirtualPageNumber );
newSheetPath.SetPageNumber( pageNumber );
usedPageNumbers.push_back( pageNumber );
} }
newSheetPath.SetPageNumber( instance.m_PageNumber );
usedPageNumbers.push_back( instance.m_PageNumber );
} }
} }