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

Don't overload error dialog. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18195

(cherry picked from commit 441da8dfb6)
This commit is contained in:
Jeff Young 2024-06-24 22:47:42 +01:00
parent 5c2300022b
commit 7d79bebcc6
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/sim/simulator_frame.cpp
View File

@ -340,6 +340,22 @@ void SIMULATOR_FRAME::UpdateTitle()
} }
// Don't let the dialog grow too tall: you may not be able to get to the OK button
#define MAX_MESSAGES 20
void SIMULATOR_FRAME::showNetlistErrors( const wxString& aErrors )
{
wxArrayString lines = wxSplit( aErrors, '\n' );
if( lines.size() > MAX_MESSAGES )
{
lines.RemoveAt( MAX_MESSAGES, lines.size() - MAX_MESSAGES );
lines.Add( wxS( "..." ) );
}
DisplayErrorMessage( this, _( "Errors during netlist generation." ), wxJoin( lines, '\n' ) );
}
bool SIMULATOR_FRAME::LoadSimulator( const wxString& aSimCommand, unsigned aSimOptions ) bool SIMULATOR_FRAME::LoadSimulator( const wxString& aSimCommand, unsigned aSimOptions )
{ {
@ -355,7 +371,7 @@ bool SIMULATOR_FRAME::LoadSimulator( const wxString& aSimCommand, unsigned aSimO
if( !m_simulator->Attach( m_circuitModel, aSimCommand, aSimOptions, Prj().GetProjectPath(), if( !m_simulator->Attach( m_circuitModel, aSimCommand, aSimOptions, Prj().GetProjectPath(),
s_reporter ) ) s_reporter ) )
{ {
DisplayErrorMessage( this, _( "Errors during netlist generation.\n\n" ) + s_errors ); showNetlistErrors( s_errors );
return false; return false;
} }
@ -365,10 +381,12 @@ bool SIMULATOR_FRAME::LoadSimulator( const wxString& aSimCommand, unsigned aSimO
void SIMULATOR_FRAME::ReloadSimulator( const wxString& aSimCommand, unsigned aSimOptions ) void SIMULATOR_FRAME::ReloadSimulator( const wxString& aSimCommand, unsigned aSimOptions )
{ {
s_errors.clear();
if( !m_simulator->Attach( m_circuitModel, aSimCommand, aSimOptions, Prj().GetProjectPath(), if( !m_simulator->Attach( m_circuitModel, aSimCommand, aSimOptions, Prj().GetProjectPath(),
s_reporter ) ) s_reporter ) )
{ {
DisplayErrorMessage( this, _( "Errors during netlist generation.\n\n" ) + s_errors ); showNetlistErrors( s_errors );
} }
} }
@ -560,8 +578,7 @@ bool SIMULATOR_FRAME::EditAnalysis()
if( !m_circuitModel->ReadSchematicAndLibraries( NETLIST_EXPORTER_SPICE::OPTION_DEFAULT_FLAGS, if( !m_circuitModel->ReadSchematicAndLibraries( NETLIST_EXPORTER_SPICE::OPTION_DEFAULT_FLAGS,
s_reporter ) ) s_reporter ) )
{ {
DisplayErrorMessage( this, _( "Errors during netlist generation.\n\n" ) showNetlistErrors( s_errors );
+ s_errors );
} }
dlg.SetSimCommand( simTab->GetSimCommand() ); dlg.SetSimCommand( simTab->GetSimCommand() );

2
eeschema/sim/simulator_frame.h
View File

@ -194,6 +194,8 @@ private:
void setupUIConditions() override; void setupUIConditions() override;
void showNetlistErrors( const wxString& aErrors );
bool canCloseWindow( wxCloseEvent& aEvent ) override; bool canCloseWindow( wxCloseEvent& aEvent ) override;
void doCloseWindow() override; void doCloseWindow() override;