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

Allow an easy way for DRC tests to specify compound objects or not.

This commit is contained in:
Jeff Young 2020-10-25 20:24:47 +00:00
parent ccfa0f5189
commit 5b1e1075a9
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/drc/drc_test_provider.cpp
View File

@ -30,6 +30,11 @@
#include <class_zone.h>
#include <pcb_text.h>
// A list of all basic (ie: non-compound) board geometry items
std::vector<KICAD_T> DRC_TEST_PROVIDER::s_allBasicItems;
DRC_TEST_PROVIDER::DRC_TEST_PROVIDER() :
m_drcEngine( nullptr )
{
@ -126,6 +131,15 @@ int DRC_TEST_PROVIDER::forEachGeometryItem( const std::vector<KICAD_T>& aTypes,
std::bitset<MAX_STRUCT_TYPE_ID> typeMask;
int n = 0;
if( s_allBasicItems.size() == 0 )
{
for( int i = 0; i < MAX_STRUCT_TYPE_ID; i++ )
{
if( i != PCB_MODULE_T && i != PCB_GROUP_T )
s_allBasicItems.push_back( (KICAD_T) i );
}
}
if( aTypes.size() == 0 )
{
for( int i = 0; i < MAX_STRUCT_TYPE_ID; i++ )

6
pcbnew/drc/drc_test_provider.h
View File

@ -34,8 +34,7 @@
class DRC_ENGINE;
class DRC_TEST_PROVIDER;
class DRC_TEST_PROVIDER_REGISTRY
class DRC_TEST_PROVIDER_REGISTRY
{
public:
DRC_TEST_PROVIDER_REGISTRY() {};
@ -123,6 +122,9 @@ protected:
bool isInvisibleText( const BOARD_ITEM* aItem ) const;
// List of basic (ie: non-compound) geometry items
static std::vector<KICAD_T> s_allBasicItems;
EDA_UNITS userUnits() const;
DRC_ENGINE* m_drcEngine;
std::unordered_map<const DRC_RULE*, int> m_stats;

5
pcbnew/drc/drc_test_provider_edge_clearance.cpp
View File

@ -144,7 +144,7 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
};
forEachGeometryItem( { PCB_SHAPE_T }, LSET( Edge_Cuts ), queryBoardOutlineItems );
forEachGeometryItem( {}, LSET::AllCuMask(), queryBoardGeometryItems );
forEachGeometryItem( s_allBasicItems, LSET::AllCuMask(), queryBoardGeometryItems );
wxString val;
wxGetEnv( "WXTRACE", &val );
@ -205,7 +205,8 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
return false;
boardItems.clear();
forEachGeometryItem( {}, LSET( 2, F_SilkS, B_SilkS ), queryBoardGeometryItems );
forEachGeometryItem( s_allBasicItems, LSET( 2, F_SilkS, B_SilkS ),
queryBoardGeometryItems );
for( const std::unique_ptr<PCB_SHAPE>& outlineItem : boardOutline )
{

4
pcbnew/drc/drc_test_provider_silk_clearance.cpp
View File

@ -184,8 +184,8 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
return true;
};
forEachGeometryItem( {}, LSET( 2, F_SilkS, B_SilkS ), addToSilkTree );
forEachGeometryItem( {}, LSET::FrontMask() | LSET::BackMask(), addToTargetTree );
forEachGeometryItem( s_allBasicItems, LSET( 2, F_SilkS, B_SilkS ), addToSilkTree );
forEachGeometryItem( s_allBasicItems, LSET::FrontMask() | LSET::BackMask(), addToTargetTree );
reportAux( _("Testing %d silkscreen features against %d board items."),
silkTree.size(),