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

debugging printfs

This commit is contained in:
dickelbeck 2008-02-20 19:12:36 +00:00
parent 951e759fd1
commit 708a394c64
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/gestfich.cpp
View File

@ -30,6 +30,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "macros.h"
// Path list for online help // Path list for online help
@ -91,12 +92,12 @@ wxString MakeReducedFileName( const wxString& fullfilename,
* @param fullfilename = full filename * @param fullfilename = full filename
* @param default_path = default path * @param default_path = default path
* @param default_ext = default extension * @param default_ext = default extension
* *
* @return the "reduced" filename, i.e.: * @return the "reduced" filename, i.e.:
* without path if it is default_path * without path if it is default_path
* wiht ./ if the path is the current path * wiht ./ if the path is the current path
* without extension if extension is default_ext * without extension if extension is default_ext
* *
* the new flename is in unix like notation ('/' as path separator) * the new flename is in unix like notation ('/' as path separator)
*/ */
{ {
@ -113,7 +114,7 @@ wxString MakeReducedFileName( const wxString& fullfilename,
path.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); path.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
#ifdef __WINDOWS__ #ifdef __WINDOWS__
// names are case insensitive under windows // names are case insensitive under windows
path.MakeLower(); path.MakeLower();
Cwd.MakeLower(); Cwd.MakeLower();
ext.MakeLower(); ext.MakeLower();
@ -169,13 +170,13 @@ wxString MakeFileName( const wxString& dir,
if( !dir.IsEmpty() ) if( !dir.IsEmpty() )
{ {
if( !wxIsAbsolutePath( shortname ) ) if( !wxIsAbsolutePath( shortname ) )
{ {
if( ! shortname.StartsWith(wxT("./")) && ! shortname.StartsWith(wxT("../")) ) if( ! shortname.StartsWith(wxT("./")) && ! shortname.StartsWith(wxT("../")) )
{ /* no absolute path in shortname, add dir to shortname */ { /* no absolute path in shortname, add dir to shortname */
fullfilename = dir; fullfilename = dir;
} }
} }
} }
fullfilename += shortname; // Add shortname to dir or use shortname only fullfilename += shortname; // Add shortname to dir or use shortname only
@ -306,6 +307,17 @@ wxString EDA_FileSelector( const wxString& Title, /* Dialog ti
wxSetWorkingDirectory( defaultpath ); wxSetWorkingDirectory( defaultpath );
#if 0 && defined(DEBUG)
printf("defaultpath=\"%s\" defaultname=\"%s\" Ext=\"%s\" Mask=\"%s\" flag=%d keep_working_directory=%d\n",
CONV_TO_UTF8(defaultpath),
CONV_TO_UTF8(defaultname),
CONV_TO_UTF8(Ext),
CONV_TO_UTF8(Mask),
flag,
keep_working_directory
);
#endif
fullfilename = wxFileSelector( wxString( Title ), fullfilename = wxFileSelector( wxString( Title ),
defaultpath, defaultpath,
defaultname, defaultname,
@ -333,16 +345,16 @@ wxString FindKicadHelpPath()
* else from one of s_HelpPathList * else from one of s_HelpPathList
* typically c:\kicad\help or /usr/local/kicad/help or /usr/share/doc/kicad * typically c:\kicad\help or /usr/local/kicad/help or /usr/share/doc/kicad
* (must have kicad in path name) * (must have kicad in path name)
* *
* xx = iso639-1 language id (2 letters (generic) or 4 letters): * xx = iso639-1 language id (2 letters (generic) or 4 letters):
* fr = french (or fr_FR) * fr = french (or fr_FR)
* en = English (or en_GB or en_US ...) * en = English (or en_GB or en_US ...)
* de = deutch * de = deutch
* es = spanish * es = spanish
* pt = portuguese (or pt_BR ...) * pt = portuguese (or pt_BR ...)
* *
* default = en (if not found = fr) * default = en (if not found = fr)
* *
*/ */
{ {
wxString FullPath, LangFullPath, tmp; wxString FullPath, LangFullPath, tmp;
@ -423,7 +435,7 @@ wxString FindKicadFile( const wxString& shortname )
* and return full file name if found or shortname * and return full file name if found or shortname
* kicad binary path is * kicad binary path is
* kicad/winexe or kicad/linux * kicad/winexe or kicad/linux
* *
* kicad binary path is found from: * kicad binary path is found from:
* BinDir * BinDir
* or environment variable KICAD * or environment variable KICAD
@ -503,7 +515,7 @@ void SetRealLibraryPath( const wxString& shortlibname )
* g_UserLibDirBuffer = <KICAD>/shortlibname; * g_UserLibDirBuffer = <KICAD>/shortlibname;
* Sinon g_UserLibDirBuffer = <Chemin des binaires>../shortlibname/ * Sinon g_UserLibDirBuffer = <Chemin des binaires>../shortlibname/
* Sinon g_UserLibDirBuffer = /usr/share/kicad/shortlibname/ * Sinon g_UserLibDirBuffer = /usr/share/kicad/shortlibname/
* *
* Remarque: * Remarque:
* Les \ sont remplac<EFBFBD>s par / (a la mode Unix) * Les \ sont remplac<EFBFBD>s par / (a la mode Unix)
*/ */
@ -543,7 +555,7 @@ wxString ReturnKicadDatasPath()
* retourne <KICAD>/; * retourne <KICAD>/;
* Sinon retourne <Chemin des binaires>/ (si "kicad" est dans le nom du chemin) * Sinon retourne <Chemin des binaires>/ (si "kicad" est dans le nom du chemin)
* Sinon retourne /usr/share/kicad/ * Sinon retourne /usr/share/kicad/
* *
* Remarque: * Remarque:
* Les \ sont remplac<EFBFBD>s par / (a la mode Unix) * Les \ sont remplac<EFBFBD>s par / (a la mode Unix)
*/ */
@ -672,7 +684,7 @@ void OpenPDF( const wxString& file )
{ {
AddDelimiterString( filename ); AddDelimiterString( filename );
command.Empty(); command.Empty();
const static wxString tries[] = const static wxString tries[] =
{ {
wxT( "/usr/bin/evince" ), wxT( "/usr/bin/evince" ),
@ -681,12 +693,12 @@ void OpenPDF( const wxString& file )
wxT( "/usr/bin/gpdf" ), wxT( "/usr/bin/gpdf" ),
wxT( "" ), wxT( "" ),
}; };
for( int i = 0; ; i++ ) for( int i = 0; ; i++ )
{ {
if( tries[i].IsEmpty() ) if( tries[i].IsEmpty() )
break; break;
if( wxFileExists( tries[i] ) ) if( wxFileExists( tries[i] ) )
{ {
command = tries[i] + wxT( " " ) + filename; command = tries[i] + wxT( " " ) + filename;