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

Prevent a crash when a spice SW_I lacks two pin net names 

Fixes KICAD-5D


(cherry picked from commit 2cc3d8e9bc)
This commit is contained in:
Marek Roszko 2023-02-12 22:22:44 -05:00 committed by Mark Roszko
parent 981b22ba49
commit b24ee1c44f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sim/sim_model_switch.cpp
View File

@ -29,7 +29,7 @@
std::string SPICE_GENERATOR_SWITCH::ItemLine( const SPICE_ITEM& aItem ) const
{
std::string result;
switch( m_model.GetType() )
{
case SIM_MODEL::TYPE::SW_V:
@ -42,6 +42,8 @@ std::string SPICE_GENERATOR_SWITCH::ItemLine( const SPICE_ITEM& aItem ) const
{
std::string vsourceName = fmt::format( "V__{}", aItem.refName );
wxCHECK_MSG( aItem.pinNetNames.size() >= 2, "", wxS( "Missing two pin net names for SW_I" ) );
// Current switches measure input current through a voltage source.
result.append( fmt::format( "{0} {1} 0\n", aItem.pinNetNames[0], aItem.pinNetNames[1] ) );
@ -52,7 +54,7 @@ std::string SPICE_GENERATOR_SWITCH::ItemLine( const SPICE_ITEM& aItem ) const
}
default:
wxFAIL_MSG( "Unhandled SIM_MODEL type in SIM_MODEL_SWITCH" );
wxFAIL_MSG( wxS( "Unhandled SIM_MODEL type in SIM_MODEL_SWITCH" ) );
break;
}
@ -68,7 +70,7 @@ std::string SPICE_GENERATOR_SWITCH::ItemParams() const
{
// The only instance param is "ic", which is positional.
std::string value = param.value->ToSpiceString();
if( value != "none" )
result.append( value );
}
@ -114,7 +116,7 @@ SIM_MODEL_SWITCH::SIM_MODEL_SWITCH( TYPE aType ) :
break;
default:
wxFAIL_MSG( "Unhandled SIM_MODEL type in SIM_MODEL_SWITCH" );
wxFAIL_MSG( wxS( "Unhandled SIM_MODEL type in SIM_MODEL_SWITCH" ) );
break;
}
}