AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 14:50:11 +00:00
Files Issues Releases Activity

Revert NET_SETTING schema increment

Browse Source
This commit is contained in:
JamesJCode 2024-08-12 22:40:12 +01:00
parent 528b74db7f
commit ea482e8d15
2 changed files with 1 additions and 9 deletions
common/project
net_settings.cpp
include/project
net_settings.h

9
common/project/net_settings.cpp
View File

@ -35,8 +35,7 @@
// const int netSettingsSchemaVersion = 1; // new overbar syntax
// const int netSettingsSchemaVersion = 2; // exclude buses from netclass members
// const int netSettingsSchemaVersion = 3; // netclass assignment patterns
// const int netSettingsSchemaVersion = 4; // netclass ordering
const int netSettingsSchemaVersion = 5; // net color highlighting
const int netSettingsSchemaVersion = 4; // netclass ordering
static std::optional<int> getInPcbUnits( const nlohmann::json& aObj, const std::string& aKey,
@ -345,7 +344,6 @@ NET_SETTINGS::NET_SETTINGS( JSON_SETTINGS* aParent, const std::string& aPath ) :
registerMigration( 1, 2, std::bind( &NET_SETTINGS::migrateSchema1to2, this ) );
registerMigration( 2, 3, std::bind( &NET_SETTINGS::migrateSchema2to3, this ) );
registerMigration( 3, 4, std::bind( &NET_SETTINGS::migrateSchema3to4, this ) );
registerMigration( 4, 5, std::bind( &NET_SETTINGS::migrateSchema4to5, this ) );
}
@ -484,11 +482,6 @@ bool NET_SETTINGS::migrateSchema3to4()
return true;
}
bool NET_SETTINGS::migrateSchema4to5()
{
return true;
}
void NET_SETTINGS::SetDefaultNetclass( std::shared_ptr<NETCLASS> netclass )
{

1
include/project/net_settings.h
View File

@ -181,7 +181,6 @@ private:
bool migrateSchema1to2();
bool migrateSchema2to3();
bool migrateSchema3to4();
bool migrateSchema4to5();
/**
* @brief Creates an effective aggregate netclass from the given constituent netclasses