AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 15:01:41 +00:00
Files Issues Releases Activity

Geographical reannotation: Fix "Exclude list" not working correctly

Browse Source 
Also update dialog_board_reannotate_base.fbp using the latest wxFormBuilder

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19927
This commit is contained in:
jean-pierre charras 2025-02-14 14:46:17 +01:00
parent ef5a7841b6
commit 1439ac0c31
4 changed files with 3127 additions and 3093 deletions

6
pcbnew/dialogs/dialog_board_reannotate.cpp
View File

@ -685,11 +685,11 @@ bool DIALOG_BOARD_REANNOTATE::BuildFootprintList( std::vector<REFDES_INFO>& aBad
}
else
exclude += thischar;
if( !exclude.empty() )
m_excludeArray.push_back( exclude );
}
if( !exclude.empty() ) // last item to exclude
m_excludeArray.push_back( exclude );
REFDES_INFO fpData;
bool useModuleLocation = m_locationChoice->GetSelection() == 0;

25
pcbnew/dialogs/dialog_board_reannotate_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -161,9 +161,6 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx
bSizerOpts->Add( fgSizerLocations, 0, wxEXPAND|wxALL, 10 );
bSizerOpts->Add( 0, 15, 0, wxEXPAND, 5 );
wxStaticText* stScopeLabel;
stScopeLabel = new wxStaticText( m_StandardOptions, wxID_ANY, _("Reannotation Scope"), wxDefaultPosition, wxDefaultSize, 0 );
stScopeLabel->Wrap( -1 );
@ -232,16 +229,6 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx
gbSizer1->Add( m_BackRefDesStart, wxGBPosition( 0, 4 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
m_RemoveFrontPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove front prefix"), wxDefaultPosition, wxDefaultSize, 0 );
m_RemoveFrontPrefix->SetToolTip( _("If checked will remove the front side prefix\nin the front prefix box if present") );
gbSizer1->Add( m_RemoveFrontPrefix, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_RemoveBackPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove back prefix"), wxDefaultPosition, wxDefaultSize, 0 );
m_RemoveBackPrefix->SetToolTip( _("If checked will remove the Back side prefix\nin the back prefix box if present") );
gbSizer1->Add( m_RemoveBackPrefix, wxGBPosition( 2, 3 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_FrontPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Front prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
m_FrontPrefixText->Wrap( -1 );
m_FrontPrefixText->SetToolTip( _("Optional prefix for component side reference designations (e.g. F_)") );
@ -264,6 +251,16 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx
gbSizer1->Add( m_BackPrefix, wxGBPosition( 1, 4 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_RemoveFrontPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove front prefix"), wxDefaultPosition, wxDefaultSize, 0 );
m_RemoveFrontPrefix->SetToolTip( _("If checked will remove the front side prefix\nin the front prefix box if present") );
gbSizer1->Add( m_RemoveFrontPrefix, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_RemoveBackPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove back prefix"), wxDefaultPosition, wxDefaultSize, 0 );
m_RemoveBackPrefix->SetToolTip( _("If checked will remove the Back side prefix\nin the back prefix box if present") );
gbSizer1->Add( m_RemoveBackPrefix, wxGBPosition( 2, 3 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_ExcludeLocked = new wxCheckBox( m_Advanced, wxID_ANY, _("Exclude locked footprints"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExcludeLocked->SetToolTip( _("Locked footprints will not be reannotated") );

6182
pcbnew/dialogs/dialog_board_reannotate_base.fbp
View File

File diff suppressed because it is too large Load Diff

7
pcbnew/dialogs/dialog_board_reannotate_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -38,7 +38,6 @@ class WX_HTML_REPORT_PANEL;
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_BOARD_REANNOTATE_BASE
///////////////////////////////////////////////////////////////////////////////
@ -80,12 +79,12 @@ class DIALOG_BOARD_REANNOTATE_BASE : public DIALOG_SHIM
wxTextCtrl* m_FrontRefDesStart;
wxStaticText* m_BottomRefDesStartText;
wxTextCtrl* m_BackRefDesStart;
wxCheckBox* m_RemoveFrontPrefix;
wxCheckBox* m_RemoveBackPrefix;
wxStaticText* m_FrontPrefixText;
wxTextCtrl* m_FrontPrefix;
wxStaticText* m_BackPrefixText;
wxTextCtrl* m_BackPrefix;
wxCheckBox* m_RemoveFrontPrefix;
wxCheckBox* m_RemoveBackPrefix;
wxCheckBox* m_ExcludeLocked;
wxStaticText* m_ExcludeListText;
wxTextCtrl* m_ExcludeList;