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

Improve consistency in free-via ambiguity tests. 

Also removes a magic number.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17671
This commit is contained in:
Jeff Young 2024-05-01 10:14:19 +01:00
parent aaf776db9e
commit 58ddffe3dd
1 changed files with 53 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
pcbnew/tools/drawing_tool.cpp
View File

@ -3241,7 +3241,7 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
return nullptr; return nullptr;
} }
int selectPossibleNetsByPopMenu( std::list<int>& aNetcodeList ) std::optional<int> selectPossibleNetsByPopupMenu( std::set<int>& aNetcodeList )
{ {
ACTION_MENU menu( true ); ACTION_MENU menu( true );
const NETINFO_LIST& netInfo = m_board->GetNetInfo(); const NETINFO_LIST& netInfo = m_board->GetNetInfo();
@ -3278,7 +3278,9 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
DRAWING_TOOL* drawingTool = m_frame->GetToolManager()->GetTool<DRAWING_TOOL>(); DRAWING_TOOL* drawingTool = m_frame->GetToolManager()->GetTool<DRAWING_TOOL>();
drawingTool->SetContextMenu( &menu, CMENU_NOW ); drawingTool->SetContextMenu( &menu, CMENU_NOW );
int selectNetCode = -1; int selectedNetCode = -1;
bool cancelled = false;
while( TOOL_EVENT* evt = drawingTool->Wait() ) while( TOOL_EVENT* evt = drawingTool->Wait() )
{ {
if( evt->Action() == TA_CHOICE_MENU_UPDATE ) if( evt->Action() == TA_CHOICE_MENU_UPDATE )
@ -3292,14 +3294,12 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
// User has selected an item, so this one will be returned // User has selected an item, so this one will be returned
if( id && ( *id > 0 ) && ( *id < menuID ) ) if( id && ( *id > 0 ) && ( *id < menuID ) )
{ {
selectNetCode = menuIDNetCodeMap.at( *id ); selectedNetCode = menuIDNetCodeMap.at( *id );
} }
// User has cancelled the menu (either by <esc> or clicking out of it), // 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 else
{ {
selectNetCode = -2; cancelled = true;
} }
} }
else if( evt->Action() == TA_CHOICE_MENU_CLOSED ) else if( evt->Action() == TA_CHOICE_MENU_CLOSED )
@ -3308,76 +3308,67 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
} }
} }
return selectNetCode; if( cancelled )
return std::optional<int>();
else
return selectedNetCode;
} }
int findStitchedZoneNet( PCB_VIA* aVia ) std::optional<int> findStitchedZoneNet( PCB_VIA* aVia )
{ {
const VECTOR2I position = aVia->GetPosition(); const VECTOR2I position = aVia->GetPosition();
const LSET lset = aVia->GetLayerSet();
PCB_DISPLAY_OPTIONS opts = m_frame->GetDisplayOptions(); PCB_DISPLAY_OPTIONS opts = m_frame->GetDisplayOptions();
bool highContrast = ( opts.m_ContrastModeDisplay != HIGH_CONTRAST_MODE::NORMAL ); std::set<int> netcodeList;
// In high contrast mode, it should be treated as the only one visible layer // See if there are any connections available on a high-contrast layer
// We just return the net of active layer (not the visible layers) without show menu if( opts.m_ContrastModeDisplay == HIGH_CONTRAST_MODE::DIMMED
if( highContrast ) || opts.m_ContrastModeDisplay == HIGH_CONTRAST_MODE::HIDDEN )
{ {
if( lset.test( m_frame->GetActiveLayer() ) ) if( aVia->GetLayerSet().test( m_frame->GetActiveLayer() ) )
{ {
for( ZONE* z : m_board->Zones() ) for( ZONE* z : m_board->Zones() )
{ {
if( z->IsOnLayer( m_frame->GetActiveLayer() ) ) if( z->IsOnLayer( m_frame->GetActiveLayer() ) )
{ {
if( z->HitTestFilledArea( m_frame->GetActiveLayer(), position ) ) if( z->HitTestFilledArea( m_frame->GetActiveLayer(), position ) )
return z->GetNetCode(); netcodeList.insert( z->GetNetCode() );
} }
} }
} }
} }
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 // If there's only one, return it.
// and store them in netcodelist if( netcodeList.size() == 1 )
return *netcodeList.begin();
// See if there are any connections available on a visible layer
LSET lset = LSET( m_board->GetVisibleLayers() & aVia->GetLayerSet() );
for( ZONE* z : m_board->Zones() ) for( ZONE* z : m_board->Zones() )
{ {
for( PCB_LAYER_ID layer : tempLset.Seq() ) for( PCB_LAYER_ID layer : lset.Seq() )
{ {
if( z->IsOnLayer( layer ) ) if( z->IsOnLayer( layer ) )
{ {
if( z->HitTestFilledArea( layer, position ) ) if( z->HitTestFilledArea( layer, position ) )
netcodeList.push_back( z->GetNetCode() ); netcodeList.insert( z->GetNetCode() );
} }
} }
} }
netcodeList.sort(); // If there's only one, return it.
netcodeList.unique();
if( netcodeList.size() == 1 ) if( netcodeList.size() == 1 )
{ return *netcodeList.begin();
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 ) if( netcodeList.size() > 1 )
{ {
return selectPossibleNetsByPopMenu( netcodeList ); // The net assignment is ambiguous. Let the user decide.
return selectPossibleNetsByPopupMenu( netcodeList );
} }
else
{
return NETINFO_LIST::ORPHANED;
} }
return -1;
} }
void SnapItem( BOARD_ITEM *aItem ) override void SnapItem( BOARD_ITEM *aItem ) override
@ -3390,9 +3381,7 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
if( settings->tracks == MAGNETIC_OPTIONS::CAPTURE_ALWAYS && m_gridHelper.GetSnap() ) if( settings->tracks == MAGNETIC_OPTIONS::CAPTURE_ALWAYS && m_gridHelper.GetSnap() )
{ {
PCB_TRACK* track = findTrack( via ); if( PCB_TRACK* track = findTrack( via ) )
if( track )
{ {
SEG trackSeg( track->GetStart(), track->GetEnd() ); SEG trackSeg( track->GetStart(), track->GetEnd() );
VECTOR2I snap = m_gridHelper.AlignToSegment( position, trackSeg ); VECTOR2I snap = m_gridHelper.AlignToSegment( position, trackSeg );
@ -3402,14 +3391,10 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
} }
else if( settings->pads == MAGNETIC_OPTIONS::CAPTURE_ALWAYS && m_gridHelper.GetSnap() ) else if( settings->pads == MAGNETIC_OPTIONS::CAPTURE_ALWAYS && m_gridHelper.GetSnap() )
{ {
PAD* pad = findPad( via ); if( PAD* pad = findPad( via ) )
if( pad )
{
aItem->SetPosition( pad->GetPosition() ); aItem->SetPosition( pad->GetPosition() );
} }
} }
}
bool PlaceItem( BOARD_ITEM* aItem, BOARD_COMMIT& aCommit ) override bool PlaceItem( BOARD_ITEM* aItem, BOARD_COMMIT& aCommit ) override
{ {
@ -3431,14 +3416,12 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
} }
else else
{ {
int netcode = findStitchedZoneNet( via ); std::optional<int> netcode = findStitchedZoneNet( via );
// -2 signifies that the user has canceled the placement if( !netcode.has_value() ) // user cancelled net disambiguation menu
// of the via while remaining in the via tool
if( -2 == netcode )
return false; return false;
via->SetNetCode( netcode ); via->SetNetCode( netcode.value() );
via->SetIsFree( via->GetNetCode() > 0 ); via->SetIsFree( via->GetNetCode() > 0 );
} }