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

Assign a page number to all sheet instances when adding a sheet 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8208
This commit is contained in:
Roberto Fernandez Bautista 2021-05-21 18:24:38 +01:00
parent 5cf3e6d31a
commit 6b764f893a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -166,12 +166,7 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataToWindow()
instance.push_back( m_sheet ); instance.push_back( m_sheet );
wxString nextPageNumber; wxString nextPageNumber = m_sheet->GetPageNumber( instance );
if( m_sheet->IsNew() )
nextPageNumber.Printf( "%d", static_cast<int>( hierarchy.size() ) + 1 );
else
nextPageNumber = m_sheet->GetPageNumber( instance );
m_pageNumberTextCtrl->ChangeValue( nextPageNumber ); m_pageNumberTextCtrl->ChangeValue( nextPageNumber );

18
eeschema/tools/sch_drawing_tools.cpp
View File

@ -1345,6 +1345,24 @@ int SCH_DRAWING_TOOLS::DrawSheet( const TOOL_EVENT& aEvent )
getViewControls()->SetAutoPan( false ); getViewControls()->SetAutoPan( false );
getViewControls()->CaptureCursor( false ); getViewControls()->CaptureCursor( false );
// Find the list of paths in the hierarchy that refer to the destination sheet where
// the new sheet will be drawn
SCH_SCREEN* currentScreen = m_frame->GetCurrentSheet().LastScreen();
SCH_SHEET_LIST hierarchy = m_frame->Schematic().GetSheets();
SCH_SHEET_LIST instances = hierarchy.FindAllSheetsForScreen( currentScreen );
instances.SortByPageNumbers();
int pageNum = static_cast<int>( hierarchy.size() ) + 1;
// Set a page number for all the instances of the new sheet in the hierarchy
for( SCH_SHEET_PATH& instance : instances )
{
SCH_SHEET_PATH sheetPath = instance;
sheetPath.push_back( sheet );
sheet->AddInstance( sheetPath.Path() );
sheet->SetPageNumber( sheetPath, wxString::Format( "%d", pageNum++ ) );
}
if( m_frame->EditSheetProperties( static_cast<SCH_SHEET*>( sheet ), if( m_frame->EditSheetProperties( static_cast<SCH_SHEET*>( sheet ),
&m_frame->GetCurrentSheet(), nullptr ) ) &m_frame->GetCurrentSheet(), nullptr ) )
{ {