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

Display violation layer (and select it) for DRC errors. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5123
This commit is contained in:
Jeff Young 2020-08-11 17:46:35 +01:00
parent 8b67d5185a
commit f65a0037dc
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pcbnew/dialogs/dialog_drc.cpp
View File

@ -236,23 +236,51 @@ void DIALOG_DRC::SetFootprintsProvider( RC_ITEMS_PROVIDER* aProvider )
void DIALOG_DRC::OnDRCItemSelected( wxDataViewEvent& aEvent )
{
BOARD* board = m_brdEditor->GetBoard();
RC_TREE_NODE* node = RC_TREE_MODEL::ToNode( aEvent.GetItem() );
const KIID& itemID = RC_TREE_MODEL::ToUUID( aEvent.GetItem() );
BOARD_ITEM* item = m_brdEditor->GetBoard()->GetItem( itemID );
LSET visibleLayers = m_brdEditor->GetBoard()->GetVisibleLayers();
WINDOW_THAWER thawer( m_brdEditor );
BOARD_ITEM* item = board->GetItem( itemID );
if( item && ( item->GetLayerSet() & visibleLayers ) == 0 )
if( item )
{
if( IsOK( this, wxString::Format( _( "Item not currently visible.\nShow the '%s' layer?" ),
item->GetLayerName() ) ) )
{
m_brdEditor->GetLayerManager()->SetLayerVisible( item->GetLayer(), true );
}
}
PCB_LAYER_ID principalLayer = item->GetLayer();
RC_ITEM* rc_item = node->m_RcItem;
BOARD_ITEM* a = board->GetItem( rc_item->GetMainItemID() );
BOARD_ITEM* b = board->GetItem( rc_item->GetAuxItemID() );
BOARD_ITEM* c = board->GetItem( rc_item->GetAuxItem2ID() );
BOARD_ITEM* d = board->GetItem( rc_item->GetAuxItem3ID() );
LSET violationLayers = a->GetLayerSet();
if( b )
violationLayers &= b->GetLayerSet();
if( c )
violationLayers &= c->GetLayerSet();
if( d )
violationLayers &= d->GetLayerSet();
if( violationLayers.count() )
principalLayer = violationLayers.Seq().front();
else
violationLayers.set( principalLayer );
WINDOW_THAWER thawer( m_brdEditor );
m_brdEditor->FocusOnItem( item );
m_brdEditor->GetCanvas()->Refresh();
if( ( violationLayers & board->GetVisibleLayers() ) == 0 )
{
m_brdEditor->GetLayerManager()->SetLayerVisible( item->GetLayer(), true );
m_brdEditor->GetCanvas()->Refresh();
}
if( board->GetVisibleLayers().test( principalLayer ) )
m_brdEditor->SetActiveLayer( principalLayer );
}
aEvent.Skip();
}

2
pcbnew/pcb_base_frame.cpp
View File

@ -176,7 +176,7 @@ void PCB_BASE_FRAME::FocusOnItem( BOARD_ITEM* aItem )
BOARD_ITEM* lastItem = GetBoard()->GetItem( lastBrightenedItemID );
if( lastItem && lastItem != aItem )
if( lastItem && lastItem != aItem && lastItem != DELETED_BOARD_ITEM::GetInstance() )
{
lastItem->ClearBrightened();