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

Move 3D file error messages to tracePathsAndFiles key. 

Fixes: lp:1772255
* https://bugs.launchpad.net/kicad/+bug/1772255
This commit is contained in:
Jeff Young 2018-05-21 11:09:49 +01:00
parent c49a4398a1
commit 10ec39a107
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
3d-viewer/3d_cache/3d_filename_resolver.cpp
View File

@ -29,6 +29,7 @@
#include <wx/log.h> #include <wx/log.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <trace_helpers.h>
#include "common.h" #include "common.h"
#include "3d_filename_resolver.h" #include "3d_filename_resolver.h"
@ -307,6 +308,23 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
return tname; return tname;
} }
// if a path begins with ${ENV_VAR}/$(ENV_VAR) and is not resolved then the
// file either does not exist or the ENV_VAR is not defined
if( aFileName.StartsWith( "${" ) || aFileName.StartsWith( "$(" ) )
{
if( !( m_errflags & ERRFLG_ENVPATH ) )
{
m_errflags |= ERRFLG_ENVPATH;
wxString errmsg = "[3D File Resolver] No such path; ensure the environment var is defined";
errmsg.append( "\n" );
errmsg.append( tname );
errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
}
return wxEmptyString;
}
// at this point aFileName is: // at this point aFileName is:
// a. an aliased shortened name or // a. an aliased shortened name or
// b. cannot be determined // b. cannot be determined
@ -375,7 +393,8 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path"; wxString errmsg = "[3D File Resolver] No such path";
errmsg.append( "\n" ); errmsg.append( "\n" );
errmsg.append( tname ); errmsg.append( tname );
wxLogTrace( MASK_3D_RESOLVER, errmsg ); errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
} }
return wxEmptyString; return wxEmptyString;
@ -411,7 +430,8 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined"; wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined";
errmsg.append( "\n" ); errmsg.append( "\n" );
errmsg.append( tname.substr( 1 ) ); errmsg.append( tname.substr( 1 ) );
wxLogTrace( MASK_3D_RESOLVER, errmsg ); errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
} }
return wxEmptyString; return wxEmptyString;

33
utils/kicad2step/pcb/3d_resolver.cpp
View File

@ -36,6 +36,7 @@
#include "kicadpcb.h" #include "kicadpcb.h"
#include "3d_resolver.h" #include "3d_resolver.h"
#include "../../../include/trace_helpers.h"
// configuration file version // configuration file version
#define CFGFILE_VERSION 1 #define CFGFILE_VERSION 1
@ -388,6 +389,23 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
return tname; return tname;
} }
// if a path begins with ${ENV_VAR}/$(ENV_VAR) and is not resolved then the
// file either does not exist or the ENV_VAR is not defined
if( aFileName.StartsWith( "${" ) || aFileName.StartsWith( "$(" ) )
{
if( !( m_errflags & ERRFLG_ENVPATH ) )
{
m_errflags |= ERRFLG_ENVPATH;
wxString errmsg = "[3D File Resolver] No such path; ensure the environment var is defined";
errmsg.append( "\n" );
errmsg.append( tname );
errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
}
return wxEmptyString;
}
// at this point aFileName is: // at this point aFileName is:
// a. an aliased shortened name or // a. an aliased shortened name or
// b. cannot be determined // b. cannot be determined
@ -459,7 +477,8 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path"; wxString errmsg = "[3D File Resolver] No such path";
errmsg.append( "\n" ); errmsg.append( "\n" );
errmsg.append( tname ); errmsg.append( tname );
wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() ); errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
} }
return wxEmptyString; return wxEmptyString;
@ -496,7 +515,8 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined"; wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined";
errmsg.append( "\n" ); errmsg.append( "\n" );
errmsg.append( tname.substr( 1 ) ); errmsg.append( tname.substr( 1 ) );
wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() ); errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
} }
return wxEmptyString; return wxEmptyString;
@ -528,10 +548,11 @@ bool S3D_RESOLVER::addPath( const S3D_ALIAS& aPath )
// suppress the message if the missing pathvar is the legacy KISYS3DMOD variable // suppress the message if the missing pathvar is the legacy KISYS3DMOD variable
if( aPath.m_pathvar != "${KISYS3DMOD}" && aPath.m_pathvar != "$(KISYS3DMOD)" ) if( aPath.m_pathvar != "${KISYS3DMOD}" && aPath.m_pathvar != "$(KISYS3DMOD)" )
{ {
wxString msg = _( "The given path does not exist" ); wxString errmsg = _( "The given path does not exist" );
msg.append( "\n" ); errmsg.append( "\n" );
msg.append( tpath.m_pathvar ); errmsg.append( tpath.m_pathvar );
wxLogMessage( "%s\n", msg.ToUTF8() ); errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
} }
tpath.m_pathexp.clear(); tpath.m_pathexp.clear();