realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-15 02:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ReorderLayerData to handle sparse maps

Browse Source 
aReorderMap might only have a few layers needing changing, so preserve
existing map if it doesn't exist in the new map

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19185
This commit is contained in:
Seth Hillbrand 2024-12-02 09:00:03 -08:00
parent 49813dabd4
commit ab3f597871
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/view/view.cpp
View File

@ -675,8 +675,18 @@ void VIEW::ReorderLayerData( std::unordered_map<int, int> aReorderMap )
for( auto& [_, layer] : m_layers ) for( auto& [_, layer] : m_layers )
{ {
auto [it,__] = new_map.emplace( aReorderMap[layer.id], layer ); auto reorder_it = aReorderMap.find( layer.id );
it->second.id = aReorderMap[layer.id];
// If the layer is not in the reorder map or if it is mapped to itself,
// just copy the layer to the new map.
if( reorder_it == aReorderMap.end() || reorder_it->second == layer.id )
{
new_map.emplace( layer.id, layer );
continue;
}
auto [new_it,__] = new_map.emplace( reorder_it->second, layer );
new_it->second.id = reorder_it->second;
} }
// Transfer reordered data (using the copy assignment operator ): // Transfer reordered data (using the copy assignment operator ):