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

Handle inference of V7 symbol lib DC voltage/current sources. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15127
This commit is contained in:
Jeff Young 2023-07-07 16:22:29 +01:00
parent 534a3efce1
commit 30c2049977
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sim/sim_model.cpp
View File

@ -1342,7 +1342,7 @@ bool SIM_MODEL::InferSimModel( T_symbol& aSymbol, std::vector<T_field>* aFields,
}
if( ( ( *aDeviceType == wxT( "V" ) || *aDeviceType == wxT( "I" ) )
&& aModelType->IsEmpty() )
&& ( aModelType->IsEmpty() || *aModelType == wxT( "DC" ) ) )
||
( aDeviceType->IsEmpty()
&& aModelType->IsEmpty()

17
eeschema/sim/simulator_panel.cpp
View File

@ -628,15 +628,12 @@ void SIMULATOR_PANEL::rebuildSignalsGrid( wxString aFilter )
m_signalsGrid->ClearRows();
if( aFilter.IsEmpty() )
aFilter = wxS( "*" );
SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( GetCurrentPlotPanel() );
if( !plotPanel )
return;
EDA_COMBINED_MATCHER matcher( aFilter.Upper(), CTX_SIGNAL );
SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( GetCurrentPlotPanel() );
std::vector<wxString> signals;
int row = 0;
wxCHECK( plotPanel, /* void */ );
if( plotPanel->GetSimType() == ST_FFT )
{
@ -653,6 +650,12 @@ void SIMULATOR_PANEL::rebuildSignalsGrid( wxString aFilter )
signals.insert( signals.end(), m_signals.begin(), m_signals.end() );
}
if( aFilter.IsEmpty() )
aFilter = wxS( "*" );
EDA_COMBINED_MATCHER matcher( aFilter.Upper(), CTX_SIGNAL );
int row = 0;
for( const wxString& signal : signals )
{
if( matcher.Find( signal.Upper() ) )