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

Sim: Fix reading the legacy Spice_Node_Sequence field (2nd attempt) 

bd809bf31c was botched and broke QA tests,
this will fix the problem.
This commit is contained in:
Mikolaj Wielgus 2022-08-11 15:48:33 +02:00
parent fbc42bf569
commit 6d59fef9a5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sim/sim_model_spice.cpp
View File

@ -124,7 +124,7 @@ wxString SIM_MODEL_SPICE::GenerateSpiceItemLine( const wxString& aRefName,
void SIM_MODEL_SPICE::CreatePins( unsigned aSymbolPinCount ) void SIM_MODEL_SPICE::CreatePins( unsigned aSymbolPinCount )
{ {
for( unsigned i = 0; i < aSymbolPinCount; ++i ) for( unsigned i = 0; i < aSymbolPinCount; ++i )
AddPin( { "", PIN::NOT_CONNECTED } ); AddPin( { "", i + 1 } );
} }
@ -243,9 +243,17 @@ void SIM_MODEL_SPICE::readLegacyDataFields( unsigned aSymbolPinCount, const std:
} }
void SIM_MODEL_SPICE::parseLegacyPinsField( unsigned aSymbolPinCount, const wxString& aPinsField ) void SIM_MODEL_SPICE::parseLegacyPinsField( unsigned aSymbolPinCount,
const wxString& aLegacyPinsField )
{ {
tao::pegtl::string_input<> in( aPinsField.ToUTF8(), PINS_FIELD ); if( aLegacyPinsField == "" )
return;
// Initially set all pins to Not Connected to match the legacy behavior.
for( unsigned i = 0; i < GetPinCount(); ++i )
SetPinSymbolPinNumber( static_cast<int>( i ), PIN::NOT_CONNECTED );
tao::pegtl::string_input<> in( aLegacyPinsField.ToUTF8(), PINS_FIELD );
std::unique_ptr<tao::pegtl::parse_tree::node> root; std::unique_ptr<tao::pegtl::parse_tree::node> root;
try try
@ -261,7 +269,7 @@ void SIM_MODEL_SPICE::parseLegacyPinsField( unsigned aSymbolPinCount, const wxSt
for( unsigned i = 0; i < root->children.size(); ++i ) for( unsigned i = 0; i < root->children.size(); ++i )
{ {
SetPinSymbolPinNumber( std::stoi( root->children.at( i )->string() ) - 1, SetPinSymbolPinNumber( static_cast<int>( i ),
static_cast<int>( i + 1 ) ); std::stoi( root->children.at( i )->string() ) );
} }
} }

2
eeschema/sim/sim_model_spice.h
View File

@ -73,7 +73,7 @@ private:
template <typename T> template <typename T>
void readLegacyDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields ); void readLegacyDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields );
void parseLegacyPinsField( unsigned aSymbolPinCount, const wxString& aPinsField ); void parseLegacyPinsField( unsigned aSymbolPinCount, const wxString& aLegacyPinsField );
std::vector<std::unique_ptr<PARAM::INFO>> m_paramInfos; std::vector<std::unique_ptr<PARAM::INFO>> m_paramInfos;
}; };