Gerbview: auto sort zip files based on X2 or extensions
This commit is contained in:
parent
da2e7e158b
commit
3338745637
|
@ -468,6 +468,7 @@ bool GERBVIEW_FRAME::LoadExcellonFiles( const wxString& aFullFileName )
|
||||||
|
|
||||||
bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aReporter )
|
bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aReporter )
|
||||||
{
|
{
|
||||||
|
bool foundX2Gerbers = false;
|
||||||
wxString msg;
|
wxString msg;
|
||||||
|
|
||||||
// Extract the path of aFullFileName. We use it to store temporary files
|
// Extract the path of aFullFileName. We use it to store temporary files
|
||||||
|
@ -628,13 +629,22 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
|
||||||
GERBER_FILE_IMAGE* gerber_image = GetGbrImage( layer );
|
GERBER_FILE_IMAGE* gerber_image = GetGbrImage( layer );
|
||||||
|
|
||||||
if( gerber_image )
|
if( gerber_image )
|
||||||
|
{
|
||||||
gerber_image->m_FileName = fname;
|
gerber_image->m_FileName = fname;
|
||||||
|
if( gerber_image->m_IsX2_file )
|
||||||
|
foundX2Gerbers = true;
|
||||||
|
}
|
||||||
|
|
||||||
layer = getNextAvailableLayer( layer );
|
layer = getNextAvailableLayer( layer );
|
||||||
SetActiveLayer( layer, false );
|
SetActiveLayer( layer, false );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( foundX2Gerbers )
|
||||||
|
SortLayersByX2Attributes();
|
||||||
|
else
|
||||||
|
SortLayersByFileExtension();
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue