From 1e4659bb4e3d5702673ffcc327088f17a4127732 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Sat, 23 Feb 2008 01:26:21 +0000 Subject: [PATCH] gerbview command line support --- gerbview/files.cpp | 11 ++++++----- gerbview/gerbview.cpp | 3 ++- gerbview/readgerb.cpp | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gerbview/files.cpp b/gerbview/files.cpp index 70d297a7d6..f766dabeff 100644 --- a/gerbview/files.cpp +++ b/gerbview/files.cpp @@ -125,9 +125,9 @@ int WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName, if( filename == wxEmptyString ) { wxString mask = wxT( "*" ) + g_PhotoFilenameExt; - + mask += wxT( ";*.gbr;*.gbx;*.lgr;*.ger" ); - + filename = EDA_FileSelector( _( "Gerber files:" ), path, /* Chemin par defaut */ wxEmptyString, /* nom fichier par defaut */ @@ -142,9 +142,10 @@ int WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName, } GetScreen()->m_FileName = filename; - - wxSetWorkingDirectory( path ); - + + if( path != wxEmptyString ) + wxSetWorkingDirectory( path ); + ChangeFileNameExt( filename, g_PenFilenameExt ); if( Read_GERBER_File( DC, GetScreen()->m_FileName, filename ) ) diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp index 8289cf3037..d427f5629e 100644 --- a/gerbview/gerbview.cpp +++ b/gerbview/gerbview.cpp @@ -70,7 +70,8 @@ bool WinEDA_App::OnInit() wxString path = wxPathOnly( fileName ); - wxSetWorkingDirectory( path ); + if( path != wxEmptyString ) + wxSetWorkingDirectory( path ); Read_Config(); diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp index 96fe49ef7f..068e850e5d 100644 --- a/gerbview/readgerb.cpp +++ b/gerbview/readgerb.cpp @@ -149,7 +149,9 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC* DC, gerber_layer->m_FileName = GERBER_FullFileName; - wxSetWorkingDirectory( wxPathOnly( GERBER_FullFileName ) ); + wxString path = wxPathOnly( GERBER_FullFileName ); + if( path != wxEmptyString ) + wxSetWorkingDirectory( path ); wxBusyCursor show_wait; setlocale( LC_NUMERIC, "C" );