Design rules dialog: use wxLC_VIRTUAL options in wxListBoxes to speed up nets...

Design rules dialog: use wxLC_VIRTUAL options in wxListBoxes to speed  up nets lists display (which was *very long* for boards with a lot of nets)

common/dialog_about/AboutDialog_main.cpp

@@ -113,8 +113,10 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     description << wxT( "<p>" );
     description << wxT( "<b><u>" ) << _( "Description" ) << wxT( "</u></b>" ); // bold & underlined font for caption
 
-    description << wxT(
-        "<p>The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards.</p>" );
+    description << wxT( "<p>" ) <<
+    _(
+        "The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards." )
+                << wxT( "</p>" );
 
     description << wxT( "</p>" );
 
@@ -170,7 +172,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         << HtmlNewline( 4 )
         << _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 )
         << HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ),
-                         _( "GNU General Public License version 2" ) )
+                         _( "GNU General Public License (GPL) version 2" ) )
         << wxT( "</div>" );
 
     info.SetLicense( license );
@@ -201,7 +203,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     info.AddDeveloper( new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) );
     info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) );
     info.AddDeveloper( new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) );
-    info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ) ) );
+    info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ),
+                                       wxT( "rafael.sokolowski@web.de" ) ) );
     info.AddDeveloper( new Contributor( wxT( "Rok Markovic" ), wxT( "rok@kanardia.eu" ) ) );
     info.AddDeveloper( new Contributor( wxT( "Tim Hanson" ), wxT( "sideskate@gmail.com" ) ) );
     info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) );

pcbnew/dialog_design_rules.h

@@ -76,7 +76,7 @@ private:
     void CopyGlobalRulesToBoard();
     void CopyDimensionsListsToBoard( );
     void SetRoutableLayerStatus();
-    void FillListBoxWithNetNames( wxListCtrl* aListCtrl, const wxString& aNetClass );
+    void FillListBoxWithNetNames( NETS_LIST_CTRL* aListCtrl, const wxString& aNetClass );
     void PrintCurrentSettings( );
 
     /**
@@ -96,9 +96,7 @@ private:
 
     void setNetClass( const wxString& aNetName, const wxString& aClassName );
 
-    static void setRowItem(  wxListCtrl* aListCtrl, int aRow, NETCUP* aNetAndClass );
-
-    void moveSelectedItems( wxListCtrl* src, const wxString& newClassName );
+    void moveSelectedItems( NETS_LIST_CTRL* src, const wxString& newClassName );
 
 
 public:

pcbnew/dialog_design_rules_aux_helper_class.h

+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_DESIGN_RULES
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_design_rules_aux_helper_class_h_
+#define __dialog_design_rules_aux_helper_class_h_
+
+#include <wx/listctrl.h>
+
+/* helper class to display lists of nets and associated netclasses
+ * used in dialog design rules.
+ * It s needed because the 2 wxListCtlr used to display lists of nets
+ * use the wxLC_VIRTUAL option.
+ *  The virtual wxString OnGetItemText(long item, long column) const method
+ * must be overlaid.
+ */
+class NETS_LIST_CTRL: public wxListCtrl
+{
+private:
+    wxArrayString           m_Netnames;             ///< an array to store the list of nets (column 0)
+    wxArrayString           m_Classnames;            ///< an array to store the list of netclasse (column 1)
+public:   
+    NETS_LIST_CTRL(wxWindow* parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_ICON):
+            wxListCtrl( parent, id, pos, size, style )
+    {
+    };
+    
+    NETS_LIST_CTRL()
+    {
+    };
+    void setRowItems(unsigned aRow, const wxString & aNetname, const wxString & aNetclassName ); 
+    void ClearList()
+    {
+        SetItemCount(0);
+        m_Netnames.Clear();
+        m_Classnames.Clear();
+    }
+
+    virtual wxString OnGetItemText(long item, long column) const;
+};
+
+
+#endif //__dialog_design_rules_aux_helper_class_h_

