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

Gerbview: Better file extension association when opening zips 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/7855
This commit is contained in:
Mike Williams 2021-08-02 16:53:15 -04:00
parent a9379ecf39
commit 21a8dd6302
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gerbview/files.cpp
View File

@ -513,22 +513,6 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
// The archive contains Gerber and/or Excellon drill files. Use the right loader. // The archive contains Gerber and/or Excellon drill files. Use the right loader.
// However it can contain a few other files (reports, pdf files...), // However it can contain a few other files (reports, pdf files...),
// which will be skipped. // which will be skipped.
// Gerber files ext is usually "gbr", but can be also another value, starting by "g"
// old gerber files ext from kicad is .pho
// drill files do not have a well defined ext
// It is .drl in kicad, but .txt in Altium for instance
// Allows only .drl for drill files.
if( curr_ext[0] != 'g' && curr_ext != "pho" && curr_ext != "drl" )
{
if( aReporter )
{
msg.Printf( _( "Skipped file '%s' (unknown type).\n" ), entry->GetName() );
aReporter->Report( msg, RPT_SEVERITY_WARNING );
}
continue;
}
if( curr_ext == GerberJobFileExtension.c_str() ) if( curr_ext == GerberJobFileExtension.c_str() )
{ {
//We cannot read a gerber job file as a gerber plot file: skip it //We cannot read a gerber job file as a gerber plot file: skip it
@ -541,6 +525,21 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
continue; continue;
} }
wxString matchedExt;
enum GERBER_ORDER_ENUM order;
GERBER_FILE_IMAGE_LIST::GetGerberLayerFromFilename( fname, order, matchedExt );
if( order == GERBER_ORDER_ENUM::GERBER_LAYER_UNKNOWN )
{
if( aReporter )
{
msg.Printf( _( "Skipped file '%s' (unknown type).\n" ), entry->GetName() );
aReporter->Report( msg, RPT_SEVERITY_WARNING );
}
continue;
}
int layer = GetActiveLayer(); int layer = GetActiveLayer();
if( layer == NO_AVAILABLE_LAYERS ) if( layer == NO_AVAILABLE_LAYERS )
@ -584,7 +583,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
bool read_ok = true; bool read_ok = true;
if( curr_ext[0] == 'g' || curr_ext == "pho" ) if( order != GERBER_ORDER_ENUM::GERBER_DRILL )
{ {
// Read gerber files: each file is loaded on a new GerbView layer // Read gerber files: each file is loaded on a new GerbView layer
read_ok = Read_GERBER_File( unzipped_tempfile ); read_ok = Read_GERBER_File( unzipped_tempfile );
@ -593,7 +592,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
GetCanvas()->GetView()->SetLayerHasNegatives( GetCanvas()->GetView()->SetLayerHasNegatives(
GERBER_DRAW_LAYER( layer ), GetGbrImage( layer )->HasNegativeItems() ); GERBER_DRAW_LAYER( layer ), GetGbrImage( layer )->HasNegativeItems() );
} }
else // if( curr_ext == "drl" ) else // Everything else is a drill file
{ {
read_ok = Read_EXCELLON_File( unzipped_tempfile ); read_ok = Read_EXCELLON_File( unzipped_tempfile );
} }