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

Clean up terminology so it matches the user message better.

This commit is contained in:
Jeff Young 2020-10-11 22:30:43 +01:00
parent f6ab7f4e78
commit 72f6127e53
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/drc/drc_item.cpp
View File

@ -168,7 +168,7 @@ DRC_ITEM DRC_ITEM::silkMaskClearance( DRCE_SILK_MASK_CLEARANCE,
_( "Silkscreen clipped by solder mask" ), _( "Silkscreen clipped by solder mask" ),
wxT( "silk_over_copper" ) ); wxT( "silk_over_copper" ) );
DRC_ITEM DRC_ITEM::silkSilkClearance( DRCE_SILK_SILK_CLEARANCE, DRC_ITEM DRC_ITEM::silkOverlaps( DRCE_OVERLAPPING_SILK,
_( "Silkscreen overlap" ), _( "Silkscreen overlap" ),
wxT( "silk_overlap" ) ); wxT( "silk_overlap" ) );
@ -224,7 +224,7 @@ std::vector<std::reference_wrapper<RC_ITEM>> DRC_ITEM::allItemTypes( {
DRC_ITEM::extraFootprint, DRC_ITEM::extraFootprint,
DRC_ITEM::netConflict, DRC_ITEM::netConflict,
DRC_ITEM::unresolvedVariable, DRC_ITEM::unresolvedVariable,
DRC_ITEM::silkSilkClearance, DRC_ITEM::silkOverlaps,
DRC_ITEM::silkMaskClearance, DRC_ITEM::silkMaskClearance,
DRC_ITEM::lengthOutOfRange, DRC_ITEM::lengthOutOfRange,
DRC_ITEM::skewOutOfRange, DRC_ITEM::skewOutOfRange,
@ -270,7 +270,7 @@ std::shared_ptr<DRC_ITEM> DRC_ITEM::Create( int aErrorCode )
case DRCE_NET_CONFLICT: return std::make_shared<DRC_ITEM>( netConflict ); case DRCE_NET_CONFLICT: return std::make_shared<DRC_ITEM>( netConflict );
case DRCE_EXTRA_FOOTPRINT: return std::make_shared<DRC_ITEM>( extraFootprint ); case DRCE_EXTRA_FOOTPRINT: return std::make_shared<DRC_ITEM>( extraFootprint );
case DRCE_UNRESOLVED_VARIABLE: return std::make_shared<DRC_ITEM>( unresolvedVariable ); case DRCE_UNRESOLVED_VARIABLE: return std::make_shared<DRC_ITEM>( unresolvedVariable );
case DRCE_SILK_SILK_CLEARANCE: return std::make_shared<DRC_ITEM>( silkSilkClearance ); case DRCE_OVERLAPPING_SILK: return std::make_shared<DRC_ITEM>( silkOverlaps );
case DRCE_SILK_MASK_CLEARANCE: return std::make_shared<DRC_ITEM>( silkMaskClearance ); case DRCE_SILK_MASK_CLEARANCE: return std::make_shared<DRC_ITEM>( silkMaskClearance );
case DRCE_LENGTH_OUT_OF_RANGE: return std::make_shared<DRC_ITEM>( lengthOutOfRange ); case DRCE_LENGTH_OUT_OF_RANGE: return std::make_shared<DRC_ITEM>( lengthOutOfRange );
case DRCE_SKEW_OUT_OF_RANGE: return std::make_shared<DRC_ITEM>( skewOutOfRange ); case DRCE_SKEW_OUT_OF_RANGE: return std::make_shared<DRC_ITEM>( skewOutOfRange );

4
pcbnew/drc/drc_item.h
View File

@ -70,7 +70,7 @@ enum PCB_DRC_CODE {
DRCE_UNRESOLVED_VARIABLE, DRCE_UNRESOLVED_VARIABLE,
DRCE_SILK_MASK_CLEARANCE, // silkscreen clipped by mask (potentially leaving it DRCE_SILK_MASK_CLEARANCE, // silkscreen clipped by mask (potentially leaving it
// over pads, exposed copper, etc.) // over pads, exposed copper, etc.)
DRCE_SILK_SILK_CLEARANCE, // silk to silk clearance error DRCE_OVERLAPPING_SILK, // silk to silk clearance error
DRCE_LENGTH_OUT_OF_RANGE, DRCE_LENGTH_OUT_OF_RANGE,
DRCE_SKEW_OUT_OF_RANGE, DRCE_SKEW_OUT_OF_RANGE,
DRCE_TOO_MANY_VIAS, DRCE_TOO_MANY_VIAS,
@ -154,7 +154,7 @@ private:
static DRC_ITEM netConflict; static DRC_ITEM netConflict;
static DRC_ITEM unresolvedVariable; static DRC_ITEM unresolvedVariable;
static DRC_ITEM silkMaskClearance; static DRC_ITEM silkMaskClearance;
static DRC_ITEM silkSilkClearance; static DRC_ITEM silkOverlaps;
static DRC_ITEM lengthOutOfRange; static DRC_ITEM lengthOutOfRange;
static DRC_ITEM skewOutOfRange; static DRC_ITEM skewOutOfRange;
static DRC_ITEM tooManyVias; static DRC_ITEM tooManyVias;

6
pcbnew/drc/drc_test_provider_silk_clearance.cpp
View File

@ -38,7 +38,7 @@
/* /*
Silk to silk clearance test. Check all silkscreen features against each other. Silk to silk clearance test. Check all silkscreen features against each other.
Errors generated: Errors generated:
- DRCE_SILK_SILK_CLEARANCE - DRCE_OVERLAPPING_SILK
*/ */
@ -117,7 +117,7 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
[&]( const DRC_RTREE::LAYER_PAIR& aLayers, DRC_RTREE::ITEM_WITH_SHAPE* aRefItem, [&]( const DRC_RTREE::LAYER_PAIR& aLayers, DRC_RTREE::ITEM_WITH_SHAPE* aRefItem,
DRC_RTREE::ITEM_WITH_SHAPE* aTestItem, bool* aCollisionDetected ) -> bool DRC_RTREE::ITEM_WITH_SHAPE* aTestItem, bool* aCollisionDetected ) -> bool
{ {
if( m_drcEngine->IsErrorLimitExceeded( DRCE_SILK_SILK_CLEARANCE ) ) if( m_drcEngine->IsErrorLimitExceeded( DRCE_OVERLAPPING_SILK ) )
return false; return false;
auto constraint = m_drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_SILK_CLEARANCE, auto constraint = m_drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_SILK_CLEARANCE,
@ -178,7 +178,7 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
if( !aRefItem->shape->Collide( aTestItem->shape, minClearance, &actual, &pos ) ) if( !aRefItem->shape->Collide( aTestItem->shape, minClearance, &actual, &pos ) )
return true; return true;
std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_SILK_SILK_CLEARANCE ); std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_OVERLAPPING_SILK );
if( minClearance > 0 ) if( minClearance > 0 )
{ {