Skip to content

K
kicad-source-mirror
Commit 87aba606 authored by Mark Roszko's avatar Mark Roszko
Browse files
Options

Tweak the ERC dialog a bit. 

Fix dialog title to be "Electrical Rules Checker" to match everywhere else.
Fix all usages of "Erc" to "ERC" consistently.
Move action buttons to bottom of dialog, make Del Markers actually say Delete Markers.
Add tooltips to ERC options matrix buttons to indicate what their current state is, for newb friendliness.
Cleanup ERC options code that for some reason decided to delete the button and recreate it instead of just updating it's bitmap directly.
Rename "Test Erc" to "Run" because you are running ERC and not testing it.
Fix improper usage of SetLabel on a wxTextCtrl instead of SetValue so the ERC totals now work!
parent 8a2eecf4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 383 additions and 376 deletions
eeschema/dialogs/dialog_erc.cpp
View file @ 87aba606
...@@ -93,13 +93,13 @@ void DIALOG_ERC::Init() ...@@ -93,13 +93,13 @@ void DIALOG_ERC::Init()
wxString num; wxString num;
num.Printf( wxT( "%d" ), markers ); num.Printf( wxT( "%d" ), markers );
m_TotalErrCount->SetLabel( num ); m_TotalErrCount->SetValue( num );
num.Printf( wxT( "%d" ), markers - warnings ); num.Printf( wxT( "%d" ), markers - warnings );
m_LastErrCount->SetLabel( num ); m_LastErrCount->SetValue( num );
num.Printf( wxT( "%d" ), warnings ); num.Printf( wxT( "%d" ), warnings );
m_LastWarningCount->SetLabel( num ); m_LastWarningCount->SetValue( num );
DisplayERC_MarkersList(); DisplayERC_MarkersList();
...@@ -289,34 +289,49 @@ void DIALOG_ERC::ReBuildMatrixPanel() ...@@ -289,34 +289,49 @@ void DIALOG_ERC::ReBuildMatrixPanel()
} }
int event_id = ID_MATRIX_0 + ii + ( jj * PIN_NMAX ); int event_id = ID_MATRIX_0 + ii + ( jj * PIN_NMAX );
BITMAP_DEF bitmap_butt = erc_green_xpm;
delete m_buttonList[ii][jj];
m_buttonList[ii][jj] = new wxBitmapButton( m_matrixPanel,
event_id,
KiBitmap( bitmap_butt ),
wxPoint( x, y ) );
setDRCMatrixButtonState( m_buttonList[ii][jj], diag );
}
}
m_initialized = true;
}
void DIALOG_ERC::setDRCMatrixButtonState( wxBitmapButton *aButton, int aState )
{
BITMAP_DEF bitmap_butt = NULL; BITMAP_DEF bitmap_butt = NULL;
wxString tooltip;
// Add button on matrix switch( aState )
switch( diag )
{ {
case OK: case OK:
bitmap_butt = erc_green_xpm; bitmap_butt = erc_green_xpm;
tooltip = _("No error or warning");
break; break;
case WAR: case WAR:
bitmap_butt = ercwarn_xpm ; bitmap_butt = ercwarn_xpm;
tooltip = _("Generate warning");
break; break;
default:
case ERR: case ERR:
bitmap_butt = ercerr_xpm; bitmap_butt = ercerr_xpm;
tooltip = _("Generate error");
break; break;
} }
delete m_buttonList[ii][jj]; if( bitmap_butt )
m_buttonList[ii][jj] = new wxBitmapButton( m_matrixPanel, {
event_id, aButton->SetBitmap(KiBitmap( bitmap_butt ));
KiBitmap( bitmap_butt ), aButton->SetToolTip(tooltip);
wxPoint( x, y ) );
}
} }
m_initialized = true;
} }
...@@ -359,7 +374,6 @@ void DIALOG_ERC::ResetDefaultERCDiag( wxCommandEvent& event ) ...@@ -359,7 +374,6 @@ void DIALOG_ERC::ResetDefaultERCDiag( wxCommandEvent& event )
void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event ) void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
{ {
int id, level, ii, x, y; int id, level, ii, x, y;
BITMAP_DEF new_bitmap_butt = NULL;
wxPoint pos; wxPoint pos;
id = event.GetId(); id = event.GetId();
...@@ -371,33 +385,25 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event ) ...@@ -371,33 +385,25 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
level = DiagErc[y][x]; level = DiagErc[y][x];
//change to the next error level
switch( level ) switch( level )
{ {
case OK: case OK:
level = WAR; level = WAR;
new_bitmap_butt = ercwarn_xpm;
break; break;
case WAR: case WAR:
level = ERR; level = ERR;
new_bitmap_butt = ercerr_xpm;
break; break;
case ERR: case ERR:
level = OK; level = OK;
new_bitmap_butt = erc_green_xpm;
break; break;
} }
if( new_bitmap_butt ) setDRCMatrixButtonState( butt, level);
{
delete butt;
butt = new wxBitmapButton( m_matrixPanel, id,
KiBitmap( new_bitmap_butt ), pos );
m_buttonList[y][x] = butt;
DiagErc[y][x] = DiagErc[x][y] = level; DiagErc[y][x] = DiagErc[x][y] = level;
}
} }
...@@ -520,13 +526,13 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList ) ...@@ -520,13 +526,13 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
int warnings = screens.GetMarkerCount( WAR ); int warnings = screens.GetMarkerCount( WAR );
num.Printf( wxT( "%d" ), markers ); num.Printf( wxT( "%d" ), markers );
m_TotalErrCount->SetLabel( num ); m_TotalErrCount->SetValue( num );
num.Printf( wxT( "%d" ), markers - warnings ); num.Printf( wxT( "%d" ), markers - warnings );
m_LastErrCount->SetLabel( num ); m_LastErrCount->SetValue( num );
num.Printf( wxT( "%d" ), warnings ); num.Printf( wxT( "%d" ), warnings );
m_LastWarningCount->SetLabel( num ); m_LastWarningCount->SetValue( num );
// Display diags: // Display diags:
DisplayERC_MarkersList(); DisplayERC_MarkersList();
......
eeschema/dialogs/dialog_erc.h
View file @ 87aba606
...@@ -61,6 +61,7 @@ private: ...@@ -61,6 +61,7 @@ private:
void ResetDefaultERCDiag( wxCommandEvent& event ); void ResetDefaultERCDiag( wxCommandEvent& event );
void ChangeErrorLevel( wxCommandEvent& event ); void ChangeErrorLevel( wxCommandEvent& event );
void ReBuildMatrixPanel(); void ReBuildMatrixPanel();
void setDRCMatrixButtonState( wxBitmapButton *aButton, int aState );
}; };
......
eeschema/dialogs/dialog_erc_base.cpp
View file @ 87aba606
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Jun 6 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, DIALOG_SHIM ) BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, DIALOG_SHIM )
EVT_CLOSE( DIALOG_ERC_BASE::_wxFB_OnCloseErcDialog ) EVT_CLOSE( DIALOG_ERC_BASE::_wxFB_OnCloseErcDialog )
EVT_BUTTON( ID_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick )
EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )
EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnButtonCloseClick )
EVT_LISTBOX( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftClickMarkersList ) EVT_LISTBOX( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftClickMarkersList )
EVT_LISTBOX_DCLICK( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftDblClickMarkersList ) EVT_LISTBOX_DCLICK( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftDblClickMarkersList )
EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )
EVT_BUTTON( ID_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick )
EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnButtonCloseClick )
EVT_BUTTON( ID_RESET_MATRIX, DIALOG_ERC_BASE::_wxFB_OnResetMatrixClick ) EVT_BUTTON( ID_RESET_MATRIX, DIALOG_ERC_BASE::_wxFB_OnResetMatrixClick )
END_EVENT_TABLE() END_EVENT_TABLE()
...@@ -37,7 +37,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin ...@@ -37,7 +37,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
bupperSizer = new wxBoxSizer( wxHORIZONTAL ); bupperSizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBoxSizer* sdiagSizer; wxStaticBoxSizer* sdiagSizer;
sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("Erc report:") ), wxVERTICAL ); sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL );
wxGridSizer* gSizeDiag; wxGridSizer* gSizeDiag;
gSizeDiag = new wxGridSizer( 3, 2, 0, 0 ); gSizeDiag = new wxGridSizer( 3, 2, 0, 0 );
...@@ -86,24 +86,8 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin ...@@ -86,24 +86,8 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
bupperSizer->Add( bSizerMessages, 1, wxEXPAND, 5 ); bupperSizer->Add( bSizerMessages, 1, wxEXPAND, 5 );
wxBoxSizer* bbuttonsSizer;
bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
m_buttonERC = new wxButton( m_PanelERC, ID_ERC_CMP, _("&Test Erc"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonERC->SetDefault();
bbuttonsSizer->Add( m_buttonERC, 0, wxALL|wxEXPAND, 5 );
m_buttondelmarkers = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Del Markers"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 );
m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );
bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
bercSizer->Add( bupperSizer, 0, wxALL|wxEXPAND, 5 );
bercSizer->Add( bupperSizer, 0, wxEXPAND, 5 );
m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error list:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error list:"), wxDefaultPosition, wxDefaultSize, 0 );
m_textMarkers->Wrap( -1 ); m_textMarkers->Wrap( -1 );
...@@ -114,6 +98,22 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin ...@@ -114,6 +98,22 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bbuttonsSizer;
bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_buttondelmarkers = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 );
m_buttonERC = new wxButton( m_PanelERC, ID_ERC_CMP, _("&Run"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonERC->SetDefault();
bbuttonsSizer->Add( m_buttonERC, 0, wxALL|wxEXPAND, 5 );
m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );
bercSizer->Add( bbuttonsSizer, 0, wxALIGN_RIGHT, 5 );
m_PanelERC->SetSizer( bercSizer ); m_PanelERC->SetSizer( bercSizer );
m_PanelERC->Layout(); m_PanelERC->Layout();
......
eeschema/dialogs/dialog_erc_base.fbp
View file @ 87aba606
This diff is collapsed.
eeschema/dialogs/dialog_erc_base.h
View file @ 87aba606
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Jun 6 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -25,8 +25,8 @@ class ERC_HTML_LISTBOX; ...@@ -25,8 +25,8 @@ class ERC_HTML_LISTBOX;
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/button.h>
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/button.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
...@@ -46,20 +46,20 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM ...@@ -46,20 +46,20 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
// Private event handlers // Private event handlers
void _wxFB_OnCloseErcDialog( wxCloseEvent& event ){ OnCloseErcDialog( event ); } void _wxFB_OnCloseErcDialog( wxCloseEvent& event ){ OnCloseErcDialog( event ); }
void _wxFB_OnErcCmpClick( wxCommandEvent& event ){ OnErcCmpClick( event ); }
void _wxFB_OnEraseDrcMarkersClick( wxCommandEvent& event ){ OnEraseDrcMarkersClick( event ); }
void _wxFB_OnButtonCloseClick( wxCommandEvent& event ){ OnButtonCloseClick( event ); }
void _wxFB_OnLeftClickMarkersList( wxCommandEvent& event ){ OnLeftClickMarkersList( event ); } void _wxFB_OnLeftClickMarkersList( wxCommandEvent& event ){ OnLeftClickMarkersList( event ); }
void _wxFB_OnLeftDblClickMarkersList( wxCommandEvent& event ){ OnLeftDblClickMarkersList( event ); } void _wxFB_OnLeftDblClickMarkersList( wxCommandEvent& event ){ OnLeftDblClickMarkersList( event ); }
void _wxFB_OnEraseDrcMarkersClick( wxCommandEvent& event ){ OnEraseDrcMarkersClick( event ); }
void _wxFB_OnErcCmpClick( wxCommandEvent& event ){ OnErcCmpClick( event ); }
void _wxFB_OnButtonCloseClick( wxCommandEvent& event ){ OnButtonCloseClick( event ); }
void _wxFB_OnResetMatrixClick( wxCommandEvent& event ){ OnResetMatrixClick( event ); } void _wxFB_OnResetMatrixClick( wxCommandEvent& event ){ OnResetMatrixClick( event ); }
protected: protected:
enum enum
{ {
ID_ERC_CMP = 1000, ID_MAKER_HTMLLISTBOX = 1000,
ID_ERASE_DRC_MARKERS, ID_ERASE_DRC_MARKERS,
ID_MAKER_HTMLLISTBOX, ID_ERC_CMP,
ID_RESET_MATRIX ID_RESET_MATRIX
}; };
...@@ -74,28 +74,28 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM ...@@ -74,28 +74,28 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
wxCheckBox* m_WriteResultOpt; wxCheckBox* m_WriteResultOpt;
wxStaticText* m_titleMessages; wxStaticText* m_titleMessages;
wxTextCtrl* m_MessagesList; wxTextCtrl* m_MessagesList;
wxButton* m_buttonERC;
wxButton* m_buttondelmarkers;
wxButton* m_buttonClose;
wxStaticText* m_textMarkers; wxStaticText* m_textMarkers;
ERC_HTML_LISTBOX* m_MarkersList; ERC_HTML_LISTBOX* m_MarkersList;
wxButton* m_buttondelmarkers;
wxButton* m_buttonERC;
wxButton* m_buttonClose;
wxPanel* m_PanelERCOptions; wxPanel* m_PanelERCOptions;
wxButton* m_ResetOptButton; wxButton* m_ResetOptButton;
wxPanel* m_matrixPanel; wxPanel* m_matrixPanel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); } virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); }
virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnLeftClickMarkersList( wxCommandEvent& event ) { event.Skip(); } virtual void OnLeftClickMarkersList( wxCommandEvent& event ) { event.Skip(); }
virtual void OnLeftDblClickMarkersList( wxCommandEvent& event ) { event.Skip(); } virtual void OnLeftDblClickMarkersList( wxCommandEvent& event ) { event.Skip(); }
virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EESchema Erc"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_ERC_BASE(); ~DIALOG_ERC_BASE();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment