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

Pcbnew: Adding net pop-up menu for placing via 

ADDED: Add feature showing a pop-up menu of possible nets when it's ambiguous in Pcbnew

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15003
This commit is contained in:
Zhuang Jiezhi 2023-09-26 19:42:55 +00:00 committed by Seth Hillbrand
parent 12ebb2bbfa
commit 618c2be380
1 changed files with 127 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
pcbnew/tools/drawing_tool.cpp
View File

@ -2944,12 +2944,87 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
return nullptr;
}
int selectPossibleNetsByPopMenu( std::list<int>& aNetcodeList )
{
ACTION_MENU menu( true );
NETINFO_LIST& netInfo = m_board->GetNetInfo();
std::map<int, int> menuIDNetCodeMap;
int menuID = 1;
for( auto& netcode : aNetcodeList )
{
wxString menuText;
if( menuID < 10 )
{
#ifdef __WXMAC__
menuText = wxString::Format( "%s\t",
netInfo.GetNetItem( netcode )->GetNetname() );
#else
menuText = wxString::Format( "&%d %s\t",
menuID,
netInfo.GetNetItem( netcode )->GetNetname() );
#endif
}
else
{
menuText = netInfo.GetNetItem( netcode )->GetNetname();
}
menu.Add( menuText, menuID, BITMAPS::INVALID_BITMAP );
menuIDNetCodeMap[ menuID ] = netcode;
menuID++;
}
menu.SetTitle( _( "Select Net:" ) );
menu.DisplayTitle( true );
DRAWING_TOOL* drawingTool = m_frame->GetToolManager()->GetTool<DRAWING_TOOL>();
drawingTool->SetContextMenu( &menu, CMENU_NOW );
int selectNetCode = -1;
while( TOOL_EVENT* evt = drawingTool->Wait() )
{
if( evt->Action() == TA_CHOICE_MENU_UPDATE )
{
evt->SetPassEvent();
}
else if( evt->Action() == TA_CHOICE_MENU_CHOICE )
{
std::optional<int> id = evt->GetCommandId();
// User has selected an item, so this one will be returned
if( id && ( *id > 0 ) && ( *id < menuID ) )
{
selectNetCode = menuIDNetCodeMap.at( *id );
}
// User has cancelled the menu (either by <esc> or clicking out of it),
// so different from -1, we return -2 to cancel the via placement
// but stay in the via tool
else
{
selectNetCode = -2;
}
}
else if( evt->Action() == TA_CHOICE_MENU_CLOSED )
{
break;
}
}
return selectNetCode;
}
int findStitchedZoneNet( PCB_VIA* aVia )
{
const VECTOR2I position = aVia->GetPosition();
const LSET lset = aVia->GetLayerSet();
PCB_DISPLAY_OPTIONS opts = m_frame->GetDisplayOptions();
bool highContrast = ( opts.m_ContrastModeDisplay != HIGH_CONTRAST_MODE::NORMAL );
// first take the net of the active layer
// In high contrast mode, it should be treated as the only one visible layer
// We just return the net of active layer (not the visible layers) without show menu
if( highContrast )
{
if( lset.test( m_frame->GetActiveLayer() ) )
{
for( ZONE* z : m_board->Zones() )
@ -2961,17 +3036,47 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
}
}
}
// none? take the topmost visible layer
for( PCB_LAYER_ID layer : LSET( m_board->GetVisibleLayers() & lset ).Seq() )
}
else
{
LSET tempLset = LSET( m_board->GetVisibleLayers() & lset );
std::list<int> netcodeList;
// When there is only one visible layer and the others invisible,
// we find net in the only visible layer instead of showing menu
if( 1 != tempLset.Seq().size() )
{
tempLset = lset;
}
// get possible nets from layers
// and store them in netcodelist
for( ZONE* z : m_board->Zones() )
{
for( PCB_LAYER_ID layer : tempLset.Seq() )
{
if( z->IsOnLayer( layer ) )
{
if( z->HitTestFilledArea( layer, position ) )
return z->GetNetCode();
netcodeList.push_back( z->GetNetCode() );
}
}
}
netcodeList.sort();
netcodeList.unique();
if( netcodeList.size() == 1 )
{
return netcodeList.front();
}
// When there are more than one possible net , it's ambiguous
// So show a pop-up menu of possible nets
if( netcodeList.size() > 1 )
{
return selectPossibleNetsByPopMenu( netcodeList );
}
}
@ -3029,7 +3134,14 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
}
else
{
via->SetNetCode( findStitchedZoneNet( via ) );
int netcode = findStitchedZoneNet( via );
// -2 signifies that the user has canceled the placement
// of the via while remaining in the via tool
if( -2 == netcode )
return false;
via->SetNetCode( netcode );
via->SetIsFree( via->GetNetCode() > 0 );
}