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

Create and use a LIB_PIN constructor to remove hot path during symbol table loading

This commit is contained in:
Marek Roszko 2020-09-13 10:54:19 -04:00 committed by Mark Roszko
parent b439c169ff
commit f47d81af85
3 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/lib_pin.cpp
View File

@ -94,13 +94,12 @@ static int externalPinDecoSize( RENDER_SETTINGS* aSettings, const LIB_PIN &aPin
LIB_PIN::LIB_PIN( LIB_PART* aParent ) :
LIB_ITEM( LIB_PIN_T, aParent )
LIB_ITEM( LIB_PIN_T, aParent ),
m_orientation( PIN_RIGHT ),
m_shape( GRAPHIC_PINSHAPE::LINE ),
m_type( ELECTRICAL_PINTYPE::PT_UNSPECIFIED ),
m_attributes( 0 )
{
m_orientation = PIN_RIGHT; // Pin orient: Up, Down, Left, Right
m_type = ELECTRICAL_PINTYPE::PT_UNSPECIFIED; // electrical type of pin
m_shape = GRAPHIC_PINSHAPE::LINE;
m_attributes = 0; // bit 0 != 0: pin invisible
// Use the application settings for pin sizes if exists.
// pgm can be nullptr when running a shared lib from a script, not from a kicad appl
PGM_BASE* pgm = PgmOrNull();
@ -121,6 +120,26 @@ LIB_PIN::LIB_PIN( LIB_PART* aParent ) :
}
LIB_PIN::LIB_PIN( LIB_PART* aParent, const wxString& aName, const wxString& aNumber,
int aOrientation, ELECTRICAL_PINTYPE aPinType, int aLength, int aNameTextSize,
int aNumTextSize, int aConvert, const wxPoint& aPos, int aUnit ) :
LIB_ITEM( LIB_PIN_T, aParent ),
m_position( aPos ),
m_length( aLength ),
m_orientation( aOrientation ),
m_shape( GRAPHIC_PINSHAPE::LINE ),
m_type( aPinType ),
m_attributes( 0 ),
m_numTextSize( aNumTextSize ),
m_nameTextSize( aNameTextSize )
{
SetName( aName );
SetNumber( aNumber );
SetUnit( aUnit );
SetConvert( aConvert );
}
bool LIB_PIN::HitTest( const wxPoint& aPosition, int aAccuracy ) const
{
EDA_RECT rect = GetBoundingBox();

4
eeschema/lib_pin.h
View File

@ -202,6 +202,10 @@ public:
LIB_PIN( LIB_PART* aParent );
LIB_PIN( LIB_PART* aParent, const wxString& aName, const wxString& aNumber, int aOrientation,
ELECTRICAL_PINTYPE aPinType, int aLength, int aNameTextSize, int aNumTextSize,
int aConvert, const wxPoint& aPos, int aUnit );
// Do not create a copy constructor. The one generated by the compiler is adequate.
#if defined(DEBUG)

49
eeschema/sch_legacy_plugin.cpp
View File

@ -3447,7 +3447,8 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
wxCHECK_MSG( strCompare( "X", line, &line ), NULL, "Invalid LIB_PIN definition" );
LIB_PIN* pin = new LIB_PIN( aPart.get() );
wxString name;
wxString number;
size_t pos = 2; // "X" plus ' ' space character.
wxString tmp;
@ -3458,11 +3459,11 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
SCH_PARSE_ERROR( "invalid pin definition", aReader, line );
tmp = tokens.GetNextToken();
pin->SetName( tmp );
name = tmp;
pos += tmp.size() + 1;
tmp = tokens.GetNextToken();
pin->SetNumber( tmp );
number = tmp ;
pos += tmp.size() + 1;
long num;
@ -3485,7 +3486,6 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
pos += tmp.size() + 1;
position.y = Mils2Iu( (int) num );
pin->SetPosition( position );
tmp = tokens.GetNextToken();
@ -3494,7 +3494,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetLength( Mils2Iu( (int) num ) );
int length = Mils2Iu( (int) num );
tmp = tokens.GetNextToken();
@ -3504,7 +3504,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetOrientation( tmp[0] );
int orientation = tmp[0];
tmp = tokens.GetNextToken();
@ -3513,7 +3513,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetNumberTextSize( Mils2Iu( (int) num ) );
int numberTextSize = Mils2Iu( (int) num );
tmp = tokens.GetNextToken();
@ -3522,7 +3522,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetNameTextSize( Mils2Iu( (int) num ) );
int nameTextSize = Mils2Iu( (int) num );
tmp = tokens.GetNextToken();
@ -3531,7 +3531,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetUnit( (int) num );
int unit = (int) num;
tmp = tokens.GetNextToken();
@ -3540,7 +3540,7 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
aReader.LineNumber(), pos );
pos += tmp.size() + 1;
pin->SetConvert( (int) num );
int convert = (int) num;
tmp = tokens.GetNextToken();
@ -3550,27 +3550,30 @@ LIB_PIN* SCH_LEGACY_PLUGIN_CACHE::loadPin( std::unique_ptr<LIB_PART>& aPart,
pos += tmp.size() + 1;
char type = tmp[0];
wxString attributes;
ELECTRICAL_PINTYPE pinType;
switch( type )
{
case 'I': pin->SetType( ELECTRICAL_PINTYPE::PT_INPUT ); break;
case 'O': pin->SetType( ELECTRICAL_PINTYPE::PT_OUTPUT ); break;
case 'B': pin->SetType( ELECTRICAL_PINTYPE::PT_BIDI ); break;
case 'T': pin->SetType( ELECTRICAL_PINTYPE::PT_TRISTATE ); break;
case 'P': pin->SetType( ELECTRICAL_PINTYPE::PT_PASSIVE ); break;
case 'U': pin->SetType( ELECTRICAL_PINTYPE::PT_UNSPECIFIED ); break;
case 'W': pin->SetType( ELECTRICAL_PINTYPE::PT_POWER_IN ); break;
case 'w': pin->SetType( ELECTRICAL_PINTYPE::PT_POWER_OUT ); break;
case 'C': pin->SetType( ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR ); break;
case 'E': pin->SetType( ELECTRICAL_PINTYPE::PT_OPENEMITTER ); break;
case 'N': pin->SetType( ELECTRICAL_PINTYPE::PT_NC ); break;
case 'I': pinType = ELECTRICAL_PINTYPE::PT_INPUT; break;
case 'O': pinType = ELECTRICAL_PINTYPE::PT_OUTPUT; break;
case 'B': pinType = ELECTRICAL_PINTYPE::PT_BIDI; break;
case 'T': pinType = ELECTRICAL_PINTYPE::PT_TRISTATE; break;
case 'P': pinType = ELECTRICAL_PINTYPE::PT_PASSIVE; break;
case 'U': pinType = ELECTRICAL_PINTYPE::PT_UNSPECIFIED; break;
case 'W': pinType = ELECTRICAL_PINTYPE::PT_POWER_IN; break;
case 'w': pinType = ELECTRICAL_PINTYPE::PT_POWER_OUT; break;
case 'C': pinType = ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR; break;
case 'E': pinType = ELECTRICAL_PINTYPE::PT_OPENEMITTER; break;
case 'N': pinType = ELECTRICAL_PINTYPE::PT_NC; break;
default:
THROW_PARSE_ERROR( "unknown pin type", aReader.GetSource(), aReader.Line(),
aReader.LineNumber(), pos );
}
LIB_PIN* pin = new LIB_PIN( aPart.get(), name, number, orientation, pinType, length,
nameTextSize, numberTextSize, convert, position, unit );
// Optional
if( tokens.HasMoreTokens() ) /* Special Symbol defined */
{