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

Count head and tail lists as well. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6461
This commit is contained in:
Jeff Young 2020-11-23 23:54:34 +00:00
parent c67c13bc1d
commit 78b505f36a
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/dialogs/wx_html_report_panel.cpp
View File

@ -158,9 +158,14 @@ int WX_HTML_REPORT_PANEL::Count( int severityMask )
{
int count = 0;
for( const REPORT_LINE& reportLine : m_report )
for( const auto& reportLineArray : { m_report, m_reportHead, m_reportTail } )
{
for( const REPORT_LINE& reportLine : reportLineArray )
{
if( severityMask & reportLine.severity )
count++;
}
}
return count;
}

8
eeschema/dialogs/dialog_update_from_pcb.cpp
View File

@ -32,6 +32,7 @@
DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB_SAVED_STATE
DIALOG_UPDATE_FROM_PCB::s_savedDialogState{ true, true, true, true, false };
DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
: DIALOG_UPDATE_FROM_PCB_BASE( aParent ),
m_frame( aParent ),
@ -69,6 +70,7 @@ DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
finishDialogSettings();
}
void DIALOG_UPDATE_FROM_PCB::updateData()
{
bool successfulRun = false;
@ -90,16 +92,19 @@ void DIALOG_UPDATE_FROM_PCB::updateData()
m_messagePanel->Flush( false );
}
bool DIALOG_UPDATE_FROM_PCB::TransferDataToWindow()
{
updateData();
return true;
}
DIALOG_UPDATE_FROM_PCB::~DIALOG_UPDATE_FROM_PCB()
{
}
void DIALOG_UPDATE_FROM_PCB::OnOptionChanged( wxCommandEvent& event )
{
if( event.GetEventObject() == m_cbRelinkFootprints )
@ -130,6 +135,7 @@ void DIALOG_UPDATE_FROM_PCB::OnOptionChanged( wxCommandEvent& event )
s_savedDialogState.UpdateNetNames = m_cbUpdateNetNames->GetValue();
}
void DIALOG_UPDATE_FROM_PCB::OnUpdateClick( wxCommandEvent& event )
{
std::string netlist;
@ -155,5 +161,5 @@ void DIALOG_UPDATE_FROM_PCB::OnUpdateClick( wxCommandEvent& event )
backAnno.PushNewLinksToPCB();
}
m_messagePanel->Flush( true );
m_messagePanel->Flush( false );
}

1
eeschema/tools/backannotate.cpp
View File

@ -85,6 +85,7 @@ bool BACK_ANNOTATE::BackAnnotateSymbols( const std::string& aNetlist )
return true;
}
bool BACK_ANNOTATE::FetchNetlistFromPCB( std::string& aNetlist )
{
if( Kiface().IsSingle() )