Commit a90975d1 authored by Dick Hollenbeck's avatar Dick Hollenbeck

FP_LIB_TABLE::ROW::SetType() ensures sensible value of "KiCad" if nothing good comes in.

parent e0a0f596
...@@ -42,28 +42,21 @@ ...@@ -42,28 +42,21 @@
using namespace FP_LIB_TABLE_T; using namespace FP_LIB_TABLE_T;
FP_LIB_TABLE::FP_LIB_TABLE( FP_LIB_TABLE* aFallBackTable ) : void FP_LIB_TABLE::ROW::SetType( const wxString& aType )
fallBack( aFallBackTable )
{ {
// not copying fall back, simply search aFallBackTable separately type = IO_MGR::EnumFromStr( aType );
// if "nickName not found".
if( IO_MGR::PCB_FILE_T( -1 ) == type )
type = IO_MGR::KICAD;
} }
/* FP_LIB_TABLE::FP_LIB_TABLE( FP_LIB_TABLE* aFallBackTable ) :
void FP_LIB_TABLE::Paste( const FP_LIB_TABLE& aOther, int aDestNdx ) fallBack( aFallBackTable )
{ {
if( aDestNdx == -1 ) // not copying fall back, simply search aFallBackTable separately
aDestNdx = rows.size() - 1; // if "nickName not found".
else if( unsigned( aDestNdx ) >= rows.size() )
return; // bad caller.
else
{
rows.assign( aOther.rows.begin(), aOther.rows.end() );
}
} }
*/
void FP_LIB_TABLE::Parse( FP_LIB_TABLE_LEXER* in ) throw( IO_ERROR, PARSE_ERROR ) void FP_LIB_TABLE::Parse( FP_LIB_TABLE_LEXER* in ) throw( IO_ERROR, PARSE_ERROR )
......
...@@ -181,7 +181,7 @@ public: ...@@ -181,7 +181,7 @@ public:
* Function SetType * Function SetType
* changes the type represented by this row. * changes the type represented by this row.
*/ */
void SetType( const wxString& aType ) { type = IO_MGR::EnumFromStr( aType ); } void SetType( const wxString& aType );
/** /**
* Function GetFullURI * Function GetFullURI
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment