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

Generalize DRCItem inspections. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/10539
This commit is contained in:
Jeff Young 2024-01-28 19:49:43 +00:00
parent 6856e59374
commit 833ec402a0
5 changed files with 100 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/tool/action_menu.h
View File

@ -64,6 +64,9 @@ public:
*/ */
void SetTitle( const wxString& aTitle ) override; void SetTitle( const wxString& aTitle ) override;
// Yes, it hides a non-virtual method in the parent class.
wxString GetTitle() const { return m_title; }
/** /**
* Decide whether a title for a pop up menu should be displayed. * Decide whether a title for a pop up menu should be displayed.
*/ */

18
include/widgets/wx_menubar.h
View File

@ -26,6 +26,7 @@
#include <wx/accel.h> #include <wx/accel.h>
#include <wx/menu.h> #include <wx/menu.h>
#include <tool/action_menu.h>
/** /**
@ -53,6 +54,23 @@ public:
// Don't use the passed in accelerator table, create a new empty one // Don't use the passed in accelerator table, create a new empty one
wxMenuBar::SetAcceleratorTable( wxAcceleratorTable() ); wxMenuBar::SetAcceleratorTable( wxAcceleratorTable() );
} }
wxString GetMenuLabelText( size_t aPos ) const override
{
if( ACTION_MENU* actionMenu = dynamic_cast<ACTION_MENU*>( GetMenu( aPos ) ) )
{
wxString title = actionMenu->GetTitle();
// Clear accelerator key markings
title.Replace( wxS( " & " ), wxS( " {amp} " ) );
title.Replace( wxS( "&" ), wxEmptyString );
title.Replace( wxS( "{amp}" ), wxS( "&" ) );
return title;
}
return wxMenuBar::GetMenuLabelText( aPos );
}
}; };
#endif // COMMON_WIDGETS_WX_BUSY_INDICATOR__H #endif // COMMON_WIDGETS_WX_BUSY_INDICATOR__H

53
pcbnew/dialogs/dialog_drc.cpp
View File

@ -567,7 +567,9 @@ void DIALOG_DRC::OnDRCItemDClick( wxDataViewEvent& aEvent )
void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent ) void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
{ {
RC_TREE_NODE* node = RC_TREE_MODEL::ToNode( aEvent.GetItem() ); TOOL_MANAGER* toolMgr = m_frame->GetToolManager();
BOARD_INSPECTION_TOOL* inspectionTool = toolMgr->GetTool<BOARD_INSPECTION_TOOL>();
RC_TREE_NODE* node = RC_TREE_MODEL::ToNode( aEvent.GetItem() );
if( !node ) if( !node )
return; return;
@ -611,30 +613,10 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
} }
} }
if( rcItem->GetErrorCode() == DRCE_CLEARANCE wxString inspectDRCErrorMenuText = inspectionTool->InspectDRCErrorMenuText( rcItem );
|| rcItem->GetErrorCode() == DRCE_EDGE_CLEARANCE
|| rcItem->GetErrorCode() == DRCE_HOLE_CLEARANCE if( !inspectDRCErrorMenuText.IsEmpty() )
|| rcItem->GetErrorCode() == DRCE_DRILLED_HOLES_TOO_CLOSE ) menu.Append( 3, inspectDRCErrorMenuText );
{
menu.Append( 3, _( "Run Inspect > Clearance Resolution" ) );
}
else if( rcItem->GetErrorCode() == DRCE_TEXT_HEIGHT
|| rcItem->GetErrorCode() == DRCE_TEXT_THICKNESS
|| rcItem->GetErrorCode() == DRCE_DIFF_PAIR_UNCOUPLED_LENGTH_TOO_LONG
|| rcItem->GetErrorCode() == DRCE_TRACK_WIDTH
|| rcItem->GetErrorCode() == DRCE_VIA_DIAMETER
|| rcItem->GetErrorCode() == DRCE_ANNULAR_WIDTH
|| rcItem->GetErrorCode() == DRCE_DRILL_OUT_OF_RANGE
|| rcItem->GetErrorCode() == DRCE_MICROVIA_DRILL_OUT_OF_RANGE
|| rcItem->GetErrorCode() == DRCE_CONNECTION_WIDTH
|| rcItem->GetErrorCode() == DRCE_ASSERTION_FAILURE )
{
menu.Append( 3, _( "Run Inspect > Constraints Resolution" ) );
}
else if( rcItem->GetErrorCode() == DRCE_LIB_FOOTPRINT_MISMATCH )
{
menu.Append( 3, _( "Run Inspect > Compare Footprint with Library" ) );
}
menu.AppendSeparator(); menu.AppendSeparator();
@ -667,10 +649,7 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
switch( GetPopupMenuSelectionFromUser( menu ) ) switch( GetPopupMenuSelectionFromUser( menu ) )
{ {
case 1: case 1:
{ if( PCB_MARKER* marker = dynamic_cast<PCB_MARKER*>( rcItem->GetParent() ) )
PCB_MARKER* marker = dynamic_cast<PCB_MARKER*>( rcItem->GetParent() );
if( marker )
{ {
marker->SetExcluded( false ); marker->SetExcluded( false );
@ -690,13 +669,9 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
} }
break; break;
}
case 2: case 2:
{ if( PCB_MARKER* marker = dynamic_cast<PCB_MARKER*>( rcItem->GetParent() ) )
PCB_MARKER* marker = dynamic_cast<PCB_MARKER*>( rcItem->GetParent() );
if( marker )
{ {
marker->SetExcluded( true ); marker->SetExcluded( true );
@ -720,10 +695,8 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
} }
break; break;
}
case 11: case 11:
{
for( PCB_MARKER* marker : m_frame->GetBoard()->Markers() ) for( PCB_MARKER* marker : m_frame->GetBoard()->Markers() )
{ {
DRC_ITEM* candidateDrcItem = static_cast<DRC_ITEM*>( marker->GetRCItem().get() ); DRC_ITEM* candidateDrcItem = static_cast<DRC_ITEM*>( marker->GetRCItem().get() );
@ -736,10 +709,8 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markersProvider, m_severities ); static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markersProvider, m_severities );
modified = true; modified = true;
break; break;
}
case 21: case 21:
{
for( PCB_MARKER* marker : m_frame->GetBoard()->Markers() ) for( PCB_MARKER* marker : m_frame->GetBoard()->Markers() )
{ {
DRC_ITEM* candidateDrcItem = static_cast<DRC_ITEM*>( marker->GetRCItem().get() ); DRC_ITEM* candidateDrcItem = static_cast<DRC_ITEM*>( marker->GetRCItem().get() );
@ -752,16 +723,10 @@ void DIALOG_DRC::OnDRCItemRClick( wxDataViewEvent& aEvent )
static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markersProvider, m_severities ); static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markersProvider, m_severities );
modified = true; modified = true;
break; break;
}
case 3: case 3:
{
TOOL_MANAGER* toolMgr = m_frame->GetToolManager();
BOARD_INSPECTION_TOOL* inspectionTool = toolMgr->GetTool<BOARD_INSPECTION_TOOL>();
inspectionTool->InspectDRCError( node->m_RcItem ); inspectionTool->InspectDRCError( node->m_RcItem );
break; break;
}
case 4: case 4:
bds().m_DRCSeverities[ rcItem->GetErrorCode() ] = RPT_SEVERITY_ERROR; bds().m_DRCSeverities[ rcItem->GetErrorCode() ] = RPT_SEVERITY_ERROR;

69
pcbnew/tools/board_inspection_tool.cpp
View File

@ -269,6 +269,69 @@ wxString reportMax( PCB_BASE_FRAME* aFrame, DRC_CONSTRAINT& aConstraint )
} }
wxString BOARD_INSPECTION_TOOL::InspectDRCErrorMenuText( const std::shared_ptr<RC_ITEM>& aDRCItem )
{
auto menuDescription =
[&]( const TOOL_ACTION& aAction )
{
wxString menuItemLabel = aAction.GetMenuLabel();
wxMenuBar* menuBar = m_frame->GetMenuBar();
for( size_t ii = 0; ii < menuBar->GetMenuCount(); ++ii )
{
for( wxMenuItem* menuItem : menuBar->GetMenu( ii )->GetMenuItems() )
{
if( menuItem->GetItemLabelText() == menuItemLabel )
{
wxString menuTitleLabel = menuBar->GetMenuLabelText( ii );
menuTitleLabel.Replace( wxS( "&" ), wxS( "&&" ) );
menuItemLabel.Replace( wxS( "&" ), wxS( "&&" ) );
return wxString::Format( _( "Run %s > %s" ),
menuTitleLabel,
menuItemLabel );
}
}
}
return wxString::Format( _( "Run %s" ), aAction.GetFriendlyName() );
};
if( aDRCItem->GetErrorCode() == DRCE_CLEARANCE
|| aDRCItem->GetErrorCode() == DRCE_EDGE_CLEARANCE
|| aDRCItem->GetErrorCode() == DRCE_HOLE_CLEARANCE
|| aDRCItem->GetErrorCode() == DRCE_DRILLED_HOLES_TOO_CLOSE )
{
return menuDescription( PCB_ACTIONS::inspectClearance );
}
else if( aDRCItem->GetErrorCode() == DRCE_TEXT_HEIGHT
|| aDRCItem->GetErrorCode() == DRCE_TEXT_THICKNESS
|| aDRCItem->GetErrorCode() == DRCE_DIFF_PAIR_UNCOUPLED_LENGTH_TOO_LONG
|| aDRCItem->GetErrorCode() == DRCE_TRACK_WIDTH
|| aDRCItem->GetErrorCode() == DRCE_VIA_DIAMETER
|| aDRCItem->GetErrorCode() == DRCE_ANNULAR_WIDTH
|| aDRCItem->GetErrorCode() == DRCE_DRILL_OUT_OF_RANGE
|| aDRCItem->GetErrorCode() == DRCE_MICROVIA_DRILL_OUT_OF_RANGE
|| aDRCItem->GetErrorCode() == DRCE_CONNECTION_WIDTH
|| aDRCItem->GetErrorCode() == DRCE_ASSERTION_FAILURE )
{
return menuDescription( PCB_ACTIONS::inspectConstraints );
}
else if( aDRCItem->GetErrorCode() == DRCE_LIB_FOOTPRINT_MISMATCH )
{
return menuDescription( PCB_ACTIONS::diffFootprint );
}
else if( aDRCItem->GetErrorCode() == DRCE_DANGLING_TRACK
|| aDRCItem->GetErrorCode() == DRCE_DANGLING_VIA )
{
return menuDescription( PCB_ACTIONS::cleanupTracksAndVias );
}
return wxEmptyString;
}
void BOARD_INSPECTION_TOOL::InspectDRCError( const std::shared_ptr<RC_ITEM>& aDRCItem ) void BOARD_INSPECTION_TOOL::InspectDRCError( const std::shared_ptr<RC_ITEM>& aDRCItem )
{ {
BOARD_ITEM* a = m_frame->GetBoard()->GetItem( aDRCItem->GetMainItemID() ); BOARD_ITEM* a = m_frame->GetBoard()->GetItem( aDRCItem->GetMainItemID() );
@ -286,6 +349,12 @@ void BOARD_INSPECTION_TOOL::InspectDRCError( const std::shared_ptr<RC_ITEM>& aDR
return; return;
} }
else if( aDRCItem->GetErrorCode() == DRCE_DANGLING_TRACK
|| aDRCItem->GetErrorCode() == DRCE_DANGLING_VIA )
{
m_toolMgr->RunAction( PCB_ACTIONS::cleanupTracksAndVias );
return;
}
DIALOG_BOOK_REPORTER* dialog = m_frame->GetInspectDrcErrorDialog(); DIALOG_BOOK_REPORTER* dialog = m_frame->GetInspectDrcErrorDialog();
wxCHECK( dialog, /* void */ ); wxCHECK( dialog, /* void */ );

1
pcbnew/tools/board_inspection_tool.h
View File

@ -82,6 +82,7 @@ public:
///< Show the ratsnest for a given net. ///< Show the ratsnest for a given net.
int ShowNetInRatsnest( const TOOL_EVENT& aEvent ); int ShowNetInRatsnest( const TOOL_EVENT& aEvent );
wxString InspectDRCErrorMenuText( const std::shared_ptr<RC_ITEM>& aDRCItem );
void InspectDRCError( const std::shared_ptr<RC_ITEM>& aDRCItem ); void InspectDRCError( const std::shared_ptr<RC_ITEM>& aDRCItem );
///< Show the clearance resolution for two selected items. ///< Show the clearance resolution for two selected items.