pcbnew/dialog_design_rules_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_design_rules_base__
-#define __dialog_design_rules_base__
-
-#include <wx/intl.h>
-
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
-#include <wx/gdicmn.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/choice.h>
-#include <wx/listctrl.h>
-#include <wx/panel.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/radiobox.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/statline.h>
-#include <wx/notebook.h>
-#include <wx/html/htmlwin.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_DESIGN_RULES_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_DESIGN_RULES_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			wxID_ADD_NETCLASS = 1000,
-			wxID_REMOVE_NETCLASS,
-			ID_LEFT_CHOICE_CLICK,
-			ID_LEFT_TO_RIGHT_COPY,
-			ID_RIGHT_TO_LEFT_COPY,
-			ID_RIGHT_CHOICE_CLICK,
-		};
-		
-		wxNotebook* m_DRnotebook;
-		wxPanel* m_panelNetClassesEditor;
-		wxGrid* m_grid;
-		wxButton* m_addButton;
-		wxButton* m_removeButton;
-		wxButton* m_moveUpButton;
-		wxChoice* m_leftClassChoice;
-		wxListCtrl* m_leftListCtrl;
-		wxButton* m_buttonRightToLeft;
-		wxButton* m_buttonLeftToRight;
-		wxButton* m_buttonLeftSelAll;
-		wxButton* m_buttonRightSelAll;
-		wxChoice* m_rightClassChoice;
-		wxListCtrl* m_rightListCtrl;
-		wxPanel* m_panelGolbalDesignRules;
-		wxRadioBox* m_OptViaType;
-		wxStaticText* m_ViaMinTitle;
-		wxTextCtrl* m_SetViasMinSizeCtrl;
-		wxStaticText* m_ViaMinDrillTitle;
-		wxTextCtrl* m_SetViasMinDrillCtrl;
-		wxRadioBox* m_AllowMicroViaCtrl;
-		wxStaticText* m_MicroViaMinSizeTitle;
-		wxTextCtrl* m_SetMicroViasMinSizeCtrl;
-		wxStaticText* m_MicroViaMinDrillTitle;
-		wxTextCtrl* m_SetMicroViasMinDrillCtrl;
-		wxStaticText* m_TrackMinWidthTitle;
-		wxTextCtrl* m_SetTrackMinWidthCtrl;
-		wxStaticLine* m_staticline1;
-		wxStaticText* m_staticTextInfo;
-		wxStaticText* m_staticText7;
-		wxGrid* m_gridViaSizeList;
-		wxStaticText* m_staticText8;
-		wxGrid* m_gridTrackWidthList;
-		wxHtmlWindow* m_MessagesList;
-		wxButton* m_buttonOk;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnNetClassesNameLeftClick( wxGridEvent& event ){ event.Skip(); }
-		virtual void OnNetClassesNameRightClick( wxGridEvent& event ){ event.Skip(); }
-		virtual void OnAddNetclassClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnRemoveNetclassClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnLeftCBSelection( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnRightToLeftCopyButton( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnLeftToRightCopyButton( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnLeftSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnRightSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnRightCBSelection( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnOkButtonClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
-		
-	
-	public:
-		DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-		~DIALOG_DESIGN_RULES_BASE();
-	
-};
-
-#endif //__dialog_design_rules_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_design_rules_base__
+#define __dialog_design_rules_base__
+
+#include <wx/intl.h>
+
+class NETS_LIST_CTRL;
+
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/string.h>
+#include <wx/font.h>
+#include <wx/grid.h>
+#include <wx/gdicmn.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/choice.h>
+#include <wx/listctrl.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/statline.h>
+#include <wx/notebook.h>
+#include <wx/html/htmlwin.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_DESIGN_RULES_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_DESIGN_RULES_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_ADD_NETCLASS = 1000,
+			wxID_REMOVE_NETCLASS,
+			ID_LEFT_CHOICE_CLICK,
+			ID_LEFT_TO_RIGHT_COPY,
+			ID_RIGHT_TO_LEFT_COPY,
+			ID_RIGHT_CHOICE_CLICK,
+		};
+		
+		wxNotebook* m_DRnotebook;
+		wxPanel* m_panelNetClassesEditor;
+		wxGrid* m_grid;
+		wxButton* m_addButton;
+		wxButton* m_removeButton;
+		wxButton* m_moveUpButton;
+		wxChoice* m_leftClassChoice;
+		NETS_LIST_CTRL* m_leftListCtrl;
+		wxButton* m_buttonRightToLeft;
+		wxButton* m_buttonLeftToRight;
+		wxButton* m_buttonLeftSelAll;
+		wxButton* m_buttonRightSelAll;
+		wxChoice* m_rightClassChoice;
+		NETS_LIST_CTRL* m_rightListCtrl;
+		wxPanel* m_panelGolbalDesignRules;
+		wxRadioBox* m_OptViaType;
+		wxStaticText* m_ViaMinTitle;
+		wxTextCtrl* m_SetViasMinSizeCtrl;
+		wxStaticText* m_ViaMinDrillTitle;
+		wxTextCtrl* m_SetViasMinDrillCtrl;
+		wxRadioBox* m_AllowMicroViaCtrl;
+		wxStaticText* m_MicroViaMinSizeTitle;
+		wxTextCtrl* m_SetMicroViasMinSizeCtrl;
+		wxStaticText* m_MicroViaMinDrillTitle;
+		wxTextCtrl* m_SetMicroViasMinDrillCtrl;
+		wxStaticText* m_TrackMinWidthTitle;
+		wxTextCtrl* m_SetTrackMinWidthCtrl;
+		wxStaticLine* m_staticline1;
+		wxStaticText* m_staticTextInfo;
+		wxStaticText* m_staticText7;
+		wxGrid* m_gridViaSizeList;
+		wxStaticText* m_staticText8;
+		wxGrid* m_gridTrackWidthList;
+		wxHtmlWindow* m_MessagesList;
+		wxButton* m_buttonOk;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnNetClassesNameLeftClick( wxGridEvent& event ){ event.Skip(); }
+		virtual void OnNetClassesNameRightClick( wxGridEvent& event ){ event.Skip(); }
+		virtual void OnAddNetclassClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnRemoveNetclassClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnLeftCBSelection( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnRightToLeftCopyButton( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnLeftToRightCopyButton( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnLeftSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnRightSelectAllButton( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnRightCBSelection( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnOkButtonClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
+		DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_DESIGN_RULES_BASE();
+	
+};
+
+#endif //__dialog_design_rules_base__