haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GERBVIEW_FRAME::RemapLayers(), fix incorrect handling of layers visibility 

When modifying the gerber layers visibility, other (non gerber) layers must
be not modified.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17282
This commit is contained in:
jean-pierre charras 2024-03-08 17:03:11 +01:00
parent f6f0b9a661
commit 7944803f8c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gerbview/gerbview_frame.cpp
View File

@ -552,6 +552,8 @@ void GERBVIEW_FRAME::RemapLayers( const std::unordered_map<int, int>& remapping
{
// Save the visibility of each existing gerber layer, in order to be able
// to restore this visibility after layer reorder.
// Note: the visibility of other objects (D_CODE, negative objects ... )
// must be not modified
for( int currlayer = GERBER_DRAWLAYERS_COUNT-1; currlayer >= 0; --currlayer )
{
GERBER_FILE_IMAGE* gerber = GetImagesList()->GetGbrImage( currlayer );
@ -576,8 +578,8 @@ void GERBVIEW_FRAME::RemapLayers( const std::unordered_map<int, int>& remapping
GetCanvas()->GetView()->ReorderLayerData( view_remapping );
// Restore visibility options
LSET newVisibility;
// Restore visibility of gerber layers
LSET newVisibility = GetVisibleLayers();
for( int currlayer = GERBER_DRAWLAYERS_COUNT-1; currlayer >= 0; --currlayer )
{
@ -587,6 +589,8 @@ void GERBVIEW_FRAME::RemapLayers( const std::unordered_map<int, int>& remapping
{
if( gerber->HasFlag( CANDIDATE ) )
newVisibility.set( currlayer );
else
newVisibility.set( currlayer, false );
gerber->ClearFlags( CANDIDATE );
}