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

Roll back last 2 commits meant for the other resolver only. 

Fixes: lp:1772255
* https://bugs.launchpad.net/kicad/+bug/1772255
This commit is contained in:
Jeff Young 2018-05-21 16:24:24 +01:00
parent cdde4c4b40
commit 6a2dc8d4eb
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@
#include "kicadpcb.h"
#include "3d_resolver.h"
#include "../../../include/trace_helpers.h"
// configuration file version
#define CFGFILE_VERSION 1
@ -399,8 +398,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
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 );
wxLogMessage( "%s\n", errmsg.ToUTF8() );
}
return wxEmptyString;
@ -477,8 +475,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path";
errmsg.append( "\n" );
errmsg.append( tname );
errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() );
}
return wxEmptyString;
@ -515,8 +512,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined";
errmsg.append( "\n" );
errmsg.append( tname.substr( 1 ) );
errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() );
}
return wxEmptyString;
@ -548,11 +544,10 @@ bool S3D_RESOLVER::addPath( const S3D_ALIAS& aPath )
// suppress the message if the missing pathvar is the legacy KISYS3DMOD variable
if( aPath.m_pathvar != "${KISYS3DMOD}" && aPath.m_pathvar != "$(KISYS3DMOD)" )
{
wxString errmsg = _( "The given path does not exist" );
errmsg.append( "\n" );
errmsg.append( tpath.m_pathvar );
errmsg.append( "\n" );
wxLogTrace( tracePathsAndFiles, errmsg );
wxString msg = _( "The given path does not exist" );
msg.append( "\n" );
msg.append( tpath.m_pathvar );
wxLogMessage( "%s\n", msg.ToUTF8() );
}
tpath.m_pathexp.clear();