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

pcbnew/drc: post-rebase fixes

This commit is contained in:
Tomasz Wlostowski 2020-08-12 00:16:20 +02:00
parent 52fefd15e0
commit e907e43bd9
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/drc/drc.cpp
View File

@ -1155,7 +1155,8 @@ bool DRC::doPadToPadsDrc( BOARD_COMMIT& aCommit, D_PAD* aRefPad, D_PAD** aStart,
if( aRefPad->GetDrillSize().x ) if( aRefPad->GetDrillSize().x )
{ {
int minClearance = pad->GetClearance( nullptr, &m_clearanceSource ); int minClearance = pad->GetClearance( pad->GetLayer(), nullptr,
&m_clearanceSource );
int actual; int actual;
if( pad->Collide( aRefPad->GetEffectiveHoleShape(), minClearance, &actual ) ) if( pad->Collide( aRefPad->GetEffectiveHoleShape(), minClearance, &actual ) )

4
pcbnew/drc/drc_clearance_test_functions.cpp
View File

@ -232,7 +232,7 @@ void DRC::doTrackDrc( BOARD_COMMIT& aCommit, TRACK* aRefSeg, TRACKS::iterator aS
{ {
if( viaAnnulus < minAnnulus ) if( viaAnnulus < minAnnulus )
{ {
DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_VIA_ANNULUS ); std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_VIA_ANNULUS );
m_msg.Printf( _( "Via annulus too small (%s %s; actual %s)" ), m_msg.Printf( _( "Via annulus too small (%s %s; actual %s)" ),
m_clearanceSource, m_clearanceSource,
@ -256,7 +256,7 @@ void DRC::doTrackDrc( BOARD_COMMIT& aCommit, TRACK* aRefSeg, TRACKS::iterator aS
if( viaAnnulus < minAnnulus ) if( viaAnnulus < minAnnulus )
{ {
DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_VIA_ANNULUS ); std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_VIA_ANNULUS );
m_msg.Printf( _( "Via annulus too small (%s %s; actual %s)" ), m_msg.Printf( _( "Via annulus too small (%s %s; actual %s)" ),
m_clearanceSource, m_clearanceSource,

5
pcbnew/drc/drc_rule.h
View File

@ -46,7 +46,7 @@ class PCB_EXPR_UCODE;
#define DISALLOW_FOOTPRINTS (1 << 9) #define DISALLOW_FOOTPRINTS (1 << 9)
enum DRC_RULE_ID_T enum DRC_CONSTRAINT_TYPE_T
{ {
DRC_RULE_ID_UNKNOWN = -1, DRC_RULE_ID_UNKNOWN = -1,
DRC_RULE_ID_CLEARANCE = 0, DRC_RULE_ID_CLEARANCE = 0,
@ -93,9 +93,10 @@ public:
{} {}
const MINOPTMAX<int>& GetValue() const { return m_Value; } const MINOPTMAX<int>& GetValue() const { return m_Value; }
MINOPTMAX<int>& Value() { return m_Value; }
public: public:
DRC_RULE_ID_T m_Type; DRC_CONSTRAINT_TYPE_T m_Type;
MINOPTMAX<int> m_Value; MINOPTMAX<int> m_Value;
int m_DisallowFlags; int m_DisallowFlags;
LSET m_LayerCondition; LSET m_LayerCondition;