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

dodge some debug asserts in wxFileDialog which happen if the filename has a path

This commit is contained in:
dickelbeck 2008-02-20 07:19:40 +00:00
parent a248ead341
commit 951e759fd1
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/specctra_export.cpp
View File

@ -51,16 +51,21 @@ using namespace DSN;
void WinEDA_PcbFrame::ExportToSpecctra( wxCommandEvent& event )
{
wxString fullFileName = GetScreen()->m_FileName;
wxString std_ext = wxT( ".dsn" );
wxString mask = wxT( "*" ) + std_ext;
wxString path;
wxString name;
wxString ext;
ChangeFileNameExt( fullFileName, std_ext );
wxString dsn_ext = wxT( ".dsn" );
wxString mask = wxT( "*" ) + dsn_ext;
wxFileName::SplitPath( fullFileName, &path, &name, &ext );
name += dsn_ext;
fullFileName = EDA_FileSelector( _( "Specctra DSN file:" ),
wxEmptyString, /* Chemin par defaut */
fullFileName, /* nom fichier par defaut */
std_ext, /* extension par defaut */
mask, /* Masque d'affichage */
path,
name, // name.ext without path!
dsn_ext,
mask,
this,
wxFD_SAVE,
FALSE

19
pcbnew/specctra_import.cpp
View File

@ -60,22 +60,27 @@ void WinEDA_PcbFrame::ImportSpecctraSession( wxCommandEvent& event )
}
*/
wxString fullFileName = GetScreen()->m_FileName;
wxString path;
wxString name;
wxString ext;
wxString sessionExt( wxT( ".ses" ) );
wxString fileName = GetScreen()->m_FileName;
wxString mask = wxT( "*" ) + sessionExt;
ChangeFileNameExt( fileName, sessionExt );
wxFileName::SplitPath( fullFileName, &path, &name, &ext );
name += sessionExt;
fileName = EDA_FileSelector( _( "Merge Specctra Session file:" ),
wxEmptyString,
fileName,
fullFileName = EDA_FileSelector( _( "Merge Specctra Session file:" ),
path,
name, // name.ext without path!
sessionExt,
mask,
this,
wxFD_OPEN,
FALSE );
if( fileName == wxEmptyString )
if( fullFileName == wxEmptyString )
return;
SPECCTRA_DB db;
@ -84,7 +89,7 @@ void WinEDA_PcbFrame::ImportSpecctraSession( wxCommandEvent& event )
try
{
db.LoadSESSION( fileName );
db.LoadSESSION( fullFileName );
db.FromSESSION( m_Pcb );
}
catch( IOError ioe )