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

Gerbview: support more filetypes from the command line, e.g. zip 

Also parse other extensions, and use new heuristics to guess if we don't
know the extension.

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/5680
This commit is contained in:
Mike Williams 2021-08-04 16:22:07 -04:00
parent 2612b94519
commit c83f1ea1cd
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gerbview/gerbview_frame.cpp
View File

@ -26,6 +26,7 @@
#include <gerbview_id.h> #include <gerbview_id.h>
#include <gerber_file_image.h> #include <gerber_file_image.h>
#include <gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <excellon_image.h>
#include <gerbview_draw_panel_gal.h> #include <gerbview_draw_panel_gal.h>
#include <gerbview_settings.h> #include <gerbview_settings.h>
#include <drawing_sheet/ds_proxy_view_item.h> #include <drawing_sheet/ds_proxy_view_item.h>
@ -253,24 +254,46 @@ bool GERBVIEW_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
const unsigned limit = std::min( unsigned( aFileSet.size() ), const unsigned limit = std::min( unsigned( aFileSet.size() ),
unsigned( GERBER_DRAWLAYERS_COUNT ) ); unsigned( GERBER_DRAWLAYERS_COUNT ) );
int layer = 0; for( unsigned i = 0; i < limit; ++i )
for( unsigned i = 0; i < limit; ++i, ++layer )
{ {
SetActiveLayer( layer ); wxString ext = wxFileName( aFileSet[i] ).GetExt().Lower();
// Try to guess the type of file by its ext if( ext == "zip" )
// if it is .drl (KiCad files), .nc or .xnc it is a drill file LoadZipArchiveFile( aFileSet[i] );
wxFileName fn( aFileSet[i] ); else if( ext == "gbrprj" )
wxString ext = fn.GetExt();
if( ext == DrillFileExtension || // our Excellon format
ext == "nc" || ext == "xnc" ) // alternate ext for Excellon format
LoadExcellonFiles( aFileSet[i] );
else if( ext == GerberJobFileExtension )
LoadGerberJobFile( aFileSet[i] ); LoadGerberJobFile( aFileSet[i] );
else else
LoadGerberFiles( aFileSet[i] ); {
GERBER_ORDER_ENUM fnameLayer;
wxString fnameExtensionMatched;
GERBER_FILE_IMAGE_LIST::GetGerberLayerFromFilename( aFileSet[i], fnameLayer,
fnameExtensionMatched );
if( fnameLayer == GERBER_ORDER_ENUM::GERBER_LAYER_UNKNOWN )
{
if( EXCELLON_IMAGE::TestFileIsExcellon( aFileSet[i] ) )
{
fnameLayer = GERBER_ORDER_ENUM::GERBER_DRILL;
}
else if( GERBER_FILE_IMAGE::TestFileIsRS274( aFileSet[i] ) )
{
// If we have no way to know what layer it is, just guess
fnameLayer = GERBER_ORDER_ENUM::GERBER_TOP_COPPER;
}
}
switch( fnameLayer )
{
case GERBER_ORDER_ENUM::GERBER_DRILL:
LoadExcellonFiles( aFileSet[i] );
break;
case GERBER_ORDER_ENUM::GERBER_LAYER_UNKNOWN:
break;
default:
LoadGerberFiles( aFileSet[i] );
}
}
} }
} }