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

Simulator: Ensure connectivity is up to date (incremental mode) before building netlist 

also: SIM_PLOT_FRAME::onShowNetlist(): verify all symbols are annotated.
This commit is contained in:
jean-pierre charras 2023-05-17 08:42:29 +02:00
parent d5bd1f5aea
commit a72fd0ebdd
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sim/sim_plot_frame.cpp
View File

@ -56,6 +56,7 @@
#include <wx/ffile.h> #include <wx/ffile.h>
#include <wx/filedlg.h> #include <wx/filedlg.h>
#include <wx_filename.h> #include <wx_filename.h>
#include <advanced_config.h> // for Incremental Connectivity option
SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond ) SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond )
@ -460,8 +461,14 @@ void SIM_PLOT_FRAME::StartSimulation( const wxString& aSimCommand )
wxString errors; wxString errors;
WX_STRING_REPORTER reporter( &errors ); WX_STRING_REPORTER reporter( &errors );
if( !m_schematicFrame->ReadyToNetlist( _( "Simulator requires a fully annotated schematic." ) ) if( !m_schematicFrame->ReadyToNetlist( _( "Simulator requires a fully annotated schematic." ) ) )
|| !m_simulator->Attach( m_circuitModel, reporter ) ) return;
// If we are using the new connectivity, make sure that we do a full-rebuild
if( ADVANCED_CFG::GetCfg().m_IncrementalConnectivity )
m_schematicFrame->RecalculateConnections( GLOBAL_CLEANUP );
if( !m_simulator->Attach( m_circuitModel, reporter ) )
{ {
DisplayErrorMessage( this, _( "Errors during netlist generation; simulation aborted.\n\n" ) DisplayErrorMessage( this, _( "Errors during netlist generation; simulation aborted.\n\n" )
+ errors ); + errors );
@ -1728,6 +1735,13 @@ void SIM_PLOT_FRAME::onShowNetlist( wxCommandEvent& event )
if( m_schematicFrame == nullptr || m_simulator == nullptr ) if( m_schematicFrame == nullptr || m_simulator == nullptr )
return; return;
if( !m_schematicFrame->ReadyToNetlist( _( "Simulator requires a fully annotated schematic." ) ) )
return;
// If we are using the new connectivity, make sure that we do a full-rebuild
if( ADVANCED_CFG::GetCfg().m_IncrementalConnectivity )
m_schematicFrame->RecalculateConnections( GLOBAL_CLEANUP );
wxString errors; wxString errors;
WX_STRING_REPORTER reporter( &errors ); WX_STRING_REPORTER reporter( &errors );
STRING_FORMATTER formatter; STRING_FORMATTER formatter;