From d11c10252df057f322655d3dfdc95617b74e5ee7 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 22 Sep 2021 11:27:44 +0100
Subject: [PATCH] More changes to file resolvers.
Copy Kicad2Step fixes back to Kicad's file resolver.
Remove Kicad2Step's autogeneration of some variables in favour of
just reading the config file passed by Kicad verbatim.
Fixes https://gitlab.com/kicad/code/kicad/issues/7670
---
bitmaps_png/png/ercwarn_24.png | Bin 577 -> 557 bytes
bitmaps_png/png/ercwarn_dark_24.png | Bin 590 -> 566 bytes
common/filename_resolver.cpp | 27 ++--
utils/kicad2step/pcb/3d_resolver.cpp | 210 +++------------------------
utils/kicad2step/pcb/3d_resolver.h | 10 --
utils/kicad2step/pcb/kicadpcb.cpp | 7 +-
6 files changed, 40 insertions(+), 214 deletions(-)
diff --git a/bitmaps_png/png/ercwarn_24.png b/bitmaps_png/png/ercwarn_24.png
index 98bb82f2dfb0647c7ffb6328cdc5de8f4c17b229..cb8c6f04446e5556a7999f16d5eb592a014b3aae 100644
GIT binary patch
delta 533
zcmV+w0_y$21g!*+BYy$(Nkl<ZNXKJf7%brPM256a6B!<Sn!xZ9NGDR&@b{A#41tFJ
z1>*lu{QJvf23@LI@Npu;ZY0BDcso@L2L_1`7Q?~#!z2bbiVXk1ih=plB!(-vECAw*
zAT{Ji>?DSCxM5Q`{(o6!@c-K;-~ZotC;k7n!Snx@`HKI64u41@%kWoI8F+vOKLZ*5
z>*AFE|9*e{j}82Ja^T00d;8SMiP$EX>;F7I{vRLs_x0s#AjL+s;a?{+NC6H0f^5O>
z`&<5h+aB@%%Tm4nU)Q<(|MTJ$sx2>0g%h80CNj)Lj?B+9g)k!c>sm(?^M4#E-A$C?
zUnVf<0S)+rCx7LD@waVZC>DHKto;|5+jWR35_S?Y{L4~(V7R}48~*#&Dwy0>{Dx0v
zaKdNs*Hu>kf8AK}|Nr0L2*dBJ|NnV9A0qQjU~t8rsTvrVfGOu3J_~+bo&`7f@4Fko
zyx@*a-35?Ym=O!iFoc2z*#Zz7r`kyj38=2`W8nNaiGSe{Aq##StNH)u<ry#rvGJ&V
z@}ir88@WiRBV;(K7-(h<#PI11VnBh9#Ay2a<`N<f-rpvq{_~fq3=*IsVH&ZnBGH2X
zK(nWUa_uK#EdZ6GKaP}x@%O!H#OQg?KqzTa6b};_&M<tL#Gnu4T&IBrSE*WW;{pKN
Xc&n@7>JHs100000NkvXXu0mjf1F{bs
delta 553
zcmV+^0@nSl1i=K5BYy%2Nkl<ZNXN~UF-ROy5Qaxnsj(2Es7=Z=YOqo(LD0%3T}Ty0
zOlOrwkPy-e=5~+u^iT^i0VR+|(V&Hpqzj_))HcXPG*R^Sz1=(3-5ckfyB9Cs?mf>F
z92l0}o%hXqGxP5P+!tdC4C)H}(nD}W*S?a%PgQ6os6&pfpMUc(G?y$vLV?vQaL<=Z
z0;iJn=7DGYOog6X!Epf|=qkkg5|D3+nBp6&!mAvhR)I{b%uS*~e^Ky18ayPx0iSC|
z>t_VhERLR~%_Fp8Q^+Q2M3Uc!qfk{$W8djY89FDs=x6r+8l9jV>7;LN1UJIaNIT=A
z1j&^b==|Np)PMRA8lO7Rm~YR3J>wr*#3`8Z9vb8)M}g^obuPQsTyyz(Hi7xM+j~AK
z1?M4Xp<vr@a#*Aq?SpTZ^m7wgwAOoPliHhPJ_%p^;C$vWm21oGw1dgDf&XKcg5hE4
z^4)o~E;~tSi=nyrEWh|d(4AjYZ=swfXTvW+>ie)eI)5qTA6qd%e4B!Gy|E;ifJJC+
zPh|L_L_u+`_+IAjehexSD(n|rDDUwc@d=?6TEwD{FuB@CI%tzhLd=m%cm(R`L88zC
zJHGBtkBxlxiA)m4HK-S#gmIZ2ImfZAxMWX3Y)z<EmkBl&I?&pi#nji=H|fPG1dZlx
rokaTsxFQNq>1OW^66}=pzwKuiewmN84>AAV00000NkvXXu0mjfAtDdY
diff --git a/bitmaps_png/png/ercwarn_dark_24.png b/bitmaps_png/png/ercwarn_dark_24.png
index d80ad348e1e97bc16a74c5360dd7373cd0f8f23d..54315b3616346bbeec43348165114601a5a49a2b 100644
GIT binary patch
delta 451
zcmV;!0X+WB1hxc_BLV^aktJS#hZ%ORj^qEe$p-&#FY^8WU~SU>+Y3DZU+z}?f4Yhx
zi7dmfHZbr24SohP{MGR(|Ns8_`X3wkeDA=IPdE0dlWYOd;3k;szdSnrA0PPr`Q>XM
z#YVK@=gJtQfChg-w&25!E&uPWi1>eXlHUJYb6x&_d3*}Rl5bB>g%h8Da;g~SB1h(h
zW+99SzB$Jc#eyf>OLr4%xE|1eKX_6O7~fqUhGN0hiQ0dG5w1fx?5i1e5;FYiWc~lY
zKEHq){_gTBh+H+pR{XB7VQ|7{@QoQ(|KDC%^8er8-*Cg<UtRzId?OzshgUJUVm17K
z0|OJ#1?TWt@cPs&xWV6lU*GtDYrZ?Cx@v|CAhR$t6)?jP3L0b!Kx|y<fbp1sV)(H_
z22P;FBSIED-Cgtl>ytBJ3}WL^`{ZH?12-aKD;eqt8BQ{;WT*ifezAc;3@GrC7){?^
zT!IJDk2kjossDVcltBViBupdLRU}#f!c##Od?MBYP$~LkM>!ZaKUkkejGp%lgpwvj
txSHV%!?|(>eIVyL4J^1y)p{Ej007)KW&H-UFcAO%002ovPDHLkV1iul+7kc(
delta 475
zcmV<10VMvm1kMDIBLV^yktJS#M>g<WJtq)zp$1hILlRkrUu|IE0UGe^>O|fDuTD<?
z|LfzE|1j|T%gg_-PtW;(zF81t$<vD^4BRAJ0MyuYrke5p_gB~c;{u=V?D>DDn(03<
z80$zf{9GA>6wrb%pdh%nGV1@gXBYlI+MM_Q=4|`_*QZ;64TgcMlk`A;zW5BplEkN+
zDu%i6a0dDUJ#z1@h=5ygYo04CE@l#IxE@f$A6zNtd?WAw&kv4(4gdS=+y4u#qA<BX
zKudH8hkZ4}PF#jx>XQHe?fFHB)BpYb|6pATs+wwst@vGE!{CI=@C&VC@RaoT=jZ=-
zmIPu|2lRz2R>S`{FfajsU2qPU1y6QXLLC14$Ny_n4FBWIeANsWKxScPDqx1elVgE-
zVFuU&P!Qo$2g1O3Oh7UGSRn%^P~s6GjU?bFD47qGQ3z?e&?55x{@O%fJ}@WFl1hde
zu;CXQ7{q`A9|>vrbngH(@%;IJrB9t0OFo|}Wsm?B3Dbyi(YKdQSKyh8XkSz@Oa)o+
zi5SJ#XITD!b8gZ9$J<IsiHr9P_>v~YxSHV%!?|(>eIVyL4J^1y)p{Ej000}&Mjo!3
R`WFBI002ovPDHLkV1kQS?2G^a
diff --git a/common/filename_resolver.cpp b/common/filename_resolver.cpp
index 68507689ad..b0bc877e8a 100644
--- a/common/filename_resolver.cpp
+++ b/common/filename_resolver.cpp
@@ -110,7 +110,7 @@ bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
}
else
{
- if( m_paths.front().m_Pathexp.Cmp( m_curProjDir ) )
+ if( m_paths.front().m_Pathexp != m_curProjDir )
{
m_paths.front().m_Pathexp = m_curProjDir;
@@ -305,7 +305,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
// NB: this is not necessarily the same as the current working directory, which has already
// been checked. This case accounts for partial paths which do not contain ${KIPRJMOD}.
// This check is performed before checking the path relative to ${KICAD6_3DMODEL_DIR} so that
- // users can potentially override a model within ${KICAD6_3DMODEL_DIR}
+ // users can potentially override a model within ${KICAD6_3DMODEL_DIR}.
if( !m_paths.begin()->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
{
tmpFN.Assign( m_paths.begin()->m_Pathexp, "" );
@@ -368,7 +368,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
if( path.m_Alias.StartsWith( "${" ) || path.m_Alias.StartsWith( "$(" ) )
continue;
- if( !path.m_Alias.Cmp( alias ) && !path.m_Pathexp.empty() )
+ if( path.m_Alias == alias && !path.m_Pathexp.empty() )
{
wxFileName fpath( wxFileName::DirName( path.m_Pathexp ) );
wxString fullPath = fpath.GetPathWithSep() + relpath;
@@ -426,9 +426,13 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
if( !path.DirExists() )
{
- // suppress the message if the missing pathvar is the
- // legacy KICAD6_3DMODEL_DIR variable
- if( aPath.m_Pathvar.compare( wxT( "${KICAD6_3DMODEL_DIR}" ) ) )
+ if( aPath.m_Pathvar == "${KICAD6_3DMODEL_DIR}"
+ || aPath.m_Pathvar == "${KIPRJMOD}" || aPath.m_Pathvar == "$(KIPRJMOD)"
+ || aPath.m_Pathvar == "${KISYS3DMOD}" || aPath.m_Pathvar == "$(KISYS3DMOD)" )
+ {
+ // suppress the message if the missing pathvar is a system variable
+ }
+ else
{
wxString msg = _( "The given path does not exist" );
msg.append( wxT( "\n" ) );
@@ -456,7 +460,7 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
while( sPL != ePL )
{
- if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
+ if( tpath.m_Alias == sPL->m_Alias )
{
wxString msg = _( "Alias: " );
msg.append( tpath.m_Alias );
@@ -560,9 +564,14 @@ bool FILENAME_RESOLVER::readPathList()
if( !getHollerith( cfgLine, idx, al.m_Alias ) )
continue;
- // never add on KICAD6_3DMODEL_DIR from a config file
- if( !al.m_Alias.Cmp( wxT( "KICAD6_3DMODEL_DIR" ) ) )
+ // Don't add KICAD6_3DMODEL_DIR, one of its legacy equivalents, or KIPRJMOD from a
+ // config file. They're system variables are are defined at runtime.
+ if( al.m_Alias == "${KICAD6_3DMODEL_DIR}"
+ || al.m_Alias == "${KIPRJMOD}" || al.m_Alias == "$(KIPRJMOD)"
+ || al.m_Alias == "${KISYS3DMOD}" || al.m_Alias == "$(KISYS3DMOD)" )
+ {
continue;
+ }
if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
continue;
diff --git a/utils/kicad2step/pcb/3d_resolver.cpp b/utils/kicad2step/pcb/3d_resolver.cpp
index 505e75ed4c..c248ac91c5 100644
--- a/utils/kicad2step/pcb/3d_resolver.cpp
+++ b/utils/kicad2step/pcb/3d_resolver.cpp
@@ -33,10 +33,8 @@
#include <wx/filename.h>
#include <wx/log.h>
#include <wx/thread.h>
-#include <wx/utils.h>
#include <wx/msgdlg.h>
#include <wx/stdpaths.h>
-#include "kicadpcb.h"
#include "3d_resolver.h"
@@ -78,168 +76,11 @@ bool S3D_RESOLVER::Set3DConfigDir( const wxString& aConfigDir )
}
-bool S3D_RESOLVER::SetProjectDir( const wxString& aProjDir, bool* flgChanged )
-{
- if( aProjDir.empty() )
- return false;
-
- wxFileName projdir( aProjDir, "" );
- projdir.Normalize();
-
- if( false == projdir.DirExists() )
- return false;
-
- m_curProjDir = projdir.GetPath();
- wxSetEnv( "KIPRJMOD", m_curProjDir );
-
- if( flgChanged )
- *flgChanged = false;
-
- if( m_Paths.empty() )
- {
- SEARCH_PATH al;
- al.m_Alias = "${KIPRJMOD}";
- al.m_Pathvar = "${KIPRJMOD}";
- al.m_Pathexp = m_curProjDir;
- m_Paths.push_back( al );
- m_NameMap.clear();
-
- if( flgChanged )
- *flgChanged = true;
-
- }
- else
- {
- if( m_Paths.front().m_Pathexp.Cmp( m_curProjDir ) )
- {
- m_Paths.front().m_Pathexp = m_curProjDir;
- m_NameMap.clear();
-
- if( flgChanged )
- *flgChanged = true;
-
- }
- else
- {
- return true;
- }
- }
-
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * [INFO] changed project dir to '%s'" ),
- __FILE__, __FUNCTION__, __LINE__, m_Paths.front().m_Pathexp );
-
- return true;
-}
-
-
-wxString S3D_RESOLVER::GetProjectDir( void )
-{
- return m_curProjDir;
-}
-
-
bool S3D_RESOLVER::createPathList( void )
{
if( !m_Paths.empty() )
return true;
- wxString kmod;
-
- // add an entry for the default search path; at this point
- // we cannot set a sensible default so we use an empty string.
- // the user may change this later with a call to SetProjectDir()
-
- SEARCH_PATH lpath;
- lpath.m_Alias = "${KIPRJMOD}";
- lpath.m_Pathvar = "${KIPRJMOD}";
- lpath.m_Pathexp = m_curProjDir;
- m_Paths.push_back( lpath );
- wxFileName fndummy;
- wxUniChar psep = fndummy.GetPathSeparator();
- bool hasKICAD6_3DMODEL_DIR = false;
-
- // iterate over the list of internally defined ENV VARs
- // and add existing paths to the resolver
- std::map< wxString, wxString >::const_iterator mS = m_EnvVars.begin();
- std::map< wxString, wxString >::const_iterator mE = m_EnvVars.end();
-
- while( mS != mE )
- {
- // filter out URLs, template directories, and known system paths
- if( mS->first == wxString( "KICAD_PTEMPLATES" )
- || mS->first == wxString( "KICAD6_FOOTPRINT_DIR" ) )
- {
- ++mS;
- continue;
- }
-
- if( wxString::npos != mS->second.find( wxString( "://" ) ) )
- {
- ++mS;
- continue;
- }
-
- fndummy.Assign( mS->second, "" );
- wxString pathVal;
-
- // ensure system ENV VARs supersede internally defined vars
- if( wxGetEnv( mS->first, &pathVal ) && wxDirExists( pathVal ) )
- fndummy.Assign( pathVal, "" );
- else
- fndummy.Assign( mS->second, "" );
-
- fndummy.Normalize();
-
- if( !fndummy.DirExists() )
- {
- ++mS;
- continue;
- }
-
- wxString tmp( "${" );
- tmp.Append( mS->first );
- tmp.Append( "}" );
-
- if( tmp == "${KICAD6_3DMODEL_DIR}" )
- hasKICAD6_3DMODEL_DIR = true;
-
- lpath.m_Alias = tmp;
- lpath.m_Pathvar = tmp;
- lpath.m_Pathexp = fndummy.GetFullPath();
-
- if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
- lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
-
- m_Paths.push_back( lpath );
-
- ++mS;
- }
-
- // special case: if KICAD6_FOOTPRINT_DIR is not internally defined but is defined by
- // the system, then create an entry here
- wxString envar;
-
- if( !hasKICAD6_3DMODEL_DIR && wxGetEnv( "KICAD6_3DMODEL_DIR", &envar ) )
- {
- lpath.m_Alias = "${KICAD6_3DMODEL_DIR}";
- lpath.m_Pathvar = "${KICAD6_3DMODEL_DIR}";
- fndummy.Assign( envar, "" );
- fndummy.Normalize();
-
- if( fndummy.DirExists() )
- {
- lpath.m_Pathexp = fndummy.GetFullPath();
-
- if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
- lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
-
- if( !lpath.m_Pathexp.empty() )
- m_Paths.push_back( lpath );
- }
-
- }
-
readPathList();
if( m_Paths.empty() )
@@ -342,7 +183,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName,
// NB: this is not necessarily the same as the current working directory, which has already
// been checked. This case accounts for partial paths which do not contain ${KIPRJMOD}.
// This check is performed before checking the path relative to ${KICAD6_3DMODEL_DIR} so that
- // users can potentially override a model within ${KICAD6_3DMODEL_DIR}
+ // users can potentially override a model within ${KICAD6_3DMODEL_DIR}.
if( !m_Paths.begin()->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
{
tmpFN.Assign( m_Paths.begin()->m_Pathexp, "" );
@@ -407,7 +248,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName,
if( path.m_Alias.StartsWith( "${" ) || path.m_Alias.StartsWith( "$(" ) )
continue;
- if( !path.m_Alias.Cmp( alias ) && !path.m_Pathexp.empty() )
+ if( path.m_Alias == alias && !path.m_Pathexp.empty() )
{
wxFileName fpath( wxFileName::DirName( path.m_Pathexp ) );
wxString fullPath = fpath.GetPathWithSep() + relpath;
@@ -456,11 +297,15 @@ bool S3D_RESOLVER::addPath( const SEARCH_PATH& aPath )
wxFileName path( tpath.m_Pathvar, "" );
path.Normalize();
- if( !path.DirExists() )
+ if( !path.DirExists() )
{
- // suppress the message if the missing pathvar is the legacy KICAD6_3DMODEL_DIR variable
- if( aPath.m_Pathvar != "${KIPRJMOD}" &&
- aPath.m_Pathvar != "$(KICAD6_3DMODEL_DIR)" )
+ if( aPath.m_Pathvar == "${KICAD6_3DMODEL_DIR}"
+ || aPath.m_Pathvar == "${KIPRJMOD}" || aPath.m_Pathvar == "$(KIPRJMOD)"
+ || aPath.m_Pathvar == "${KISYS3DMOD}" || aPath.m_Pathvar == "$(KISYS3DMOD)" )
+ {
+ // suppress the message if the missing pathvar is a system variable
+ }
+ else
{
wxString msg = _( "The given path does not exist" );
msg.append( "\n" );
@@ -489,7 +334,7 @@ bool S3D_RESOLVER::addPath( const SEARCH_PATH& aPath )
while( sPL != ePL )
{
- if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
+ if( tpath.m_Alias == sPL->m_Alias )
{
wxString msg = _( "Alias:" ) + wxS( " " );
msg.append( tpath.m_Alias );
@@ -525,8 +370,7 @@ bool S3D_RESOLVER::readPathList( void )
if( !wxFileName::Exists( cfgname ) )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:d\n"
- " * no 3D configuration file '%s'" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:d\n * no 3D configuration file '%s'" ),
__FILE__, __FUNCTION__, __LINE__, cfgname );
return false;
@@ -536,8 +380,7 @@ bool S3D_RESOLVER::readPathList( void )
if( !cfgFile.is_open() )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * Could not open configuration file '%s'" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * Could not open configuration file '%s'" ),
__FILE__, __FUNCTION__, __LINE__, cfgname );
return false;
@@ -580,13 +423,6 @@ bool S3D_RESOLVER::readPathList( void )
if( !getHollerith( cfgLine, idx, al.m_Alias ) )
continue;
- // never add on KICAD6_3DMODEL_DIR from a config file
- if( !al.m_Alias.Cmp( "${KICAD6_3DMODEL_DIR}" ) )
- continue;
-
- if( !al.m_Alias.Cmp( "${KIPRJMOD}" ) )
- continue;
-
if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
continue;
@@ -672,7 +508,7 @@ wxString S3D_RESOLVER::expandVars( const wxString& aPath )
wxString result;
- for( const auto& i : m_EnvVars )
+ for( const std::pair<const wxString, wxString>& i : m_EnvVars )
{
if( !aPath.compare( 2, i.first.length(), i.first ) )
{
@@ -807,8 +643,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( aIndex >= aString.size() )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * Bad Hollerith string in line \"%s\"" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * Bad Hollerith string in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
@@ -818,8 +653,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( std::string::npos == i2 )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * missing opening quote mark in line \"%s\"" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * missing opening quote mark in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
@@ -829,8 +663,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( i2 >= aString.size() )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * unexpected end of line in line \"%s\"" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * unexpected end of line in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
@@ -843,8 +676,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( tnum.empty() || aString[i2++] != ':' )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * Bad Hollerith string in line \"%s\"" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * Bad Hollerith string in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
@@ -857,8 +689,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( (i2 + nchars) >= aString.size() )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * unexpected end of line in line \"%s\"\n" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * unexpected end of line in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
@@ -872,8 +703,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( i2 >= aString.size() || aString[i2] != '"' )
{
- wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n"
- " * missing closing quote mark in line \"%s\"" ),
+ wxLogTrace( trace3dResolver, wxT( "%s:%s:%d\n * missing closing quote mark in line '%s'" ),
__FILE__, __FUNCTION__, __LINE__, aString );
return false;
diff --git a/utils/kicad2step/pcb/3d_resolver.h b/utils/kicad2step/pcb/3d_resolver.h
index 4c279db6ee..fd3c010032 100644
--- a/utils/kicad2step/pcb/3d_resolver.h
+++ b/utils/kicad2step/pcb/3d_resolver.h
@@ -113,16 +113,6 @@ public:
*/
bool Set3DConfigDir( const wxString& aConfigDir );
- /**
- * Set the current KiCad project directory as the first entry in the model path list.
- *
- * @param aProjDir is the current project directory.
- * @param flgChanged, if specified, is set to true if the directory actually changed.
- * @return true if the call succeeds.
- */
- bool SetProjectDir( const wxString& aProjDir, bool* flgChanged = NULL );
- wxString GetProjectDir( void );
-
/**
* Determine the full path of the given file name.
*
diff --git a/utils/kicad2step/pcb/kicadpcb.cpp b/utils/kicad2step/pcb/kicadpcb.cpp
index f6ea5edc6b..a61bc69f6a 100644
--- a/utils/kicad2step/pcb/kicadpcb.cpp
+++ b/utils/kicad2step/pcb/kicadpcb.cpp
@@ -32,8 +32,6 @@
#include <sexpr/sexpr_parser.h>
#include <wx/filename.h>
-#include <wx/log.h>
-#include <wx/stdpaths.h>
#include <wx/wxcrtvararg.h>
#include <memory>
@@ -58,10 +56,10 @@ KICADPCB::KICADPCB( const wxString& aPcbName )
KICADPCB::~KICADPCB()
{
- for( auto i : m_footprints )
+ for( KICADFOOTPRINT* i : m_footprints )
delete i;
- for( auto i : m_curves )
+ for( KICADCURVE* i : m_curves )
delete i;
delete m_pcb_model;
@@ -89,7 +87,6 @@ bool KICADPCB::ReadFile( const wxString& aFileName )
fname.Normalize();
m_filename = fname.GetFullPath();
- m_resolver.SetProjectDir( fname.GetPath() );
try
{