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

Use named render layers in local settings

Browse Source
This commit is contained in:
Jon Evans 2025-01-08 00:15:48 -05:00
parent 96f87b5b83
commit 8df29a78e1
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/project/project_local_settings.cpp
View File

@ -22,10 +22,11 @@
#include <lset.h>
#include <project.h>
#include <project/project_local_settings.h>
#include <settings/layer_settings_utils.h>
#include <settings/json_settings_internals.h>
#include <settings/parameters.h>
const int projectLocalSettingsVersion = 4;
const int projectLocalSettingsVersion = 5;
PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxString& aFilename ) :
@ -65,9 +66,11 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
{
nlohmann::json ret = nlohmann::json::array();
for( size_t i = 0; i < m_VisibleItems.size(); i++ )
if( m_VisibleItems.test( i ) )
ret.push_back( i );
for( GAL_LAYER_ID l : m_VisibleItems.Seq() )
{
if( std::optional<VISIBILITY_LAYER> vl = VisibilityLayerFromRenderLayer( l ) )
ret.push_back( VisibilityLayerToString( *vl ) );
}
return ret;
},
@ -85,8 +88,10 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
{
try
{
int i = entry.get<int>();
m_VisibleItems.set( i );
std::string vs = entry.get<std::string>();
if( std::optional<GAL_LAYER_ID> l = RenderLayerFromVisbilityString( vs ) )
m_VisibleItems.set( *l );
}
catch( ... )
{
@ -429,6 +434,35 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
At( "board" ).erase( "visible_items" );
}
return true;
} );
registerMigration( 4, 5,
[&]()
{
// Schema version 5: use named render layers
std::string ptr( "board.visible_items" );
if( Contains( ptr ) && At( ptr ).is_array() )
{
std::vector<std::string> newLayers;
for( nlohmann::json& entry : At( ptr ) )
{
if( !entry.is_number_integer() )
continue;
if( std::optional<VISIBILITY_LAYER> vl =
VisibilityLayerFromRenderLayer( GAL_LAYER_ID_START + entry.get<int>() ) )
{
newLayers.emplace_back( VisibilityLayerToString( *vl ) );
}
}
At( ptr ) = newLayers;
}
return true;
} );
}