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

Improve logic and error reporting of Kicad2Step file resolver.

This commit is contained in:
Jeff Young 2021-09-08 15:28:22 +01:00
parent 30c001265b
commit 0e96ac4d7b
2 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ bool S3D_RESOLVER::createPathList( void )
#ifdef DEBUG
wxLogTrace( trace3dResolver, " * [3D model] search paths:\n" );
for( const auto searchPath : m_Paths )
for( const SEARCH_PATH& searchPath : m_Paths )
wxLogTrace( trace3dResolver, " + '%s'\n", searchPath.m_Pathexp );
#endif
@ -294,14 +294,10 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
// in the case of absolute filenames we don't store a map item
if( !aFileName.StartsWith( "${" ) && !aFileName.StartsWith( "$(" )
&& !aFileName.StartsWith( ":" ) && tmpFN.IsAbsolute() )
&& tmpFN.IsAbsolute() && tmpFN.FileExists() )
{
tmpFN.Normalize();
if( tmpFN.FileExists() )
return tmpFN.GetFullPath();
return wxEmptyString;
return tmpFN.GetFullPath();
}
// this case covers full paths, leading expanded vars, and paths
@ -325,14 +321,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
// 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] File \"";
errmsg << aFileName << "\" not found\n";
ReportMessage( errmsg );
}
m_errflags |= ERRFLG_ENVPATH;
return wxEmptyString;
}
@ -367,11 +356,10 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
return tname;
}
}
// check the partial path relative to ${KICAD6_3DMODEL_DIR} (legacy behavior)
if( !tname.StartsWith( ":" ) )
if( !tname.Contains( ":" ) )
{
wxFileName fpath;
wxString fullPath( "${KICAD6_3DMODEL_DIR}" );
@ -386,35 +374,26 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
m_NameMap.insert( std::pair< wxString, wxString > ( aFileName, tname ) );
return tname;
}
}
// ${ENV_VAR} paths have already been checked; skip them
while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
++sPL;
// at this point the filename must contain an alias or else it is invalid
wxString alias; // the alias portion of the short filename
wxString relpath; // the path relative to the alias
if( !SplitAlias( tname, alias, relpath ) )
{
if( !( m_errflags & ERRFLG_RELPATH ) )
{
// this can happen if the file was intended to be relative to
// ${KICAD6_3DMODEL_DIR} but ${KICAD6_3DMODEL_DIR} not set or incorrect.
m_errflags |= ERRFLG_RELPATH;
wxString errmsg = "[3D File Resolver] No such path";
errmsg.append( "\n" );
errmsg.append( tname );
wxLogTrace( trace3dResolver, "%s\n", errmsg.ToUTF8() );
}
// this can happen if the file was intended to be relative to ${KICAD6_3DMODEL_DIR}
// but ${KICAD6_3DMODEL_DIR} is not set or is incorrect.
m_errflags |= ERRFLG_RELPATH;
return wxEmptyString;
}
while( sPL != ePL )
{
// ${ENV_VAR} paths have already been checked; skip them
if( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) )
continue;
if( !sPL->m_Alias.Cmp( alias ) && !sPL->m_Pathexp.empty() )
{
wxFileName fpath( wxFileName::DirName( sPL->m_Pathexp ) );
@ -438,14 +417,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
++sPL;
}
if( !( m_errflags & ERRFLG_ALIAS ) )
{
m_errflags |= ERRFLG_ALIAS;
wxLogTrace( trace3dResolver,
wxT( "[3D File Resolver] No such path; ensure the path alias is defined %s" ),
tname.substr( 1 ) );
}
m_errflags |= ERRFLG_ALIAS;
return wxEmptyString;
}

25
utils/kicad2step/pcb/kicadfootprint.cpp
View File

@ -33,6 +33,7 @@
#include <sexpr/sexpr.h>
#include <wx/log.h>
#include <wx/filename.h>
#include <iostream>
#include <limits>
@ -427,19 +428,39 @@ bool KICADFOOTPRINT::ComposePCB( class PCBMODEL* aPCB, S3D_RESOLVER* resolver,
for( KICADMODEL* i : m_models )
{
wxString mname = wxString::FromUTF8Unchecked( i->m_modelname.c_str() );
if( mname.empty() )
{
ReportMessage( wxString::Format( "No model defined for component %s.\n",
m_refdes ) );
return false;
}
mname = resolver->ResolvePath( mname );
if( !wxFileName::FileExists( mname ) )
{
ReportMessage( wxString::Format( "Could not add component %s\n"
"File not found: %s\n ",
m_refdes,
mname ) );
return false;
}
std::string fname( resolver->ResolvePath( mname ).ToUTF8() );
try
{
if( aPCB->AddComponent( fname, m_refdes, LAYER_BOTTOM == m_side ? true : false,
newpos, m_rotation, i->m_offset, i->m_rotation, i->m_scale, aSubstituteModels ) )
newpos, m_rotation, i->m_offset, i->m_rotation, i->m_scale,
aSubstituteModels ) )
{
hasdata = true;
}
}
catch( const Standard_Failure& e)
{
ReportMessage( wxString::Format( "could not add component %s\n"
ReportMessage( wxString::Format( "Could not add component %s\n"
"Open CASCADE error: %s\n ",
m_refdes,
e.GetMessageString() ) );