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

Don't attempt to round-trip netnames through wxListBox. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8684
This commit is contained in:
Jeff Young 2021-06-27 11:18:53 +01:00
parent 0d72e253f0
commit 70ac70f360
3 changed files with 119 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pcbnew/board.cpp
View File

@ -1385,85 +1385,6 @@ FOOTPRINT* BOARD::FindFootprintByPath( const KIID_PATH& aPath ) const
} }
// The pad count for each netcode, stored in a buffer for a fast access.
// This is needed by the sort function sortNetsByNodes()
static std::vector<int> padCountListByNet;
// Sort nets by decreasing pad count.
// For same pad count, sort by alphabetic names
static bool sortNetsByNodes( const NETINFO_ITEM* a, const NETINFO_ITEM* b )
{
int countA = padCountListByNet[ a->GetNetCode() ];
int countB = padCountListByNet[ b->GetNetCode() ];
if( countA == countB )
return a->GetNetname() < b->GetNetname();
else
return countB < countA;
}
// Sort nets by alphabetic names
static bool sortNetsByNames( const NETINFO_ITEM* a, const NETINFO_ITEM* b )
{
return a->GetNetname() < b->GetNetname();
}
int BOARD::SortedNetnamesList( wxArrayString& aNames, bool aSortbyPadsCount )
{
if( m_NetInfo.GetNetCount() == 0 )
return 0;
// Build the list
std::vector <NETINFO_ITEM*> netBuffer;
netBuffer.reserve( m_NetInfo.GetNetCount() );
int max_netcode = 0;
for( NETINFO_ITEM* net : m_NetInfo )
{
int netcode = net->GetNetCode();
if( netcode > 0 && net->IsCurrent() )
{
netBuffer.push_back( net );
max_netcode = std::max( netcode, max_netcode);
}
}
// sort the list
if( aSortbyPadsCount )
{
// Build the pad count by net:
padCountListByNet.clear();
std::vector<PAD*> pads = GetPads();
padCountListByNet.assign( max_netcode + 1, 0 );
for( PAD* pad : pads )
{
int netCode = pad->GetNetCode();
if( netCode >= 0 )
padCountListByNet[ netCode ]++;
}
sort( netBuffer.begin(), netBuffer.end(), sortNetsByNodes );
}
else
{
sort( netBuffer.begin(), netBuffer.end(), sortNetsByNames );
}
for( NETINFO_ITEM* net : netBuffer )
aNames.Add( UnescapeString( net->GetNetname() ) );
return netBuffer.size();
}
std::vector<wxString> BOARD::GetNetClassAssignmentCandidates() const std::vector<wxString> BOARD::GetNetClassAssignmentCandidates() const
{ {
std::vector<wxString> names; std::vector<wxString> names;

8
pcbnew/board.h
View File

@ -778,14 +778,6 @@ public:
*/ */
FOOTPRINT* FindFootprintByPath( const KIID_PATH& aPath ) const; FOOTPRINT* FindFootprintByPath( const KIID_PATH& aPath ) const;
/**
* @param aNames An array string to fill with net names.
* @param aSortbyPadsCount set to true to sort by active pads count, false = no sort (i.e.
* leave the sort by net names).
* @return net names count.
*/
int SortedNetnamesList( wxArrayString& aNames, bool aSortbyPadsCount );
/** /**
* Return a list of name candidates for netclass assignment. * Return a list of name candidates for netclass assignment.
* *

161
pcbnew/dialogs/dialog_copper_zones.cpp
View File

@ -31,11 +31,12 @@
#include <bitmaps.h> #include <bitmaps.h>
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <zone.h> #include <zone.h>
#include <pad.h>
#include <board.h> #include <board.h>
#include <trigo.h> #include <trigo.h>
#include <dialog_copper_zones_base.h> #include <dialog_copper_zones_base.h>
#include <kicad_string.h>
class DIALOG_COPPER_ZONE : public DIALOG_COPPER_ZONE_BASE class DIALOG_COPPER_ZONE : public DIALOG_COPPER_ZONE_BASE
{ {
@ -43,29 +44,31 @@ public:
DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS* aSettings ); DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS* aSettings );
private: private:
PCB_BASE_FRAME* m_Parent; PCB_BASE_FRAME* m_Parent;
bool m_settingsExported; // settings will be written to all other zones bool m_settingsExported; // settings will be written to all other zones
ZONE_SETTINGS m_settings; ZONE_SETTINGS m_settings;
ZONE_SETTINGS* m_ptr; ZONE_SETTINGS* m_ptr;
bool m_NetSortingByPadCount; std::vector<int> m_listIndexToNetCodeMap;
long m_NetFiltering;
static wxString m_netNameShowFilter; // the filter to show nets (default * "*"). Static
// to keep this pattern for an entire Pcbnew session
int m_cornerSmoothingType;
UNIT_BINDER m_cornerRadius; bool m_netSortingByPadCount;
UNIT_BINDER m_clearance; long m_netFiltering;
UNIT_BINDER m_minWidth; static wxString m_netNameShowFilter; // the filter to show nets (default * "*"). Static
UNIT_BINDER m_antipadClearance ; // to keep this pattern for an entire Pcbnew session
UNIT_BINDER m_spokeWidth; int m_cornerSmoothingType;
UNIT_BINDER m_gridStyleRotation; UNIT_BINDER m_cornerRadius;
UNIT_BINDER m_gridStyleThickness; UNIT_BINDER m_clearance;
UNIT_BINDER m_gridStyleGap; UNIT_BINDER m_minWidth;
UNIT_BINDER m_islandThreshold; UNIT_BINDER m_antipadClearance ;
UNIT_BINDER m_spokeWidth;
UNIT_BINDER m_gridStyleRotation;
UNIT_BINDER m_gridStyleThickness;
UNIT_BINDER m_gridStyleGap;
UNIT_BINDER m_islandThreshold;
bool TransferDataToWindow() override; bool TransferDataToWindow() override;
bool TransferDataFromWindow() override; bool TransferDataFromWindow() override;
@ -124,8 +127,8 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS*
m_settingsExported = false; m_settingsExported = false;
m_NetFiltering = false; m_netFiltering = false;
m_NetSortingByPadCount = true; // false = alphabetic sort, true = pad count sort m_netSortingByPadCount = true; // false = alphabetic sort, true = pad count sort
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
@ -188,21 +191,21 @@ bool DIALOG_COPPER_ZONE::TransferDataToWindow()
m_islandThresholdUnits->Enable( val ); m_islandThresholdUnits->Enable( val );
wxString netNameDoNotShowFilter = wxT( "Net-*" ); wxString netNameDoNotShowFilter = wxT( "Net-*" );
m_NetFiltering = false; m_netFiltering = false;
m_NetSortingByPadCount = true; m_netSortingByPadCount = true;
PCBNEW_SETTINGS* cfg = m_Parent->GetPcbNewSettings(); PCBNEW_SETTINGS* cfg = m_Parent->GetPcbNewSettings();
int opt = cfg->m_Zones.net_sort_mode; int opt = cfg->m_Zones.net_sort_mode;
m_NetFiltering = opt >= 2; m_netFiltering = opt >= 2;
m_NetSortingByPadCount = opt % 2; m_netSortingByPadCount = opt % 2;
netNameDoNotShowFilter = cfg->m_Zones.net_filter; netNameDoNotShowFilter = cfg->m_Zones.net_filter;
m_ShowNetNameFilter->SetValue( m_netNameShowFilter ); m_ShowNetNameFilter->SetValue( m_netNameShowFilter );
m_DoNotShowNetNameFilter->SetValue( netNameDoNotShowFilter ); m_DoNotShowNetNameFilter->SetValue( netNameDoNotShowFilter );
m_showAllNetsOpt->SetValue( !m_NetFiltering ); m_showAllNetsOpt->SetValue( !m_netFiltering );
m_sortByPadsOpt->SetValue( m_NetSortingByPadCount ); m_sortByPadsOpt->SetValue( m_netSortingByPadCount );
// Build list of nets: // Build list of nets:
buildAvailableListOfNets(); buildAvailableListOfNets();
@ -420,16 +423,12 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aUseExportableSetupOnly )
return false; return false;
} }
NETINFO_ITEM* net = nullptr; int netcode = 0;
// Search net_code for this net, if a net was selected
if( m_ListNetNameSelection->GetSelection() > 0 ) if( m_ListNetNameSelection->GetSelection() > 0 )
{ netcode = m_listIndexToNetCodeMap[ m_ListNetNameSelection->GetSelection() ];
wxString netname = m_ListNetNameSelection->GetStringSelection();
net = m_Parent->GetBoard()->FindNet( netname );
}
m_settings.m_NetcodeSelection = net ? net->GetNetCode() : 0; m_settings.m_NetcodeSelection = netcode;
m_settings.m_Name = m_tcZoneName->GetValue(); m_settings.m_Name = m_tcZoneName->GetValue();
@ -466,17 +465,17 @@ void DIALOG_COPPER_ZONE::OnLayerSelection( wxDataViewEvent& event )
void DIALOG_COPPER_ZONE::OnNetSortingOptionSelected( wxCommandEvent& event ) void DIALOG_COPPER_ZONE::OnNetSortingOptionSelected( wxCommandEvent& event )
{ {
m_NetFiltering = !m_showAllNetsOpt->GetValue(); m_netFiltering = !m_showAllNetsOpt->GetValue();
m_NetSortingByPadCount = m_sortByPadsOpt->GetValue(); m_netSortingByPadCount = m_sortByPadsOpt->GetValue();
m_netNameShowFilter = m_ShowNetNameFilter->GetValue(); m_netNameShowFilter = m_ShowNetNameFilter->GetValue();
buildAvailableListOfNets(); buildAvailableListOfNets();
auto cfg = m_Parent->GetPcbNewSettings(); auto cfg = m_Parent->GetPcbNewSettings();
int configValue = m_NetFiltering ? 2 : 0; int configValue = m_netFiltering ? 2 : 0;
if( m_NetSortingByPadCount ) if( m_netSortingByPadCount )
configValue += 1; configValue += 1;
cfg->m_Zones.net_sort_mode = configValue; cfg->m_Zones.net_sort_mode = configValue;
@ -508,20 +507,96 @@ void DIALOG_COPPER_ZONE::ExportSetupToOtherCopperZones( wxCommandEvent& event )
void DIALOG_COPPER_ZONE::OnRunFiltersButtonClick( wxCommandEvent& event ) void DIALOG_COPPER_ZONE::OnRunFiltersButtonClick( wxCommandEvent& event )
{ {
m_NetFiltering = true; m_netFiltering = true;
m_showAllNetsOpt->SetValue( false ); m_showAllNetsOpt->SetValue( false );
buildAvailableListOfNets(); buildAvailableListOfNets();
} }
// The pad count for each netcode, stored in a buffer for a fast access.
// This is needed by the sort function sortNetsByNodes()
static std::vector<int> padCountListByNet;
// Sort nets by decreasing pad count.
// For same pad count, sort by alphabetic names
static bool sortNetsByNodes( const NETINFO_ITEM* a, const NETINFO_ITEM* b )
{
int countA = padCountListByNet[ a->GetNetCode() ];
int countB = padCountListByNet[ b->GetNetCode() ];
if( countA == countB )
return a->GetNetname() < b->GetNetname();
else
return countB < countA;
}
// Sort nets by alphabetic names
static bool sortNetsByNames( const NETINFO_ITEM* a, const NETINFO_ITEM* b )
{
return a->GetNetname() < b->GetNetname();
}
void DIALOG_COPPER_ZONE::buildAvailableListOfNets() void DIALOG_COPPER_ZONE::buildAvailableListOfNets()
{ {
wxArrayString listNetName; NETINFO_LIST& netInfo = m_Parent->GetBoard()->GetNetInfo();
wxArrayString listNetName;
m_listIndexToNetCodeMap.clear();
m_Parent->GetBoard()->SortedNetnamesList( listNetName, m_NetSortingByPadCount ); if( netInfo.GetNetCount() > 0 )
{
// Build the list
std::vector<NETINFO_ITEM*> netBuffer;
if( m_NetFiltering ) netBuffer.reserve( netInfo.GetNetCount() );
int max_netcode = 0;
for( NETINFO_ITEM* net : netInfo )
{
int netcode = net->GetNetCode();
if( netcode > 0 && net->IsCurrent() )
{
netBuffer.push_back( net );
max_netcode = std::max( netcode, max_netcode);
}
}
// sort the list
if( m_netSortingByPadCount )
{
// Build the pad count by net:
padCountListByNet.clear();
std::vector<PAD*> pads = m_Parent->GetBoard()->GetPads();
padCountListByNet.assign( max_netcode + 1, 0 );
for( PAD* pad : pads )
{
int netCode = pad->GetNetCode();
if( netCode >= 0 )
padCountListByNet[ netCode ]++;
}
sort( netBuffer.begin(), netBuffer.end(), sortNetsByNodes );
}
else
{
sort( netBuffer.begin(), netBuffer.end(), sortNetsByNames );
}
for( NETINFO_ITEM* net : netBuffer )
{
listNetName.Add( UnescapeString( net->GetNetname() ) );
m_listIndexToNetCodeMap.push_back( net->GetNetCode() );
}
}
if( m_netFiltering )
{ {
wxString doNotShowFilter = m_DoNotShowNetNameFilter->GetValue().Lower(); wxString doNotShowFilter = m_DoNotShowNetNameFilter->GetValue().Lower();
wxString ShowFilter = m_ShowNetNameFilter->GetValue().Lower(); wxString ShowFilter = m_ShowNetNameFilter->GetValue().Lower();
@ -542,6 +617,7 @@ void DIALOG_COPPER_ZONE::buildAvailableListOfNets()
} }
listNetName.Insert( wxT( "<no net>" ), 0 ); listNetName.Insert( wxT( "<no net>" ), 0 );
m_listIndexToNetCodeMap.insert( m_listIndexToNetCodeMap.begin(), 0 );
// Ensure currently selected net for the zone is visible, regardless of filters // Ensure currently selected net for the zone is visible, regardless of filters
int selectedNetListNdx = 0; int selectedNetListNdx = 0;
@ -550,6 +626,7 @@ void DIALOG_COPPER_ZONE::buildAvailableListOfNets()
if( net_select > 0 ) if( net_select > 0 )
{ {
NETINFO_ITEM* selectedNet = m_Parent->GetBoard()->FindNet( net_select ); NETINFO_ITEM* selectedNet = m_Parent->GetBoard()->FindNet( net_select );
if( selectedNet ) if( selectedNet )
{ {
selectedNetListNdx = listNetName.Index( selectedNet->GetNetname() ); selectedNetListNdx = listNetName.Index( selectedNet->GetNetname() );