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

Read legacy tokens before current tokens.

Browse Source 
(So current can overwrite.)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/21525
This commit is contained in:
Jeff Young 2025-08-22 16:26:39 +01:00
parent 01991fed53
commit 03c230dd64
4 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/board_design_settings.cpp
View File

@ -348,7 +348,15 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS( JSON_SETTINGS* aParent, const std:
if( !aJson.is_object() ) if( !aJson.is_object() )
return; return;
for( const RC_ITEM& item : DRC_ITEM::GetItemsWithSeverities( true ) ) // Load V8 'hole_near_hole' token first (if present). Any current 'hole_to_hole' token
// found will then overwrite it.
// We can't use the migration architecture because we forgot to bump the version number
// when the change was made. But this is a one-off as any future deprecations should
// bump the version number and use registerMigration().
if( aJson.contains( "hole_near_hole" ) )
m_DRCSeverities[DRCE_DRILLED_HOLES_TOO_CLOSE] = SeverityFromString( aJson["hole_near_hole"] );
for( const RC_ITEM& item : DRC_ITEM::GetItemsWithSeverities() )
{ {
wxString name = item.GetSettingsKey(); wxString name = item.GetSettingsKey();
std::string key( name.ToUTF8() ); std::string key( name.ToUTF8() );

13
pcbnew/drc/drc_item.cpp
View File

@ -298,13 +298,6 @@ DRC_ITEM DRC_ITEM::nonMirroredTextOnBackLayer( DRCE_NONMIRRORED_TEXT_ON_BACK_LAY
_HKI( "Non-Mirrored text on back layer" ), _HKI( "Non-Mirrored text on back layer" ),
wxT( "nonmirrored_text_on_back_layer" ) ); wxT( "nonmirrored_text_on_back_layer" ) );
/// Deprecated item names
/// They have the current error code but the old name for compatibility with old settings files
DRC_ITEM DRC_ITEM::holeNearHolev8( DRCE_DRILLED_HOLES_TOO_CLOSE,
_HKI( "Drilled hole too close to other hole - deprecated" ),
wxT( "hole_near_hole" ) );
std::vector<std::reference_wrapper<RC_ITEM>> DRC_ITEM::allItemTypes( std::vector<std::reference_wrapper<RC_ITEM>> DRC_ITEM::allItemTypes(
{ {
DRC_ITEM::heading_electrical, DRC_ITEM::heading_electrical,
@ -376,12 +369,6 @@ std::vector<std::reference_wrapper<RC_ITEM>> DRC_ITEM::allItemTypes(
DRC_ITEM::libFootprintMismatch, DRC_ITEM::libFootprintMismatch,
DRC_ITEM::footprintTHPadhasNoHole, DRC_ITEM::footprintTHPadhasNoHole,
// Deprecated items need to come second to last in the list
// They will not be shown in the panel but will be used to
// parse old settings files
DRC_ITEM::heading_deprecated,
DRC_ITEM::holeNearHolev8,
// DRC_ITEM types with no user-editable severities // DRC_ITEM types with no user-editable severities
// NOTE: this MUST be the last grouping in the list! // NOTE: this MUST be the last grouping in the list!
DRC_ITEM::heading_internal, DRC_ITEM::heading_internal,

19
pcbnew/drc/drc_item.h
View File

@ -130,10 +130,9 @@ public:
*/ */
static std::shared_ptr<DRC_ITEM> Create( const wxString& aErrorKey ); static std::shared_ptr<DRC_ITEM> Create( const wxString& aErrorKey );
static std::vector<std::reference_wrapper<RC_ITEM>> GetItemsWithSeverities( bool aIncludeDeprecated = false ) static std::vector<std::reference_wrapper<RC_ITEM>> GetItemsWithSeverities()
{ {
static std::vector<std::reference_wrapper<RC_ITEM>> itemsWithSeveritiesAll; static std::vector<std::reference_wrapper<RC_ITEM>> itemsWithSeveritiesAll;
static std::vector<std::reference_wrapper<RC_ITEM>> itemsWithSeveritiesDeprecated;
if( itemsWithSeveritiesAll.empty() ) if( itemsWithSeveritiesAll.empty() )
{ {
@ -146,18 +145,7 @@ public:
} }
} }
if( itemsWithSeveritiesDeprecated.empty() ) return itemsWithSeveritiesAll;
{
for( RC_ITEM& item : allItemTypes )
{
if( &item == &heading_deprecated )
break;
itemsWithSeveritiesDeprecated.push_back( item );
}
}
return aIncludeDeprecated ? itemsWithSeveritiesAll : itemsWithSeveritiesDeprecated;
} }
void SetViolatingRule ( DRC_RULE *aRule ) { m_violatingRule = aRule; } void SetViolatingRule ( DRC_RULE *aRule ) { m_violatingRule = aRule; }
@ -255,9 +243,6 @@ private:
static DRC_ITEM mirroredTextOnFrontLayer; static DRC_ITEM mirroredTextOnFrontLayer;
static DRC_ITEM nonMirroredTextOnBackLayer; static DRC_ITEM nonMirroredTextOnBackLayer;
/// Deprecated items
static DRC_ITEM holeNearHolev8;
private: private:
DRC_RULE* m_violatingRule = nullptr; DRC_RULE* m_violatingRule = nullptr;
DRC_TEST_PROVIDER* m_violatingTest = nullptr; DRC_TEST_PROVIDER* m_violatingTest = nullptr;

3
pcbnew/files.cpp
View File

@ -178,8 +178,7 @@ bool AskLoadBoardFileName( PCB_EDIT_FRAME* aParent, wxString* aFileName, int aCt
bool kicadFormat = ( aCtl & KICTL_KICAD_ONLY ); bool kicadFormat = ( aCtl & KICTL_KICAD_ONLY );
wxFileDialog dlg( aParent, wxFileDialog dlg( aParent, kicadFormat ? _( "Open Board File" ) : _( "Import Non KiCad Board File" ),
kicadFormat ? _( "Open Board File" ) : _( "Import Non KiCad Board File" ),
path, name, fileFiltersStr, wxFD_OPEN | wxFD_FILE_MUST_EXIST ); path, name, fileFiltersStr, wxFD_OPEN | wxFD_FILE_MUST_EXIST );
FILEDLG_IMPORT_NON_KICAD importOptions( aParent->config()->m_System.show_import_issues ); FILEDLG_IMPORT_NON_KICAD importOptions( aParent->config()->m_System.show_import_issues );