Design rule dialog: use wxLC_VIRTUAL options in wxListBoxes tu speed up nets... (cc4b3623) · Commits · Elphel / kicad-source-mirror

common/dialog_about/AboutDialog_main.cpp

+7 −4

Original line number	Diff line number	Diff line
		@@ -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.cpp

+217 −152

Original line number	Diff line number	Diff line
		/////////////////////////////////////////////////////////////////////////////

		// Name: dialog_design_rules.cpp
		/////////////////////////////////////////////////////////////////////////////

		@@ -42,7 +43,7 @@
		#include "pcbnew_id.h"
		#include "dialog_design_rules.h"
		#include "wx/generic/gridctrl.h"

		#include "dialog_design_rules_aux_helper_class.h"

		// Field Positions on rules grid
		enum {
		@@ -63,6 +64,53 @@ int DIALOG_DESIGN_RULES::s_LastTabSelection = -1;
		wxPoint DIALOG_DESIGN_RULES:: s_LastPos( -1, -1 );
		wxSize DIALOG_DESIGN_RULES:: s_LastSize;

		// methods for the helper class NETS_LIST_CTRL

		/** OnGetItemText (overlaid method)
		* needed by wxListCtrl with wxLC_VIRTUAL options
		*/
		wxString NETS_LIST_CTRL::OnGetItemText( long item, long column ) const
		{
		if( column == 0 )
		{
		if( item < (long) m_Netnames.GetCount() )
		return m_Netnames[item];
		else
		return wxEmptyString;
		}
		else if( item < (long) m_Classnames.GetCount() )
		return m_Classnames[item];

		return wxEmptyString;
		}


		/** Function setRowItems
		* Initialize the net name and the net class name at row aRow
		* @param aRow = row index (if aRow > number of stored row, empty rows will be created)
		* @param aNetname = the string to display in row aRow, column 0
		* @param aNetclassName = the string to display in row aRow, column 1
		*/
		void NETS_LIST_CTRL::setRowItems( unsigned aRow,
		const wxString& aNetname,
		const wxString& aNetclassName )
		{
		// insert blanks if aRow is larger than existing row count
		unsigned cnt = m_Netnames.GetCount();

		if( cnt <= aRow )
		m_Netnames.Add( wxEmptyString, aRow - cnt + 1 );

		cnt = m_Classnames.GetCount();
		if( cnt <= aRow )
		m_Classnames.Add( wxEmptyString, aRow - cnt + 1 );

		if( (int)aRow <= GetItemCount() )
		SetItemCount( aRow + 1 );

		m_Netnames[aRow] = aNetname;
		m_Classnames[aRow] = aNetclassName;
		}


		/**
		@@ -71,6 +119,7 @@ wxSize DIALOG_DESIGN_RULES::s_LastSize;
		* column titles and not on the grid cell requirements, assuming that the grid
		* cell width requirements are narrower than the column title requirements.
		*/

		// @todo: maybe move this to common.cpp if it works.
		void EnsureGridColumnWidths( wxGrid* aGrid )
		{
		@@ -156,7 +205,10 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings( )
		m_MessagesList->AppendToPage( _( "<b>Current general settings:</b><br>" ) );

		// Display min values:
		value = ReturnStringFromValue( g_UserUnit, m_BrdSettings->m_TrackMinWidth, internal_units, true );
		value = ReturnStringFromValue( g_UserUnit,
		m_BrdSettings->m_TrackMinWidth,
		internal_units,
		true );
		msg.Printf( _( "Minimum value for tracks width: <b>%s</b><br>\n" ), GetChars( value ) );
		m_MessagesList->AppendToPage( msg );

		@@ -164,10 +216,12 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings( )
		msg.Printf( _( "Minimum value for vias diameter: <b>%s</b><br>\n" ), GetChars( value ) );
		m_MessagesList->AppendToPage( msg );

		value = ReturnStringFromValue( g_UserUnit, m_BrdSettings->m_MicroViasMinSize, internal_units, true );
		value = ReturnStringFromValue( g_UserUnit,
		m_BrdSettings->m_MicroViasMinSize,
		internal_units,
		true );
		msg.Printf( _( "Minimum value for microvias diameter: <b>%s</b><br>\n" ), GetChars( value ) );
		m_MessagesList->AppendToPage( msg );

		}


		@@ -218,6 +272,7 @@ void DIALOG_DESIGN_RULES::InitDialogRules()
		PrintCurrentSettings();
		}


		/*******************************************/
		void DIALOG_DESIGN_RULES::InitGlobalRules()
		/*******************************************/
		@@ -236,8 +291,12 @@ void DIALOG_DESIGN_RULES::InitGlobalRules()
		m_OptViaType->SetSelection( 1 );

		m_AllowMicroViaCtrl->SetSelection( m_BrdSettings->m_MicroViasAllowed ? 1 : 0 );
		PutValueInLocalUnits( *m_SetMicroViasMinSizeCtrl, m_BrdSettings->m_MicroViasMinSize, Internal_Unit );
		PutValueInLocalUnits( *m_SetMicroViasMinDrillCtrl, m_BrdSettings->m_MicroViasMinDrill, Internal_Unit );
		PutValueInLocalUnits( *m_SetMicroViasMinSizeCtrl,
		m_BrdSettings->m_MicroViasMinSize,
		Internal_Unit );
		PutValueInLocalUnits( *m_SetMicroViasMinDrillCtrl,
		m_BrdSettings->m_MicroViasMinDrill,
		Internal_Unit );

		PutValueInLocalUnits( *m_SetTrackMinWidthCtrl, m_BrdSettings->m_TrackMinWidth, Internal_Unit );

		@@ -249,9 +308,9 @@ void DIALOG_DESIGN_RULES::InitGlobalRules()
		m_ViasDimensionsList = m_Parent->GetBoard()->m_ViasDimensionsList;
		m_ViasDimensionsList.erase( m_ViasDimensionsList.begin() ); // remove the netclass value
		InitDimensionsLists();

		}


		/***************************************************/
		void DIALOG_DESIGN_RULES::InitDimensionsLists()
		/***************************************************/
		@@ -286,6 +345,7 @@ void DIALOG_DESIGN_RULES::InitDimensionsLists()
		m_gridTrackWidthList->SetColumnWidth( 0, wxLIST_AUTOSIZE );
		}


		// Sort comparison function (helper for makePointers() )
		static bool sortByClassThenName( NETCUP* a, NETCUP* b )
		{
		@@ -303,6 +363,7 @@ static bool sortByClassThenName( NETCUP* a, NETCUP* b )
		return false;
		}


		void DIALOG_DESIGN_RULES::makePointers( PNETCUPS* aList, const wxString& aNetClassName )
		{
		aList->clear();
		@@ -331,36 +392,14 @@ void DIALOG_DESIGN_RULES::makePointers( PNETCUPS* aList, const wxString& aNetCla
		}


		void DIALOG_DESIGN_RULES::setRowItem( wxListCtrl* aListCtrl, int aRow, NETCUP* aNetAndClass )
		{
		wxASSERT( aRow >= 0 );

		// insert blanks if aRow is larger than existing count
		while( aRow >= aListCtrl->GetItemCount() )
		{
		long ndx = aListCtrl->InsertItem( aListCtrl->GetItemCount(), wxEmptyString );

		wxASSERT( ndx >= 0 );

		aListCtrl->SetItem( ndx, 1, wxEmptyString );
		}

		aListCtrl->SetItem( aRow, 0, aNetAndClass->net );
		aListCtrl->SetItem( aRow, 1, aNetAndClass->clazz );

		// recompute the column widths here, after setting texts
		aListCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE );
		aListCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE );
		}


		/**
		* Function FillListBoxWithNetNames
		* populates aListCtrl with net names and class names from m_AllNets in a two column display.
		*/
		void DIALOG_DESIGN_RULES::FillListBoxWithNetNames( wxListCtrl* aListCtrl, const wxString& aNetClass )
		void DIALOG_DESIGN_RULES::FillListBoxWithNetNames( NETS_LIST_CTRL* aListCtrl,
		const wxString& aNetClass )
		{
		aListCtrl->DeleteAllItems();
		aListCtrl->ClearList();

		PNETCUPS ptrList;

		@@ -373,6 +412,7 @@ void DIALOG_DESIGN_RULES::FillListBoxWithNetNames( wxListCtrl* aListCtrl, const
		{
		printf( "[%d]: %s %s\n", r, CONV_TO_UTF8( (i)->net ), CONV_TO_UTF8( (i)->clazz ) );
		}

		#endif

		// to speed up inserting we hide the control temporarily
		@@ -381,9 +421,13 @@ void DIALOG_DESIGN_RULES::FillListBoxWithNetNames( wxListCtrl* aListCtrl, const
		int row = 0;
		for( PNETCUPS::iterator i = ptrList.begin(); i!=ptrList.end(); ++i, ++row )
		{
		setRowItem( aListCtrl, row, *i );
		aListCtrl->setRowItems( row, (i)->net, (i)->clazz );
		}

		// recompute the column widths here, after setting texts
		aListCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE );
		aListCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE );

		aListCtrl->Show();
		}

		@@ -444,6 +488,7 @@ static void class2gridRow( wxGrid* grid, int row, NETCLASS* nc, int units )
		grid->SetCellValue( row, GRID_uVIADRILL, msg );
		}


		/** Function InitRulesList()
		* Fill the grid showing current rules with values
		*/
		@@ -528,6 +573,7 @@ void DIALOG_DESIGN_RULES::CopyRulesListToBoard()
		m_Pcb->SynchronizeNetsAndNetClasses();
		}


		/*************************************************/
		void DIALOG_DESIGN_RULES::CopyGlobalRulesToBoard()
		/*************************************************/
		@@ -555,6 +601,7 @@ void DIALOG_DESIGN_RULES::CopyGlobalRulesToBoard()
		ReturnValueFromTextCtrl( *m_SetTrackMinWidthCtrl, m_Parent->m_InternalUnits );
		}


		/*******************************************************************/
		void DIALOG_DESIGN_RULES::CopyDimensionsListsToBoard()
		/*******************************************************************/
		@@ -571,6 +618,7 @@ void DIALOG_DESIGN_RULES::CopyDimensionsListsToBoard( )
		int value = ReturnValueFromString( g_UserUnit, msg, m_Parent->m_InternalUnits );
		m_TracksWidthList.push_back( value );
		}

		// Sort new list by by increasing value
		sort( m_TracksWidthList.begin(), m_TracksWidthList.end() );

		@@ -592,6 +640,7 @@ void DIALOG_DESIGN_RULES::CopyDimensionsListsToBoard( )
		}
		m_ViasDimensionsList.push_back( via_dim );
		}

		// Sort new list by by increasing value
		sort( m_ViasDimensionsList.begin(), m_ViasDimensionsList.end() );

		@@ -657,6 +706,7 @@ void DIALOG_DESIGN_RULES::OnAddNetclassClick( wxCommandEvent& event )
		wxString class_name;

		wxTextEntryDialog dlg( this, _( "New Net Class Name:" ), wxEmptyString, class_name );

		if( dlg.ShowModal() != wxID_OK )
		return; // cancelled by user

		@@ -695,25 +745,31 @@ void DIALOG_DESIGN_RULES::OnAddNetclassClick( wxCommandEvent& event )
		InitializeRulesSelectionBoxes();
		}


		// Sort function for wxArrayInt. Items (ints) are sorted by decreasing value
		// used in DIALOG_DESIGN_RULES::OnRemoveNetclassClick
		int sort_int( int* first, int* second )
		{
		return second - first;
		}


		/**************************************************************************/
		void DIALOG_DESIGN_RULES::OnRemoveNetclassClick( wxCommandEvent& event )
		/**************************************************************************/
		{
		wxArrayInt select = m_grid->GetSelectedRows();

		// Sort selection by decreasing index order:
		select.Sort( sort_int );
		bool reinit = false;

		// rows labels are not removed when deleting rows: they are not deleted.
		// So we must store them, remove correponding labels and reinit them
		wxArrayString labels;
		for( int ii = 0; ii < m_grid->GetNumberRows(); ii++ )
		labels.Add( m_grid->GetRowLabelValue( ii ) );

		// Delete rows from last to first (this is the order wxArrayInt select after sorting) )
		// This order is Ok when removing rows
		for( unsigned ii = 0; ii < select.GetCount(); ii++ )
		@@ -732,6 +788,7 @@ void DIALOG_DESIGN_RULES::OnRemoveNetclassClick( wxCommandEvent& event )
		else
		wxMessageBox( _( "The defaut Netclass cannot be removed" ) );
		}

		if( reinit )
		{
		// Reinit labels :
		@@ -742,6 +799,7 @@ void DIALOG_DESIGN_RULES::OnRemoveNetclassClick( wxCommandEvent& event )
		}
		}


		/*
		* Called on "Move Up" button click
		* the selected(s) rules are moved up
		@@ -770,6 +828,7 @@ void DIALOG_DESIGN_RULES::OnMoveUpSelectedNetClass( wxCommandEvent& event )
		m_grid->SetCellValue( ii, icol, previous_value );
		m_grid->SetCellValue( ii - 1, icol, curr_value );
		}

		curr_value = m_grid->GetRowLabelValue( ii );
		previous_value = m_grid->GetRowLabelValue( ii - 1 );
		m_grid->SetRowLabelValue( ii, previous_value );
		@@ -819,10 +878,11 @@ void DIALOG_DESIGN_RULES::OnRightCBSelection( wxCommandEvent& event )
		}


		void DIALOG_DESIGN_RULES::moveSelectedItems( wxListCtrl* src, const wxString& newClassName )
		void DIALOG_DESIGN_RULES::moveSelectedItems( NETS_LIST_CTRL* src, const wxString& newClassName )
		{
		wxListItem item;
		wxString netName;

		item.m_mask \|= wxLIST_MASK_TEXT; // Validate the member m_text of the wxListItem item

		for( int row = 0; row < src->GetItemCount(); ++row )
		@@ -851,6 +911,7 @@ void DIALOG_DESIGN_RULES::OnRightToLeftCopyButton( wxCommandEvent& event )
		FillListBoxWithNetNames( m_rightListCtrl, m_rightClassChoice->GetStringSelection() );
		}


		void DIALOG_DESIGN_RULES::OnLeftToRightCopyButton( wxCommandEvent& event )
		{
		wxString newClassName = m_rightClassChoice->GetStringSelection();
		@@ -908,11 +969,16 @@ bool DIALOG_DESIGN_RULES::TestDataValidity()

		wxString msg;

		int minViaDia = ReturnValueFromTextCtrl( *m_SetViasMinSizeCtrl, m_Parent->m_InternalUnits );
		int minViaDrill = ReturnValueFromTextCtrl( *m_SetViasMinDrillCtrl, m_Parent->m_InternalUnits );
		int minUViaDia = ReturnValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl, m_Parent->m_InternalUnits );
		int minUViaDrill = ReturnValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl, m_Parent->m_InternalUnits );
		int minTrackWidth = ReturnValueFromTextCtrl( *m_SetTrackMinWidthCtrl, m_Parent->m_InternalUnits );
		int minViaDia = ReturnValueFromTextCtrl( *m_SetViasMinSizeCtrl,
		m_Parent->m_InternalUnits );
		int minViaDrill = ReturnValueFromTextCtrl( *m_SetViasMinDrillCtrl,
		m_Parent->m_InternalUnits );
		int minUViaDia = ReturnValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl,
		m_Parent->m_InternalUnits );
		int minUViaDrill = ReturnValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl,
		m_Parent->m_InternalUnits );
		int minTrackWidth = ReturnValueFromTextCtrl( *m_SetTrackMinWidthCtrl,
		m_Parent->m_InternalUnits );


		for( int row = 0; row < m_grid->GetNumberRows(); row++ )
		@@ -1057,4 +1123,3 @@ bool DIALOG_DESIGN_RULES::TestDataValidity()

		return result;
		}

pcbnew/dialog_design_rules.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -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_base.cpp

+421 −419

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		// PLEASE DO "NOT" EDIT THIS FILE!
		///////////////////////////////////////////////////////////////////////////

		#include "dialog_design_rules_aux_helper_class.h"

		#include "dialog_design_rules_base.h"

		///////////////////////////////////////////////////////////////////////////
		@@ -99,7 +101,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
		m_leftClassChoice->SetSelection( 0 );
		leftNetSelectBoxSizer->Add( m_leftClassChoice, 0, wxEXPAND, 5 );

		m_leftListCtrl = new wxListCtrl( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES\|wxLC_REPORT\|wxLC_VRULES\|wxSUNKEN_BORDER );
		m_leftListCtrl = new NETS_LIST_CTRL( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES\|wxLC_REPORT\|wxLC_VIRTUAL\|wxLC_VRULES\|wxSUNKEN_BORDER );
		m_leftListCtrl->SetMinSize( wxSize( 220,200 ) );

		leftNetSelectBoxSizer->Add( m_leftListCtrl, 1, wxEXPAND\|wxTOP, 5 );
		@@ -139,7 +141,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
		m_rightClassChoice->SetSelection( 0 );
		rghtNetSelectBoxSizer->Add( m_rightClassChoice, 0, wxEXPAND, 5 );

		m_rightListCtrl = new wxListCtrl( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES\|wxLC_REPORT\|wxLC_VRULES\|wxSUNKEN_BORDER );
		m_rightListCtrl = new NETS_LIST_CTRL( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES\|wxLC_REPORT\|wxLC_VIRTUAL\|wxLC_VRULES\|wxSUNKEN_BORDER );
		m_rightListCtrl->SetMinSize( wxSize( 220,-1 ) );

		rghtNetSelectBoxSizer->Add( m_rightListCtrl, 1, wxEXPAND\|wxTOP, 5 );

pcbnew/dialog_design_rules_base.fbp

+2417 −2417

Original line number	Diff line number	Diff line
		@@ -558,8 +558,8 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxLC_HRULES\|wxLC_REPORT\|wxLC_VRULES</property>
		<property name="subclass"></property>
		<property name="style">wxLC_HRULES\|wxLC_REPORT\|wxLC_VIRTUAL\|wxLC_VRULES</property>
		<property name="subclass">NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h</property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		@@ -908,8 +908,8 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxLC_HRULES\|wxLC_REPORT\|wxLC_VRULES</property>
		<property name="subclass"></property>
		<property name="style">wxLC_HRULES\|wxLC_REPORT\|wxLC_VIRTUAL\|wxLC_VRULES</property>
		<property name="subclass">NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h</property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>

Admin message