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

Fix default netclass membership handling. 

There's no such thing as an "unassigned" net.  That's what the
"Default" netclass is.
This commit is contained in:
Jeff Young 2020-08-16 20:59:47 +01:00
parent 126565cbed
commit 5ffd2751ef
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/dialogs/panel_setup_netclasses.cpp
View File

@ -67,8 +67,6 @@ std::vector<BITMAP_DEF> g_lineStyleIcons;
wxArrayString g_lineStyleNames; wxArrayString g_lineStyleNames;
#define NO_NETCLASS_ASSIGNMENT _( "<unassigned>" )
PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, NETCLASSES* aNetclasses, PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, NETCLASSES* aNetclasses,
const std::vector<wxString>& aCandidateNetNames, const std::vector<wxString>& aCandidateNetNames,
bool aIsEEschema ) : bool aIsEEschema ) :
@ -291,7 +289,10 @@ void PANEL_SETUP_NETCLASSES::addNet( const wxString& netName, const wxString& ne
m_membershipGrid->SetCellTextColour( i, 0, color ); m_membershipGrid->SetCellTextColour( i, 0, color );
} }
m_membershipGrid->SetCellValue( i, 1, netclass ); if( netclass.IsEmpty() )
m_membershipGrid->SetCellValue( i, 1, NETCLASS::Default );
else
m_membershipGrid->SetCellValue( i, 1, netclass );
} }
@ -304,8 +305,6 @@ void PANEL_SETUP_NETCLASSES::rebuildNetclassDropdowns()
wxArrayString netclassNames; wxArrayString netclassNames;
netclassNames.push_back( NO_NETCLASS_ASSIGNMENT );
for( int ii = 0; ii < m_netclassGrid->GetNumberRows(); ii++ ) for( int ii = 0; ii < m_netclassGrid->GetNumberRows(); ii++ )
{ {
wxString netclassName = m_netclassGrid->GetCellValue( ii, GRID_NAME ); wxString netclassName = m_netclassGrid->GetCellValue( ii, GRID_NAME );
@ -374,7 +373,7 @@ bool PANEL_SETUP_NETCLASSES::TransferDataFromWindow()
const wxString& netname = m_membershipGrid->GetCellValue( row, 0 ); const wxString& netname = m_membershipGrid->GetCellValue( row, 0 );
const wxString& classname = m_membershipGrid->GetCellValue( row, 1 ); const wxString& classname = m_membershipGrid->GetCellValue( row, 1 );
if( classname != NO_NETCLASS_ASSIGNMENT ) if( classname != NETCLASS::Default )
{ {
const NETCLASSPTR& nc = m_netclasses->Find( classname ); const NETCLASSPTR& nc = m_netclasses->Find( classname );