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

Union workbook sim commands with any defined on schematic. 

Fixes https://gitlab.com/kicad/code/kicad/issues/14215
This commit is contained in:
Jeff Young 2023-03-10 21:32:16 +00:00
parent 6d29088668
commit 5041bddc3b
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eeschema/sim/simulator_frame.cpp
View File

@ -2167,6 +2167,35 @@ bool SIMULATOR_FRAME::LoadWorkbook( const wxString& aPath )
LoadSimulator();
wxString schTextSimCommand = m_circuitModel->GetSchTextSimCommand().Lower();
SIM_TYPE schTextSimType = NGSPICE_CIRCUIT_MODEL::CommandToSimType( schTextSimCommand );
if( schTextSimType != ST_UNKNOWN )
{
bool found = false;
for( int ii = 0; ii < (int) m_plotNotebook->GetPageCount(); ++ii )
{
auto* plot = dynamic_cast<const SIM_PANEL_BASE*>( m_plotNotebook->GetPage( ii ) );
if( plot && plot->GetType() == schTextSimType )
{
if( schTextSimType == ST_DC )
{
wxString plotSimCommand = plot->GetSimCommand().Lower();
found = plotSimCommand.GetChar( 4 ) == schTextSimCommand.GetChar( 4 );
}
else
{
found = true;
}
}
}
if( !found )
NewPlotPanel( schTextSimCommand, m_circuitModel->GetSimOptions() );
}
rebuildSignalsList();
rebuildSignalsGrid( m_filter->GetValue() );
@ -2444,9 +2473,8 @@ bool SIMULATOR_FRAME::EditSimCommand()
if( !m_circuitModel->ReadSchematicAndLibraries( NETLIST_EXPORTER_SPICE::OPTION_DEFAULT_FLAGS,
reporter ) )
{
DisplayErrorMessage( this, _( "Errors during netlist generation; simulation aborted.\n\n" )
DisplayErrorMessage( this, _( "Errors during netlist generation.\n\n" )
+ errors );
return false;
}
if( m_plotNotebook->GetPageIndex( plotPanelWindow ) != wxNOT_FOUND )