diff --git a/eeschema/dialog_erc.cpp b/eeschema/dialog_erc.cpp
index db90e7f1c8..71e875d0fe 100644
--- a/eeschema/dialog_erc.cpp
+++ b/eeschema/dialog_erc.cpp
@@ -78,7 +78,7 @@ void DIALOG_ERC::OnEraseDrcMarkersClick( wxCommandEvent& event )
*/
{
DeleteAllMarkers( MARK_ERC );
- m_MessagesList->ClearList();
+ m_MarkersList->ClearList();
m_Parent->DrawPanel->Refresh();
}
@@ -101,23 +101,25 @@ void DIALOG_ERC::OnResetMatrixClick( wxCommandEvent& event )
void DIALOG_ERC::OnErcCmpClick( wxCommandEvent& event )
{
wxBusyCursor();
+ m_MarkersList->Clear();
m_MessagesList->Clear();
- wxSafeYield(); // m_MessagesList must be redraw
+ wxSafeYield(); // m_MarkersList must be redraw
wxArrayString messageList;
TestErc( &messageList );
-#warning m_MessagesList->Append(messageList);
+ for ( unsigned ii = 0; ii < messageList.GetCount(); ii++ )
+ m_MessagesList->AppendText(messageList[ii]);
}
// Double click on a marker info:
void DIALOG_ERC::OnLeftDClickMarkersList( wxCommandEvent& event )
{
- int index = m_MessagesList->GetSelection();
+ int index = m_MarkersList->GetSelection();
if( index < 0 )
return;
- const MARKER_SCH* marker = m_MessagesList->GetItem( (unsigned) index );
+ const MARKER_SCH* marker = m_MarkersList->GetItem( (unsigned) index );
EndModal( 1 );
@@ -294,7 +296,7 @@ void DIALOG_ERC::DisplayERC_MarkersList()
{
EDA_SheetList SheetList;
- m_MessagesList->ClearList();
+ m_MarkersList->ClearList();
for( DrawSheetPath* Sheet = SheetList.GetFirst(); Sheet != NULL; Sheet = SheetList.GetNext() )
{
@@ -314,8 +316,8 @@ void DIALOG_ERC::DisplayERC_MarkersList()
// wxString msg;
// msg.Printf( _( "sheet %s\n" ), Sheet->PathHumanReadable().GetData() );
// msg += Marker->GetReporter().ShowHtml();
-// m_MessagesList->Append( msg );
- m_MessagesList->AppendToList( Marker );
+// m_MarkersList->Append( msg );
+ m_MarkersList->AppendToList( Marker );
}
}
}
diff --git a/eeschema/dialog_erc.h b/eeschema/dialog_erc.h
index 0d855aa342..a16ec1b608 100644
--- a/eeschema/dialog_erc.h
+++ b/eeschema/dialog_erc.h
@@ -1,5 +1,4 @@
/////////////////////////////////////////////////////////////////////////////
-
// Name: dialog_erc.h
// Author: jean-pierre Charras
// Licence: GPL
diff --git a/eeschema/dialog_erc_base.cpp b/eeschema/dialog_erc_base.cpp
index 6cc49bb990..e78f52858a 100644
--- a/eeschema/dialog_erc_base.cpp
+++ b/eeschema/dialog_erc_base.cpp
@@ -68,8 +68,19 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
bupperSizer->Add( sdiagSizer, 0, 0, 5 );
+ wxBoxSizer* bSizeMessages;
+ bSizeMessages = new wxBoxSizer( wxVERTICAL );
- bupperSizer->Add( 10, 10, 1, wxEXPAND, 5 );
+ m_titleMessages = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_titleMessages->Wrap( -1 );
+ bSizeMessages->Add( m_titleMessages, 0, wxRIGHT|wxLEFT, 5 );
+
+ m_MessagesList = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+ m_MessagesList->SetMinSize( wxSize( 300,-1 ) );
+
+ bSizeMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 );
+
+ bupperSizer->Add( bSizeMessages, 1, wxEXPAND, 5 );
wxBoxSizer* bbuttonsSizer;
bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
@@ -94,14 +105,14 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
m_staticline2 = new wxStaticLine( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bercSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
- m_textMessage = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_textMessage->Wrap( -1 );
- bercSizer->Add( m_textMessage, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+ m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Markers:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_textMarkers->Wrap( -1 );
+ bercSizer->Add( m_textMarkers, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
- m_MessagesList = new ERC_HTML_LISTBOX( m_PanelERC, ID_MAKER_HTMLLISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
- m_MessagesList->SetMinSize( wxSize( 500,350 ) );
+ m_MarkersList = new ERC_HTML_LISTBOX( m_PanelERC, ID_MAKER_HTMLLISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, 0|wxSIMPLE_BORDER );
+ m_MarkersList->SetMinSize( wxSize( 500,350 ) );
- bercSizer->Add( m_MessagesList, 1, wxALL|wxEXPAND, 5 );
+ bercSizer->Add( m_MarkersList, 1, wxALL|wxEXPAND, 5 );
m_PanelERC->SetSizer( bercSizer );
m_PanelERC->Layout();
diff --git a/eeschema/dialog_erc_base.fbp b/eeschema/dialog_erc_base.fbp
index 897776a965..5156df1ded 100644
--- a/eeschema/dialog_erc_base.fbp
+++ b/eeschema/dialog_erc_base.fbp
@@ -523,10 +523,117 @@
5
wxEXPAND
1
-