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

3D viewer; Fix a few incorrect use of ToUTF8() in log and error messages. Only noticeable when messages contain non ASCII7 chars.

This commit is contained in:
jean-pierre charras 2016-08-17 09:37:51 +02:00
parent 910cafe72e
commit 3f1a90c8a4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-viewer/3d_cache/3d_cache.cpp
View File

@ -212,7 +212,7 @@ SCENEGRAPH* S3D_CACHE::load( const wxString& aModelFile, S3D_CACHE_ENTRY** aCach
{ {
// the model cannot be found; we cannot proceed // the model cannot be found; we cannot proceed
wxLogTrace( MASK_3D_CACHE, " * [3D model] could not find model '%s'\n", wxLogTrace( MASK_3D_CACHE, " * [3D model] could not find model '%s'\n",
aModelFile.ToUTF8() ); aModelFile.GetData() );
return NULL; return NULL;
} }
@ -441,7 +441,7 @@ bool S3D_CACHE::loadCacheData( S3D_CACHE_ENTRY* aCacheItem )
if( m_CacheDir.empty() ) if( m_CacheDir.empty() )
{ {
wxString errmsg = "cannot load cached model; config directory unknown"; wxString errmsg = "cannot load cached model; config directory unknown";
wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.ToUTF8() ); wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.GetData() );
return false; return false;
} }
@ -452,7 +452,7 @@ bool S3D_CACHE::loadCacheData( S3D_CACHE_ENTRY* aCacheItem )
{ {
wxString errmsg = "cannot open file"; wxString errmsg = "cannot open file";
wxLogTrace( MASK_3D_CACHE, " * [3D model] %s '%s'\n", wxLogTrace( MASK_3D_CACHE, " * [3D model] %s '%s'\n",
errmsg.ToUTF8(), fname.ToUTF8() ); errmsg.GetData(), fname.GetData() );
return false; return false;
} }
@ -512,7 +512,7 @@ bool S3D_CACHE::saveCacheData( S3D_CACHE_ENTRY* aCacheItem )
if( m_CacheDir.empty() ) if( m_CacheDir.empty() )
{ {
wxString errmsg = "cannot load cached model; config directory unknown"; wxString errmsg = "cannot load cached model; config directory unknown";
wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.ToUTF8() ); wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.GetData() );
return false; return false;
} }
@ -524,7 +524,7 @@ bool S3D_CACHE::saveCacheData( S3D_CACHE_ENTRY* aCacheItem )
if( !wxFileName::FileExists( fname ) ) if( !wxFileName::FileExists( fname ) )
{ {
wxString errmsg = _( "path exists but is not a regular file" ); wxString errmsg = _( "path exists but is not a regular file" );
wxLogTrace( MASK_3D_CACHE, " * [3D model] %s '%s'\n", errmsg.ToUTF8(), wxLogTrace( MASK_3D_CACHE, " * [3D model] %s '%s'\n", errmsg.GetData(),
fname.ToUTF8() ); fname.ToUTF8() );
return false; return false;

2
3d-viewer/3d_canvas/cinfo3d_visu.cpp
View File

@ -486,7 +486,7 @@ void CINFO3D_VISU::createBoardPolygon()
errmsg.append( _( "Unable to calculate the board outlines." ) ); errmsg.append( _( "Unable to calculate the board outlines." ) );
errmsg.append( wxT( "\n" ) ); errmsg.append( wxT( "\n" ) );
errmsg.append( _( "Therefore use the board boundary box." ) ); errmsg.append( _( "Therefore use the board boundary box." ) );
wxLogMessage( "%s", errmsg.ToUTF8() ); wxLogMessage( "%s", errmsg.GetData() );
} }
m_board_poly.BooleanSubtract( allLayerHoles, SHAPE_POLY_SET::PM_FAST ); m_board_poly.BooleanSubtract( allLayerHoles, SHAPE_POLY_SET::PM_FAST );

2
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -192,7 +192,7 @@ bool EDA_3D_CANVAS::initializeOpenGL()
{ {
const wxString msgError = (const char*) glewGetErrorString( err ); const wxString msgError = (const char*) glewGetErrorString( err );
wxLogMessage( "%s", msgError.ToUTF8() ); wxLogMessage( msgError );
return false; return false;
} }