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

Eeschema, importFile: build the HTML report messages before displaying the dialog. 

Fixes #8507
https://gitlab.com/kicad/code/kicad/issues/8507
This commit is contained in:
jean-pierre charras 2021-05-29 10:23:11 +02:00
parent 4bb4606811
commit 37c31196f4
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/dialogs/wx_html_report_box.h
View File

@ -43,9 +43,21 @@ public:
void SetUnits( EDA_UNITS aUnits ) { m_units = aUnits; } void SetUnits( EDA_UNITS aUnits ) { m_units = aUnits; }
EDA_UNITS GetUnits() const override { return m_units; } EDA_UNITS GetUnits() const override { return m_units; }
/**
* In immediate mode, messages are flushed as they are added.
* Required for progress-related reports, but can be very slow for larger reports.
*/
void SetImmediateMode() { m_immediateMode = true; } void SetImmediateMode() { m_immediateMode = true; }
/**
* Build the HTML messages page.
* Call it if the immediate mode is not actived to be able to display them
*/
void Flush(); void Flush();
/**
* Delete the stored messages
*/
void Clear(); void Clear();
private: private:

3
eeschema/files-io.cpp
View File

@ -1118,7 +1118,10 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType )
Schematic().SetRoot( pi->Load( aFileName, &Schematic() ) ); Schematic().SetRoot( pi->Load( aFileName, &Schematic() ) );
if( reporter->m_Reporter->HasMessage() ) if( reporter->m_Reporter->HasMessage() )
{
reporter->m_Reporter->Flush(); // Build HTML messages
reporter->ShowModal(); reporter->ShowModal();
}
pi->SetReporter( &WXLOG_REPORTER::GetInstance() ); pi->SetReporter( &WXLOG_REPORTER::GetInstance() );
delete reporter; delete reporter;