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

Fix visibility control for Default netclass

This commit is contained in:
Jon Evans 2020-08-16 15:41:35 -04:00
parent afc94fdec3
commit 126565cbed
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pcbnew/widgets/appearance_controls.cpp
View File

@ -1748,28 +1748,50 @@ void APPEARANCE_CONTROLS::onNetclassVisibilityChanged( wxCommandEvent& aEvent )
void APPEARANCE_CONTROLS::showNetclass( const wxString& aClassName, bool aShow ) void APPEARANCE_CONTROLS::showNetclass( const wxString& aClassName, bool aShow )
{ {
BOARD* board = m_frame->GetBoard(); BOARD* board = m_frame->GetBoard();
NETCLASSES& classes = board->GetDesignSettings().GetNetClasses(); NETINFO_LIST& nets = board->GetNetInfo();
NETCLASSPTR netclass = classes.Find( aClassName ); NETCLASSES& classes = board->GetDesignSettings().GetNetClasses();
NETCLASSPTR netclass = classes.Find( aClassName );
TOOL_MANAGER* manager = m_frame->GetToolManager();
if( !netclass ) if( !netclass )
return; return;
NETINFO_LIST& nets = board->GetNetInfo(); NETCLASS* defaultClass = classes.GetDefaultPtr();
TOOL_MANAGER* manager = m_frame->GetToolManager();
for( const wxString& member : *netclass ) auto updateWidget =
[&]( int aCode )
{
if( m_netSettingsMap.count( aCode ) )
{
APPEARANCE_SETTING* setting = m_netSettingsMap.at( aCode );
setting->ctl_visibility->SetValue( aShow );
}
};
if( netclass == classes.GetDefault() )
{ {
int code = nets.GetNetItem( member )->GetNet();
if( m_netSettingsMap.count( code ) )
{
APPEARANCE_SETTING* setting = m_netSettingsMap.at( code );
setting->ctl_visibility->SetValue( aShow );
}
const TOOL_ACTION& action = aShow ? PCB_ACTIONS::showNet : PCB_ACTIONS::hideNet; const TOOL_ACTION& action = aShow ? PCB_ACTIONS::showNet : PCB_ACTIONS::hideNet;
manager->RunAction( action, true, code );
for( NETINFO_ITEM* net : nets )
{
if( net->GetNetClass() == defaultClass )
{
manager->RunAction( action, true, net->GetNet() );
updateWidget( net->GetNet() );
}
}
}
else
{
const TOOL_ACTION& action = aShow ? PCB_ACTIONS::showNet : PCB_ACTIONS::hideNet;
for( const wxString& member : *netclass )
{
int code = nets.GetNetItem( member )->GetNet();
manager->RunAction( action, true, code );
updateWidget( code );
}
} }
} }