drc_proto: working on hole size/track width checker

qa/drc_proto/CMakeLists.txt

@@ -42,7 +42,9 @@ add_executable( drc_proto
     drc_test_provider_clearance_base.cpp
     drc_test_provider_copper_clearance.cpp
     drc_test_provider_hole_clearance.cpp
+    drc_test_provider_hole_size.cpp
     drc_engine.cpp
+    drc_item.cpp
     ../qa_utils/mocks.cpp
     ../pcbnew_utils/board_file_utils.cpp
     ../qa_utils/stdstream_line_reader.cpp

qa/drc_proto/drc_engine.cpp

@@ -111,7 +111,7 @@ void test::DRC_ENGINE::inferImplicitRules()
 }
 
 
-static const int drc_debug_level = 2;
+static const int drc_debug_level = 0;
 
 void test::drc_dbg( int level, const char* fmt, ... )
 {
@@ -242,6 +242,8 @@ test::DRC_RULE* test::DRC_ENGINE::EvalRulesForItems( test::DRC_RULE_ID_T ruleID,
     {
         for( auto condition : rcond->conditions )
         {
+            drc_dbg(8, "   -> check condition '%s'\n", (const char*) condition->m_Expression );
+
             bool result = condition->EvaluateFor( a, b );
             if( result )
             {

qa/drc_proto/drc_engine.h

@@ -69,14 +69,13 @@ enum PCB_DRC_CODE
     DRCE_UNCONNECTED_ITEMS = DRCE_FIRST,    ///< items are unconnected
     DRCE_ALLOWED_ITEMS,                     ///< a disallowed item has been used
     DRCE_CLEARANCE,                         ///< items are too close together
-    DRCE_HOLE_CLEARANCE,
     DRCE_TRACKS_CROSSING,                   ///< tracks are crossing
     DRCE_COPPER_EDGE_CLEARANCE,             ///< a copper item is too close to the board edge
     DRCE_ZONES_INTERSECT,                   ///< copper area outlines intersect
     DRCE_ZONE_HAS_EMPTY_NET,                ///< copper area has a net but no pads in nets, which is suspicious
     DRCE_DANGLING_VIA,                      ///< via which isn't connected to anything
     DRCE_DANGLING_TRACK,                    ///< track with at least one end not connected to anything
-    DRCE_DRILLED_HOLES_TOO_CLOSE,           ///< overlapping drilled holes break drill bits
+    DRCE_HOLE_CLEARANCE,           ///< overlapping drilled holes break drill bits
     DRCE_TRACK_WIDTH,                       ///< Track width is too small or too large
     DRCE_TOO_SMALL_VIA,                     ///< Too small via size
     DRCE_VIA_ANNULUS,                       ///< Via size and drill leave annulus too small or too large
@@ -164,6 +163,8 @@ public:
 
 private:
 
+    void freeCompiledRules();
+
     struct RULE_WITH_CONDITIONS
     {
         std::vector<test::DRC_RULE_CONDITION*> conditions;

qa/drc_proto/drc_rule.h

@@ -45,7 +45,8 @@ namespace test
 enum class DRC_RULE_ID_T {
     DRC_RULE_ID_CLEARANCE = 0,
     DRC_RULE_ID_HOLE_CLEARANCE,
-    DRC_RULE_ID_EDGE_CLEARANCE
+    DRC_RULE_ID_EDGE_CLEARANCE,
+    DRC_RULE_ID_HOLE_SIZE
 };
 
 enum class DRC_RULE_SEVERITY_T {

qa/drc_proto/drc_test_provider_copper_clearance.cpp

@@ -1,3 +1,26 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2020 KiCad Developers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include <common.h>
 #include <class_board.h>
 #include <class_drawsegment.h>
@@ -16,6 +39,16 @@
 #include <drc_proto/drc_rule.h>
 #include <drc_proto/drc_test_provider_clearance_base.h>
 
+/*
+    Copper clearance test. Checks all copper items (pads, vias, tracks, drawings, zones) for their electrical clearance.
+    Errors generated:
+    - DRCE_CLEARANCE
+    - DRCE_TRACKS_CROSSING
+    - DRCE_ZONES_INTERSECT
+
+    TODO: improve zone clearance check (super slow)
+*/
+
 namespace test {
 
 class DRC_TEST_PROVIDER_COPPER_CLEARANCE : public DRC_TEST_PROVIDER_CLEARANCE_BASE
@@ -181,9 +214,8 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testCopperDrawItem( BOARD_ITEM* a
 
         if( actual < INT_MAX )
         {
-            int       errorCode = DRCE_CLEARANCE;
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
 
-            DRC_ITEM* drcItem = new DRC_ITEM( errorCode );
             wxString msg;
             msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
                           rule->GetName(),
@@ -225,7 +257,8 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testCopperDrawItem( BOARD_ITEM* a
 
         if( actual < INT_MAX )
         {
-            DRC_ITEM* drcItem = new DRC_ITEM( DRCE_CLEARANCE );
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+
 
             wxString msg;
 
@@ -329,8 +362,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACK
 
             if( padShape->Collide( &refSeg, minClearance - bds.GetDRCEpsilon(), &actual ) )
             {
-                DRC_ITEM* drcItem = new DRC_ITEM( DRCE_CLEARANCE );
+                DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
-
                 wxString msg;
 
                 msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
@@ -401,7 +433,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACK
         
         if( OPT_VECTOR2I intersection = refSeg.GetSeg().Intersect( trackSeg.GetSeg() ) )
         {
-            DRC_ITEM* drcItem = new DRC_ITEM( DRCE_TRACKS_CROSSING );
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_TRACKS_CROSSING );
 
             // fixme
             drcItem->SetErrorMessage( "FIXME" );
@@ -416,9 +448,8 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACK
         else if( refSeg.Collide( &trackSeg, minClearance, &actual ) )
         {
             wxPoint   pos = getLocation( aRefSeg, trackSeg.GetSeg() );
-            int errorCode = DRCE_CLEARANCE;
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
 
-            DRC_ITEM* drcItem = new DRC_ITEM( errorCode );
 
             wxString msg;
             msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
@@ -432,7 +463,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACK
 
             ReportWithMarker( drcItem, pos );
 
-            if( isErrorLimitExceeded( errorCode ) )
+            if( isErrorLimitExceeded( DRCE_CLEARANCE ) )
                 return;
         }
     }
@@ -475,7 +506,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACK
                 if( zone->GetFilledPolysList( layer ).Collide( testSeg, allowedDist, &actual ) )
                 {
                     actual = std::max( 0, actual - widths );
-                    DRC_ITEM* drcItem = new DRC_ITEM( DRCE_CLEARANCE );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
                     wxString msg;
 
                     msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
@@ -599,7 +630,7 @@ bool test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doPadToPadsDrc( D_PAD* aRefPad, D
 
         if( refPadShape->Collide( pad->GetEffectiveShape().get(), clearanceAllowed, &actual ) )
         {
-            DRC_ITEM* drcItem = new DRC_ITEM( DRCE_CLEARANCE );
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
             wxString msg;
             msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
                           /*m_clearanceSource fixme*/ "",
@@ -688,7 +719,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testZones()
 
                 if( smoothed_polys[ia2].Contains( currentVertex ) )
                 {
-                    DRC_ITEM* drcItem = new DRC_ITEM( DRCE_ZONES_INTERSECT );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
                     drcItem->SetItems( zoneRef, zoneToTest );
                     drcItem->SetViolatingRule( rule );
 
@@ -704,7 +735,7 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testZones()
 
                 if( smoothed_polys[ia].Contains( currentVertex ) )
                 {
-                    DRC_ITEM* drcItem = new DRC_ITEM( DRCE_ZONES_INTERSECT );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
                     drcItem->SetItems( zoneToTest, zoneRef );
                     drcItem->SetViolatingRule( rule );
 
@@ -763,11 +794,11 @@ void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testZones()
 
                 if( actual <= 0 )
                 {
-                    drcItem = new DRC_ITEM( DRCE_ZONES_INTERSECT );
+                    drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
                 }
                 else
                 {
-                    drcItem = new DRC_ITEM( DRCE_CLEARANCE );
+                    drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
                     wxString msg;
 
                     msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),

qa/drc_proto/drc_test_provider_edge_clearance.cpp

@@ -0,0 +1,830 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2020 KiCad Developers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <common.h>
+#include <class_board.h>
+#include <class_drawsegment.h>
+#include <class_pad.h>
+
+#include <convert_basic_shapes_to_polygon.h>
+#include <geometry/polygon_test_point_inside.h>
+
+#include <geometry/seg.h>
+#include <geometry/shape_poly_set.h>
+#include <geometry/shape_rect.h>
+#include <geometry/shape_segment.h>
+
+#include <drc_proto/drc_engine.h>
+#include <drc_proto/drc_item.h>
+#include <drc_proto/drc_rule.h>
+#include <drc_proto/drc_test_provider_clearance_base.h>
+
+/*
+    Board edge clearance test. Checks all items for their mechanical clearances against the board edge.
+    Errors generated:
+    - DRCE_COPPER_EDGE_CLEARANCE
+
+    TODO: holes to edge check
+*/
+
+namespace test {
+
+class DRC_TEST_PROVIDER_EDGE_CLEARANCE : public DRC_TEST_PROVIDER_CLEARANCE_BASE
+{
+public:
+    DRC_TEST_PROVIDER_EDGE_CLEARANCE () :
+        DRC_TEST_PROVIDER_CLEARANCE_BASE()
+        {
+        }
+
+    virtual ~DRC_TEST_PROVIDER_EDGE_CLEARANCE() 
+    {
+    }
+
+    virtual bool Run() override;
+
+    virtual const wxString GetName() const override 
+    {
+        return "clearance"; 
+    };
+
+    virtual const wxString GetDescription() const override
+    {
+        return "Tests copper item vs board edge clearance";
+    }
+
+    virtual std::set<test::DRC_RULE_ID_T> GetMatchingRuleIds() const override;
+
+private:
+    void testPadClearances();
+    void testTrackClearances();
+    void testCopperTextAndGraphics();
+    void testZones();
+    void testCopperDrawItem( BOARD_ITEM* aItem );
+    void doTrackDrc( TRACK* aRefSeg, TRACKS::iterator aStartIt,
+                      TRACKS::iterator aEndIt, bool aTestZones );
+    bool doPadToPadsDrc( D_PAD* aRefPad, D_PAD** aStart, D_PAD** aEnd, int x_limit );
+};
+
+};
+
+
+bool test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::Run()
+{
+    auto bds = m_drcEngine->GetDesignSettings();
+    m_board = m_drcEngine->GetBoard();
+
+    m_largestClearance = 0;
+
+    for( auto rule : m_drcEngine->QueryRulesById( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE ) )
+    {
+        drc_dbg(1, "process rule %p\n", rule );
+        if( rule->GetConstraint().m_Value.HasMin() )
+        {
+            m_largestClearance = std::max( m_largestClearance, rule->GetConstraint().m_Value.Min() );
+            drc_dbg(1, "min-copper-clearance %d\n", rule->GetConstraint().m_Value.Min() );
+        }
+    }
+
+    ReportAux( "Worst clearance : %d nm", m_largestClearance );
+
+    //m_largestClearance = 
+
+    ReportStage( ("Testing pad copper clerances"), 0, 2 );
+    testPadClearances();
+    ReportStage( ("Testing track/via copper clerances"), 1, 2 );
+    testTrackClearances();
+    ReportStage( ("Testing copper drawing/text clerances"), 1, 2 );
+    testCopperTextAndGraphics();
+    ReportStage( ("Testing copper zone clearances"), 1, 2 );
+    testZones();
+
+    return true;
+}
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testCopperTextAndGraphics()
+{
+    // Test copper items for clearance violations with vias, tracks and pads
+
+    for( BOARD_ITEM* brdItem : m_board->Drawings() )
+    {
+        if( IsCopperLayer( brdItem->GetLayer() ) )
+            testCopperDrawItem( brdItem );
+    }
+
+    for( MODULE* module : m_board->Modules() )
+    {
+        TEXTE_MODULE& ref = module->Reference();
+        TEXTE_MODULE& val = module->Value();
+
+        if( ref.IsVisible() && IsCopperLayer( ref.GetLayer() ) )
+            testCopperDrawItem( &ref );
+
+        if( val.IsVisible() && IsCopperLayer( val.GetLayer() ) )
+            testCopperDrawItem( &val );
+
+        if( module->IsNetTie() )
+            continue;
+
+        for( BOARD_ITEM* item : module->GraphicalItems() )
+        {
+            if( IsCopperLayer( item->GetLayer() ) )
+            {
+                if( item->Type() == PCB_MODULE_TEXT_T && ( (TEXTE_MODULE*) item )->IsVisible() )
+                    testCopperDrawItem( item );
+                else if( item->Type() == PCB_MODULE_EDGE_T )
+                    testCopperDrawItem( item );
+            }
+        }
+    }
+}
+
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testCopperDrawItem( BOARD_ITEM* aItem )
+{
+    EDA_RECT            bbox;
+    std::shared_ptr<SHAPE> itemShape;
+    DRAWSEGMENT*        drawItem = dynamic_cast<DRAWSEGMENT*>( aItem );
+    EDA_TEXT*           textItem = dynamic_cast<EDA_TEXT*>( aItem );
+
+    if( drawItem )
+    {
+        bbox = drawItem->GetBoundingBox();
+        itemShape = drawItem->GetEffectiveShape();
+    }
+    else if( textItem )
+    {
+        bbox = textItem->GetTextBox();
+        itemShape = textItem->GetEffectiveShape();
+    }
+    else
+    {
+        wxFAIL_MSG( "unknown item type in testCopperDrawItem()" );
+        return;
+    }
+
+    SHAPE_RECT bboxShape( bbox.GetX(), bbox.GetY(), bbox.GetWidth(), bbox.GetHeight() );
+
+    //if( itemShape->Empty() )
+      //  return;
+
+    // Test tracks and vias
+    for( auto track : m_board->Tracks() )
+    {
+        if( !track->IsOnLayer( aItem->GetLayer() ) )
+            continue;
+
+        auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aItem, track );
+        auto minClearance = rule->GetConstraint().GetValue().Min();
+        int     actual = INT_MAX;
+        wxPoint pos;
+
+        SHAPE_SEGMENT trackSeg( track->GetStart(), track->GetEnd(), track->GetWidth() );
+
+        // Fast test to detect a track segment candidate inside the text bounding box
+        if( !bboxShape.Collide( &trackSeg, 0 ) )
+            continue;
+
+        if( !itemShape->Collide( &trackSeg, minClearance, &actual ) )
+            continue;
+
+        pos = (wxPoint) itemShape->Centre();
+
+        if( actual < INT_MAX )
+        {
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+
+            wxString msg;
+            msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                          rule->GetName(),
+                          MessageTextFromValue( userUnits(), minClearance, true ),
+                          MessageTextFromValue( userUnits(), actual, true ) );
+
+            drcItem->SetErrorMessage( msg );
+            drcItem->SetItems( track, aItem );
+            drcItem->SetViolatingRule( rule );
+
+            ReportWithMarker( drcItem, pos );
+        }
+    }
+
+    // Test pads
+    for( auto pad : m_board->GetPads() )
+    {
+        if( !pad->IsOnLayer( aItem->GetLayer() ) )
+            continue;
+
+        // Graphic items are allowed to act as net-ties within their own footprint
+        if( drawItem && pad->GetParent() == drawItem->GetParent() )
+            continue;
+
+        auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aItem, pad );
+        auto minClearance = rule->GetConstraint().GetValue().Min();
+
+        int actual = INT_MAX;
+
+        int bb_radius = pad->GetBoundingRadius() + minClearance;
+
+        // Fast test to detect a pad candidate inside the text bounding box
+        // Finer test (time consumming) is made only for pads near the text.
+        if( !bboxShape.Collide( SEG( pad->GetPosition(), pad->GetPosition() ), bb_radius ) )
+            continue;
+
+        if( !pad->GetEffectiveShape()->Collide( itemShape.get(), minClearance, &actual ) )
+            continue;
+
+        if( actual < INT_MAX )
+        {
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+
+
+            wxString msg;
+
+            msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                          rule->GetName(),
+                          MessageTextFromValue( userUnits(), minClearance, true ),
+                          MessageTextFromValue( userUnits(), actual, true ) );
+
+            drcItem->SetErrorMessage( msg );
+            drcItem->SetItems( pad, aItem );
+            drcItem->SetViolatingRule( rule );
+
+            ReportWithMarker( drcItem, pad->GetPosition() );
+        }
+    }
+}
+
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
+{
+    const int         delta = 500;  // This is the number of tests between 2 calls to the
+                                    // progress bar
+    int               count = m_board->Tracks().size();
+    int               deltamax = count/delta;
+
+    ReportProgress(0.0);
+    ReportAux("Testing %d tracks...", count );
+
+    int ii = 0;
+    count = 0;
+
+    for( auto seg_it = m_board->Tracks().begin(); seg_it != m_board->Tracks().end(); seg_it++ )
+    {
+        if( ii++ > delta )
+        {
+            ii = 0;
+            count++;
+
+            ReportProgress( (double) ii / (double ) count );
+        }
+
+        // Test new segment against tracks and pads, optionally against copper zones
+        doTrackDrc( *seg_it, seg_it + 1, m_board->Tracks().end(), false /*fixme: control for copper zones*/ );
+    }
+}
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doTrackDrc( TRACK* aRefSeg, TRACKS::iterator aStartIt,
+                      TRACKS::iterator aEndIt, bool aTestZones )
+{
+    BOARD_DESIGN_SETTINGS&     bds = m_board->GetDesignSettings();
+
+    SHAPE_SEGMENT refSeg( aRefSeg->GetStart(), aRefSeg->GetEnd(), aRefSeg->GetWidth() );
+    PCB_LAYER_ID refLayer = aRefSeg->GetLayer();
+    LSET         refLayerSet = aRefSeg->GetLayerSet();
+
+    EDA_RECT     refSegBB = aRefSeg->GetBoundingBox();
+    int          refSegWidth = aRefSeg->GetWidth();
+
+
+    /******************************************/
+    /* Phase 0 : via DRC tests :              */
+    /******************************************/
+
+    // fixme: via annulus and other nin-coppper clearance tests moved elsewhere
+
+    /******************************************/
+    /* Phase 1 : test DRC track to pads :     */
+    /******************************************/
+
+    // Compute the min distance to pads
+    for( MODULE* mod : m_board->Modules() )
+    {
+        // Don't preflight at the module level.  Getting a module's bounding box goes
+        // through all its pads anyway (so it's no faster), and also all its drawings
+        // (so it's in fact slower).
+
+        for( D_PAD* pad : mod->Pads() )
+        {
+            // Preflight based on bounding boxes.
+            EDA_RECT inflatedBB = refSegBB;
+            inflatedBB.Inflate( pad->GetBoundingRadius() + m_largestClearance );
+
+            if( !inflatedBB.Contains( pad->GetPosition() ) )
+                continue;
+
+            if( !( pad->GetLayerSet() & refLayerSet ).any() )
+                continue;
+
+            // No need to check pads with the same net as the refSeg.
+            if( pad->GetNetCode() && aRefSeg->GetNetCode() == pad->GetNetCode() )
+                continue;
+
+            // fixme: hole to hole clearance moved elsewhere
+
+            auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aRefSeg, pad );
+            auto minClearance = rule->GetConstraint().GetValue().Min();
+            int clearanceAllowed = minClearance - bds.GetDRCEpsilon();
+            int actual;
+
+            auto padShape = pad->GetEffectiveShape();
+
+            if( padShape->Collide( &refSeg, minClearance - bds.GetDRCEpsilon(), &actual ) )
+            {
+                DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+                wxString msg;
+
+                msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                              /*m_clearanceSource fixme*/ "",
+                              MessageTextFromValue( userUnits(), minClearance, true ),
+                              MessageTextFromValue( userUnits(), actual, true ) );
+
+                drcItem->SetErrorMessage( msg );
+                drcItem->SetItems( aRefSeg, pad );
+                drcItem->SetViolatingRule( rule );
+
+                ReportWithMarker( drcItem, pad->GetPosition() );
+
+                if( isErrorLimitExceeded( DRCE_CLEARANCE ) )
+                    return;
+            }
+        }
+    }
+
+    /***********************************************/
+    /* Phase 2: test DRC with other track segments */
+    /***********************************************/
+
+    // Test the reference segment with other track segments
+    for( auto it = aStartIt; it != aEndIt; it++ )
+    {
+        TRACK* track = *it;
+
+        // No problem if segments have the same net code:
+        if( aRefSeg->GetNetCode() == track->GetNetCode() )
+            continue;
+
+        // No problem if tracks are on different layers:
+        // Note that while the general case of GetLayerSet intersection always works,
+        // the others are much faster.
+        bool sameLayers;
+
+        if( aRefSeg->Type() == PCB_VIA_T )
+        {
+            if( track->Type() == PCB_VIA_T )
+                sameLayers = ( refLayerSet & track->GetLayerSet() ).any();
+            else
+                sameLayers = refLayerSet.test( track->GetLayer() );
+        }
+        else
+        {
+            if( track->Type() == PCB_VIA_T )
+                sameLayers = track->GetLayerSet().test( refLayer );
+            else
+                sameLayers = track->GetLayer() == refLayer;
+        }
+
+        if( !sameLayers )
+            continue;
+
+        // Preflight based on worst-case inflated bounding boxes:
+        EDA_RECT trackBB = track->GetBoundingBox();
+        trackBB.Inflate( m_largestClearance );
+
+        if( !trackBB.Intersects( refSegBB ) )
+            continue;
+
+        auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aRefSeg, track );
+        auto minClearance = rule->GetConstraint().GetValue().Min();
+
+        SHAPE_SEGMENT trackSeg( track->GetStart(), track->GetEnd(), track->GetWidth() );
+        int actual;
+        
+        if( OPT_VECTOR2I intersection = refSeg.GetSeg().Intersect( trackSeg.GetSeg() ) )
+        {
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_TRACKS_CROSSING );
+
+            // fixme
+            drcItem->SetErrorMessage( "FIXME" );
+            drcItem->SetItems( aRefSeg, track );
+            drcItem->SetViolatingRule( rule );
+
+            ReportWithMarker( drcItem, (wxPoint) intersection.get() );
+
+            if( isErrorLimitExceeded( DRCE_TRACKS_CROSSING ) )
+                return;
+        }
+        else if( refSeg.Collide( &trackSeg, minClearance, &actual ) )
+        {
+            wxPoint   pos = getLocation( aRefSeg, trackSeg.GetSeg() );
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+
+
+            wxString msg;
+            msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                          /*m_clearanceSource fixme*/"",
+                          MessageTextFromValue( userUnits(), minClearance, true ),
+                          MessageTextFromValue( userUnits(), actual, true ) );
+
+            drcItem->SetErrorMessage( msg );
+            drcItem->SetItems( aRefSeg, track );
+            drcItem->SetViolatingRule( rule );
+
+            ReportWithMarker( drcItem, pos );
+
+            if( isErrorLimitExceeded( DRCE_CLEARANCE ) )
+                return;
+        }
+    }
+
+    /***************************************/
+    /* Phase 3: test DRC with copper zones */
+    /***************************************/
+    // Can be *very* time consumming.
+    if( aTestZones )
+    {
+        SEG testSeg( aRefSeg->GetStart(), aRefSeg->GetEnd() );
+
+        for( ZONE_CONTAINER* zone : m_board->Zones() )
+        {
+            if( !( refLayerSet & zone->GetLayerSet() ).any() || zone->GetIsKeepout() )
+                continue;
+
+            for( PCB_LAYER_ID layer : zone->GetLayerSet().Seq() )
+            {
+                if( zone->GetFilledPolysList( layer ).IsEmpty() )
+                    continue;
+
+                if( zone->GetNetCode() && zone->GetNetCode() == aRefSeg->GetNetCode() )
+                    continue;
+
+                // fixme: per-layer onLayer() property
+
+                auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aRefSeg, zone );
+                auto minClearance = rule->GetConstraint().GetValue().Min();
+                int widths       = refSegWidth / 2;
+
+                // to avoid false positive, due to rounding issues and approxiamtions
+                // in distance and clearance calculations, use a small threshold for distance
+                // (1 micron)
+                #define THRESHOLD_DIST Millimeter2iu( 0.001 )
+
+                int allowedDist  = minClearance + widths + THRESHOLD_DIST;
+                int actual = INT_MAX;
+
+                if( zone->GetFilledPolysList( layer ).Collide( testSeg, allowedDist, &actual ) )
+                {
+                    actual = std::max( 0, actual - widths );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+                    wxString msg;
+
+                    msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                                rule->GetName(),
+                                MessageTextFromValue( userUnits(), minClearance, true ),
+                                MessageTextFromValue( userUnits(), actual, true ) );
+
+                    drcItem->SetErrorMessage( msg );
+                    drcItem->SetItems( aRefSeg, zone );
+                    drcItem->SetViolatingRule( rule );
+
+                    ReportWithMarker( drcItem, getLocation( aRefSeg, zone ) );
+                }
+            }
+        }
+    }
+
+// fixme: board edge clearance to another rule
+}
+
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadClearances( )
+{
+    auto bds = m_drcEngine->GetDesignSettings();
+    std::vector<D_PAD*>    sortedPads;
+
+    m_board->GetSortedPadListByXthenYCoord( sortedPads );
+
+    ReportAux("Testing %d pads...", sortedPads.size() );
+
+    for( auto p : sortedPads )
+        
+    if( sortedPads.empty() )
+        return;
+
+    // find the max size of the pads (used to stop the pad-to-pad tests)
+    int max_size = 0;
+
+    for( D_PAD* pad : sortedPads )
+    {
+        // GetBoundingRadius() is the radius of the minimum sized circle fully containing the pad
+        int radius = pad->GetBoundingRadius();
+
+        if( radius > max_size )
+            max_size = radius;
+    }
+
+    // Better to be fast than accurate; this keeps us from having to look up / calculate the
+    // actual clearances
+    max_size += m_largestClearance;
+
+    // Upper limit of pad list (limit not included)
+    D_PAD** listEnd = &sortedPads[0] + sortedPads.size();
+
+    int ii = 0;
+    // Test the pads
+    for( auto& pad : sortedPads )
+    {
+        if( ii % 100 == 0 )
+            ReportProgress( (double) ii / (double) sortedPads.size() );
+
+        ii++;
+        int x_limit = pad->GetPosition().x + pad->GetBoundingRadius() + max_size;
+
+        doPadToPadsDrc( pad, &pad, listEnd, x_limit );
+    }
+}
+
+bool test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::doPadToPadsDrc( D_PAD* aRefPad, D_PAD** aStart, D_PAD** aEnd,
+                          int x_limit )
+{
+    const static LSET all_cu = LSET::AllCuMask();
+
+    LSET layerMask = aRefPad->GetLayerSet() & all_cu;
+
+    for( D_PAD** pad_list = aStart;  pad_list<aEnd;  ++pad_list )
+    {
+        D_PAD* pad = *pad_list;
+
+        if( pad == aRefPad )
+            continue;
+
+        // We can stop the test when pad->GetPosition().x > x_limit
+        // because the list is sorted by X values
+        if( pad->GetPosition().x > x_limit )
+            break;
+
+        // The pad must be in a net (i.e pt_pad->GetNet() != 0 ),
+        // But no problem if pads have the same netcode (same net)
+        if( pad->GetNetCode() && ( aRefPad->GetNetCode() == pad->GetNetCode() ) )
+            continue;
+
+        // if pads are from the same footprint
+        if( pad->GetParent() == aRefPad->GetParent() )
+        {
+            // and have the same pad number ( equivalent pads  )
+
+            // one can argue that this 2nd test is not necessary, that any
+            // two pads from a single module are acceptable.  This 2nd test
+            // should eventually be a configuration option.
+            if( pad->PadNameEqual( aRefPad ) )
+                continue;
+        }
+
+        // if either pad has no drill and is only on technical layers, not a clearance violation
+        if( ( ( pad->GetLayerSet() & layerMask ) == 0 && !pad->GetDrillSize().x ) ||
+            ( ( aRefPad->GetLayerSet() & layerMask ) == 0 && !aRefPad->GetDrillSize().x ) )
+        {
+            continue;
+        }
+
+        auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, aRefPad, pad );
+        auto minClearance = rule->GetConstraint().GetValue().Min();
+
+        drc_dbg(4, "pad %p vs %p constraint %d\n", aRefPad, pad, minClearance );
+
+        int  clearanceAllowed = minClearance - m_drcEngine->GetDesignSettings()->GetDRCEpsilon();
+        int  actual;
+
+        auto refPadShape = aRefPad->GetEffectiveShape();
+
+        if( refPadShape->Collide( pad->GetEffectiveShape().get(), clearanceAllowed, &actual ) )
+        {
+            DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+            wxString msg;
+            msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                          /*m_clearanceSource fixme*/ "",
+                          MessageTextFromValue( userUnits(), minClearance, true ),
+                          MessageTextFromValue( userUnits(), actual, true ) );
+
+            drcItem->SetErrorMessage( msg );
+            drcItem->SetItems( aRefPad, pad );
+            drcItem->SetViolatingRule( rule );
+
+            ReportWithMarker( drcItem, aRefPad->GetPosition() );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+void test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::testZones()
+{
+    // Test copper areas for valid netcodes -> fixme, goes to connectivity checks
+
+    std::vector<SHAPE_POLY_SET> smoothed_polys;
+    smoothed_polys.resize( m_board->GetAreaCount() );
+
+    for( int ii = 0; ii < m_board->GetAreaCount(); ii++ )
+    {
+        ZONE_CONTAINER* zone = m_board->GetArea( ii );
+        ZONE_CONTAINER*    zoneRef = m_board->GetArea( ii );
+        std::set<VECTOR2I> colinearCorners;
+
+        zoneRef->GetColinearCorners( m_board, colinearCorners );
+        zoneRef->BuildSmoothedPoly( smoothed_polys[ii], &colinearCorners );
+    }
+
+    // iterate through all areas
+    for( int ia = 0; ia < m_board->GetAreaCount(); ia++ )
+    {
+        ZONE_CONTAINER* zoneRef = m_board->GetArea( ia );
+
+        if( !zoneRef->IsOnCopperLayer() )
+            continue;
+
+        // If we are testing a single zone, then iterate through all other zones
+        // Otherwise, we have already tested the zone combination
+        for( int ia2 = ia + 1; ia2 < m_board->GetAreaCount(); ia2++ )
+        {
+            ZONE_CONTAINER* zoneToTest = m_board->GetArea( ia2 );
+
+            if( zoneRef == zoneToTest )
+                continue;
+
+            // test for same layer
+            if( zoneRef->GetLayer() != zoneToTest->GetLayer() )
+                continue;
+
+            // Test for same net
+            if( zoneRef->GetNetCode() == zoneToTest->GetNetCode() && zoneRef->GetNetCode() >= 0 )
+                continue;
+
+            // test for different priorities
+            if( zoneRef->GetPriority() != zoneToTest->GetPriority() )
+                continue;
+
+            // test for different types
+            if( zoneRef->GetIsKeepout() != zoneToTest->GetIsKeepout() )
+                continue;
+
+            // Examine a candidate zone: compare zoneToTest to zoneRef
+
+            // Get clearance used in zone to zone test.
+            auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE, zoneRef, zoneToTest );
+            auto zone2zoneClearance = rule->GetConstraint().GetValue().Min();
+
+            // Keepout areas have no clearance, so set zone2zoneClearance to 1
+            // ( zone2zoneClearance = 0  can create problems in test functions)
+            if( zoneRef->GetIsKeepout() ) // fixme: really?
+                zone2zoneClearance = 1;
+
+            // test for some corners of zoneRef inside zoneToTest
+            for( auto iterator = smoothed_polys[ia].IterateWithHoles(); iterator; iterator++ )
+            {
+                VECTOR2I currentVertex = *iterator;
+                wxPoint pt( currentVertex.x, currentVertex.y );
+
+                if( smoothed_polys[ia2].Contains( currentVertex ) )
+                {
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
+                    drcItem->SetItems( zoneRef, zoneToTest );
+                    drcItem->SetViolatingRule( rule );
+
+                    ReportWithMarker( drcItem, pt );
+                }
+            }
+
+            // test for some corners of zoneToTest inside zoneRef
+            for( auto iterator = smoothed_polys[ia2].IterateWithHoles(); iterator; iterator++ )
+            {
+                VECTOR2I currentVertex = *iterator;
+                wxPoint pt( currentVertex.x, currentVertex.y );
+
+                if( smoothed_polys[ia].Contains( currentVertex ) )
+                {
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
+                    drcItem->SetItems( zoneToTest, zoneRef );
+                    drcItem->SetViolatingRule( rule );
+
+                    ReportWithMarker( drcItem, pt );
+                }
+            }
+
+            // Iterate through all the segments of refSmoothedPoly
+            std::map<wxPoint, int> conflictPoints;
+
+            for( auto refIt = smoothed_polys[ia].IterateSegmentsWithHoles(); refIt; refIt++ )
+            {
+                // Build ref segment
+                SEG refSegment = *refIt;
+
+                // Iterate through all the segments in smoothed_polys[ia2]
+                for( auto testIt = smoothed_polys[ia2].IterateSegmentsWithHoles(); testIt; testIt++ )
+                {
+                    // Build test segment
+                    SEG testSegment = *testIt;
+                    wxPoint pt;
+
+                    int ax1, ay1, ax2, ay2;
+                    ax1 = refSegment.A.x;
+                    ay1 = refSegment.A.y;
+                    ax2 = refSegment.B.x;
+                    ay2 = refSegment.B.y;
+
+                    int bx1, by1, bx2, by2;
+                    bx1 = testSegment.A.x;
+                    by1 = testSegment.A.y;
+                    bx2 = testSegment.B.x;
+                    by2 = testSegment.B.y;
+
+                    int d = GetClearanceBetweenSegments( bx1, by1, bx2, by2,
+                                                         0,
+                                                         ax1, ay1, ax2, ay2,
+                                                         0,
+                                                         zone2zoneClearance,
+                                                         &pt.x, &pt.y );
+
+                    if( d < zone2zoneClearance )
+                    {
+                        if( conflictPoints.count( pt ) )
+                            conflictPoints[ pt ] = std::min( conflictPoints[ pt ], d );
+                        else
+                            conflictPoints[ pt ] = d;
+                    }
+                }
+            }
+
+            for( const std::pair<const wxPoint, int>& conflict : conflictPoints )
+            {
+                int       actual = conflict.second;
+                DRC_ITEM* drcItem;
+
+                if( actual <= 0 )
+                {
+                    drcItem = DRC_ITEM::Create( DRCE_ZONES_INTERSECT );
+                }
+                else
+                {
+                    drcItem = DRC_ITEM::Create( DRCE_CLEARANCE );
+                    wxString msg;
+
+                    msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
+                                  /* fixme */"",
+                                  MessageTextFromValue( userUnits(), zone2zoneClearance, true ),
+                                  MessageTextFromValue( userUnits(), conflict.second, true ) );
+
+                    drcItem->SetErrorMessage( msg );
+                    
+                }
+
+                drcItem->SetViolatingRule( rule );
+                drcItem->SetItems( zoneRef, zoneToTest );
+
+                ReportWithMarker( drcItem, conflict.first );
+            }
+        }
+    }
+}
+
+
+std::set<test::DRC_RULE_ID_T> test::DRC_TEST_PROVIDER_COPPER_CLEARANCE::GetMatchingRuleIds() const
+{
+    return { DRC_RULE_ID_T::DRC_RULE_ID_CLEARANCE };
+}
+
+
+namespace detail
+{
+    static test::DRC_REGISTER_TEST_PROVIDER<test::DRC_TEST_PROVIDER_COPPER_CLEARANCE> dummy;
+}

qa/drc_proto/drc_test_provider_hole_clearance.cpp

@@ -1,3 +1,26 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2020 KiCad Developers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include <common.h>
 #include <class_board.h>
 #include <class_drawsegment.h>
@@ -16,6 +39,14 @@
 #include <drc_proto/drc_rule.h>
 #include <drc_proto/drc_test_provider_clearance_base.h>
 
+/*
+    Holes clearance test. Checks pad and via holes for their mechanical clearances.
+    Generated errors:
+    - DRCE_HOLE_CLEARANCE
+
+    TODO: vias-in-smd-pads check
+*/
+
 namespace test {
 
 class DRC_TEST_PROVIDER_HOLE_CLEARANCE : public DRC_TEST_PROVIDER_CLEARANCE_BASE
@@ -45,24 +76,21 @@ public:
     virtual std::set<test::DRC_RULE_ID_T> GetMatchingRuleIds() const override;
 
 private:
-    bool checkPad( D_PAD* aPad );
+    void addHole( const VECTOR2I& aLocation, int aRadius, BOARD_ITEM* aOwner );
-    bool checkVia( VIA* aVia );
-    bool checkMicroVia( VIA* aVia );
 
-    void addHole( const wxPoint& aLocation, int aRadius, BOARD_ITEM* aOwner );
+    void buildHoleList();
-    bool checkHoles();
+    void testHoles2Holes();
+    void testPads2Holes();
 
-    void testPadHoles();
     bool doPadToPadHoleDrc(  D_PAD* aRefPad, D_PAD** aStart, D_PAD** aEnd, int x_limit );
 
     struct DRILLED_HOLE
     {
-        wxPoint     m_location;
+        VECTOR2I     m_location;
         int         m_drillRadius = 0;
         BOARD_ITEM* m_owner = nullptr;
     };
 
-    EDA_UNITS                 m_units;
     BOARD*                    m_board;
     std::vector<DRILLED_HOLE> m_holes;
     int                       m_largestRadius;
@@ -78,6 +106,7 @@ bool test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
     m_board = m_drcEngine->GetBoard();
 
     m_largestClearance = 0;
+    m_largestRadius = 0;
 
     for( auto rule : m_drcEngine->QueryRulesById( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_CLEARANCE ) )
     {
@@ -91,13 +120,55 @@ bool test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
 
     ReportAux( "Worst hole clearance : %d nm", m_largestClearance );
 
-    ReportStage( ("Testing pad/hole clearances"), 0, 2 );
+    buildHoleList();
-    testPadHoles();
+
+    ReportStage( ("Testing hole<->pad clearances"), 0, 2 );
+    testPads2Holes();
+    ReportStage( ("Testing hole<->hole clearances"), 0, 2 );
+    testHoles2Holes();
+
+    reportRuleStatistics();
 
     return true;
 }
 
-void test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::testPadHoles()
+
+void test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::buildHoleList()
+{
+    bool                   success = true;
+    BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings();
+
+    m_holes.clear();
+
+    for( auto module : m_board->Modules() )
+    {
+        for( auto pad : module->Pads() )
+        {
+            int holeSize = std::min( pad->GetDrillSize().x, pad->GetDrillSize().y );
+
+            if( holeSize == 0 )
+                continue;
+            
+            // fixme: support for non-round (i.e. slotted) holes
+            if( pad->GetDrillShape() == PAD_DRILL_SHAPE_CIRCLE )
+                addHole( pad->GetPosition(), pad->GetDrillSize().x / 2, pad );
+        }
+    }
+
+    for( auto track : m_board->Tracks() )
+    {
+        if ( track->Type() == PCB_VIA_T )
+        {
+            auto via = static_cast<VIA*>( track );
+            addHole( via->GetPosition(), via->GetDrillValue() / 2, via );
+        }
+    }
+
+    ReportAux( "Total drilled holes : %d", m_holes.size() );
+
+}
+
+void test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::testPads2Holes()
 {
     std::vector<D_PAD*>    sortedPads;
 
@@ -201,11 +272,13 @@ bool test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc(  D_PAD* aRefPad,
 
                 drc_dbg(1,"check pad %p rule '%s' cl %d\n", pad, (const char*) rule->GetName().c_str(), minClearance );
 
+                accountCheck( rule );
+
                 auto refPadShape = aRefPad->GetEffectiveShape();
                 // fixme: pad stacks...
                 if( refPadShape->Collide( pad->GetEffectiveHoleShape(), minClearance, &actual ) )
                 {
-                    DRC_ITEM* drcItem = new DRC_ITEM( DRCE_HOLE_CLEARANCE );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_HOLE_CLEARANCE );
 
                     wxString msg;
 
@@ -230,12 +303,14 @@ bool test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc(  D_PAD* aRefPad,
                 auto minClearance = rule->GetConstraint().GetValue().Min();
                 int actual;
 
+                accountCheck( rule );
+                
                 drc_dbg(1,"check pad %p rule '%s' cl %d\n", aRefPad, (const char*) rule->GetName().c_str(), minClearance );
 
                 auto padShape = pad->GetEffectiveShape();
                 if( padShape->Collide( aRefPad->GetEffectiveHoleShape(), minClearance, &actual ) )
                 {
-                    DRC_ITEM* drcItem = new DRC_ITEM( DRCE_HOLE_CLEARANCE );
+                    DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_HOLE_CLEARANCE );
                     wxString msg;
 
                     msg.Printf( drcItem->GetErrorText() + _( " (%s clearance %s; actual %s)" ),
@@ -257,6 +332,86 @@ bool test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc(  D_PAD* aRefPad,
     return true;
 }
 
+
+void test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::addHole( const VECTOR2I& aLocation, int aRadius, BOARD_ITEM* aOwner )
+{
+    DRILLED_HOLE hole;
+
+    hole.m_location = aLocation;
+    hole.m_drillRadius = aRadius;
+    hole.m_owner = aOwner;
+
+    m_largestRadius = std::max( m_largestRadius, aRadius );
+
+    m_holes.push_back( hole );
+}
+
+
+void test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::testHoles2Holes()
+{
+    // No need to check if we're ignoring DRCE_DRILLED_HOLES_TOO_CLOSE; if we are then we
+    // won't have collected any holes to test.
+
+    // Sort holes by X for performance.  In the nested iteration we then need to look at
+    // following holes only while they are within the refHole's neighborhood as defined by
+    // the refHole radius + the minimum hole-to-hole clearance + the largest radius any of
+    // the following holes can have.
+    std::sort( m_holes.begin(), m_holes.end(),
+               []( const DRILLED_HOLE& a, const DRILLED_HOLE& b )
+               {
+                   if( a.m_location.x == b.m_location.x )
+                       return a.m_location.y < b.m_location.y;
+                   else
+                       return a.m_location.x < b.m_location.x;
+               } );
+
+    for( size_t ii = 0; ii < m_holes.size(); ++ii )
+    {
+        DRILLED_HOLE& refHole = m_holes[ ii ];
+        int neighborhood = refHole.m_drillRadius + m_largestClearance + m_largestRadius;
+
+        for( size_t jj = ii + 1; jj < m_holes.size(); ++jj )
+        {
+            DRILLED_HOLE& checkHole = m_holes[ jj ];
+
+            if( refHole.m_location.x + neighborhood < checkHole.m_location.x )
+                break;
+
+            // Holes with identical locations are allowable
+            if( checkHole.m_location == refHole.m_location )
+                continue;
+
+            int actual = ( checkHole.m_location - refHole.m_location ).EuclideanNorm();
+            actual = std::max( 0, actual - checkHole.m_drillRadius - refHole.m_drillRadius );
+
+            DRC_RULE* rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_CLEARANCE, refHole.m_owner, checkHole.m_owner );
+            int minClearance = rule->GetConstraint().GetValue().Min();
+    
+            accountCheck( rule );
+
+            if( actual < minClearance )
+            {
+                DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_HOLE_CLEARANCE );
+                wxString msg;
+
+                msg.Printf( drcItem->GetErrorText() + _( " (clearance %s; actual %s)" ),
+                            MessageTextFromValue( userUnits(), minClearance, true ),
+                            MessageTextFromValue( userUnits(), actual, true ) );
+
+                drcItem->SetViolatingRule( rule );
+                drcItem->SetErrorMessage( msg );
+                drcItem->SetItems( refHole.m_owner, checkHole.m_owner );
+
+                ReportWithMarker( drcItem, refHole.m_location );
+
+                if( isErrorLimitExceeded( DRCE_HOLE_CLEARANCE ) )
+                    return;
+            }
+        }
+    }
+}
+
+
 std::set<test::DRC_RULE_ID_T> test::DRC_TEST_PROVIDER_HOLE_CLEARANCE::GetMatchingRuleIds() const
 {
     return { DRC_RULE_ID_T::DRC_RULE_ID_HOLE_CLEARANCE };

qa/drc_proto/drc_test_provider_hole_size.cpp

@@ -0,0 +1,203 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2020 KiCad Developers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <class_board.h>
+#include <class_drawsegment.h>
+#include <class_pad.h>
+#include <common.h>
+
+#include <convert_basic_shapes_to_polygon.h>
+#include <geometry/polygon_test_point_inside.h>
+
+#include <geometry/seg.h>
+#include <geometry/shape_poly_set.h>
+#include <geometry/shape_rect.h>
+#include <geometry/shape_segment.h>
+
+#include <drc_proto/drc_engine.h>
+#include <drc_proto/drc_item.h>
+#include <drc_proto/drc_rule.h>
+#include <drc_proto/drc_test_provider_clearance_base.h>
+
+
+/*
+    Drilled hole size test. scans vias/through-hole pads and checks for min drill sizes
+    Errors generated:
+    - DRCE_TOO_SMALL_DRILL
+    - DRCE_TOO_SMALL_MICROVIA_DRILL
+
+    TODO: max drill size check
+*/
+
+namespace test
+{
+
+class DRC_TEST_PROVIDER_HOLE_SIZE : public DRC_TEST_PROVIDER
+{
+public:
+    DRC_TEST_PROVIDER_HOLE_SIZE()
+    {
+    }
+
+    virtual ~DRC_TEST_PROVIDER_HOLE_SIZE()
+    {
+    }
+
+    virtual bool Run() override;
+
+    virtual const wxString GetName() const override
+    {
+        return "hole_size";
+    };
+
+    virtual const wxString GetDescription() const override
+    {
+        return "Tests sizes of drilled holes (via/pad drills)";
+    }
+
+    virtual std::set<test::DRC_RULE_ID_T> GetMatchingRuleIds() const override;
+
+private:
+    bool checkVia( VIA* via );
+    bool checkPad( D_PAD* aPad );
+
+    BOARD* m_board;
+};
+
+}; // namespace test
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::Run()
+{
+    ReportStage( ( "Testing pad holes" ), 0, 2 );
+
+    for( auto module : m_board->Modules() )
+    {
+        for( auto pad : module->Pads() )
+        {
+            if( checkPad( pad ) )
+                break;
+        }
+    }
+
+    ReportStage( ( "Testing via/microvia holes" ), 0, 2 );
+
+    std::vector<VIA*> vias;
+
+    for( auto track : m_board->Tracks() )
+    {
+        if( track->Type() == PCB_VIA_T )
+        {
+            vias.push_back( static_cast<VIA*>( track ) );
+        }
+    }
+
+
+    for( auto via : vias )
+    {
+        if( checkVia( via ) )
+            break;
+    }
+
+    reportRuleStatistics();
+
+    return true;
+}
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::checkPad( D_PAD* aPad )
+{
+    int holeSize = std::min( aPad->GetDrillSize().x, aPad->GetDrillSize().y );
+
+    if( holeSize == 0 )
+        return true;
+
+    auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE, aPad );
+    auto minHole = rule->GetConstraint().GetValue().Min();
+
+    accountCheck( rule );
+
+    if( holeSize < minHole )
+    {
+        wxString  msg;
+        DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_TOO_SMALL_DRILL );
+
+        msg.Printf( drcItem->GetErrorText() + _( " (%s; actual %s)" ),
+                MessageTextFromValue( userUnits(), minHole, true ),
+                MessageTextFromValue( userUnits(), holeSize, true ) );
+
+        drcItem->SetViolatingRule( rule );
+        drcItem->SetErrorMessage( msg );
+        drcItem->SetItems( aPad );
+
+        ReportWithMarker( drcItem, aPad->GetPosition() );
+
+        return isErrorLimitExceeded( DRCE_TOO_SMALL_DRILL );
+    }
+
+    return false;
+}
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::checkVia( VIA* via )
+{
+    auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE, via );
+    auto minHole = rule->GetConstraint().GetValue().Min();
+
+    accountCheck( rule );
+
+    if( via->GetDrillValue() < minHole )
+    {
+        wxString msg;
+        int errorCode = via->GetViaType() == VIATYPE::MICROVIA ? DRCE_TOO_SMALL_MICROVIA_DRILL :
+                                                                 DRCE_TOO_SMALL_DRILL;
+
+        DRC_ITEM* drcItem = DRC_ITEM::Create( errorCode );
+
+        msg.Printf( drcItem->GetErrorText() + _( " (%s; actual %s)" ),
+                MessageTextFromValue( userUnits(), minHole, true ),
+                MessageTextFromValue( userUnits(), via->GetDrillValue(), true ) );
+
+        drcItem->SetViolatingRule( rule );
+        drcItem->SetErrorMessage( msg );
+        drcItem->SetItems( via );
+
+        ReportWithMarker( drcItem, via->GetPosition() );
+
+        return isErrorLimitExceeded( errorCode );
+    }
+
+    return false;
+}
+
+
+std::set<test::DRC_RULE_ID_T> test::DRC_TEST_PROVIDER_HOLE_SIZE::GetMatchingRuleIds() const
+{
+    return { DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE };
+}
+
+
+namespace detail
+{
+static test::DRC_REGISTER_TEST_PROVIDER<test::DRC_TEST_PROVIDER_HOLE_SIZE> dummy;
+}

qa/drc_proto/drc_test_provider_track_width.cpp

@@ -0,0 +1,203 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2020 KiCad Developers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <class_board.h>
+#include <class_drawsegment.h>
+#include <class_pad.h>
+#include <common.h>
+
+#include <convert_basic_shapes_to_polygon.h>
+#include <geometry/polygon_test_point_inside.h>
+
+#include <geometry/seg.h>
+#include <geometry/shape_poly_set.h>
+#include <geometry/shape_rect.h>
+#include <geometry/shape_segment.h>
+
+#include <drc_proto/drc_engine.h>
+#include <drc_proto/drc_item.h>
+#include <drc_proto/drc_rule.h>
+#include <drc_proto/drc_test_provider_clearance_base.h>
+
+
+/*
+    Drilled hole size test. scans vias/through-hole pads and checks for min drill sizes
+    Errors generated:
+    - DRCE_TOO_SMALL_DRILL
+    - DRCE_TOO_SMALL_MICROVIA_DRILL
+
+    TODO: max drill size check
+*/
+
+namespace test
+{
+
+class DRC_TEST_PROVIDER_HOLE_SIZE : public DRC_TEST_PROVIDER
+{
+public:
+    DRC_TEST_PROVIDER_HOLE_SIZE()
+    {
+    }
+
+    virtual ~DRC_TEST_PROVIDER_HOLE_SIZE()
+    {
+    }
+
+    virtual bool Run() override;
+
+    virtual const wxString GetName() const override
+    {
+        return "hole_size";
+    };
+
+    virtual const wxString GetDescription() const override
+    {
+        return "Tests sizes of drilled holes (via/pad drills)";
+    }
+
+    virtual std::set<test::DRC_RULE_ID_T> GetMatchingRuleIds() const override;
+
+private:
+    bool checkVia( VIA* via );
+    bool checkPad( D_PAD* aPad );
+
+    BOARD* m_board;
+};
+
+}; // namespace test
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::Run()
+{
+    ReportStage( ( "Testing pad holes" ), 0, 2 );
+
+    for( auto module : m_board->Modules() )
+    {
+        for( auto pad : module->Pads() )
+        {
+            if( checkPad( pad ) )
+                break;
+        }
+    }
+
+    ReportStage( ( "Testing via/microvia holes" ), 0, 2 );
+
+    std::vector<VIA*> vias;
+
+    for( auto track : m_board->Tracks() )
+    {
+        if( track->Type() == PCB_VIA_T )
+        {
+            vias.push_back( static_cast<VIA*>( track ) );
+        }
+    }
+
+
+    for( auto via : vias )
+    {
+        if( checkVia( via ) )
+            break;
+    }
+
+    reportRuleStatistics();
+
+    return true;
+}
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::checkPad( D_PAD* aPad )
+{
+    int holeSize = std::min( aPad->GetDrillSize().x, aPad->GetDrillSize().y );
+
+    if( holeSize == 0 )
+        return true;
+
+    auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE, aPad );
+    auto minHole = rule->GetConstraint().GetValue().Min();
+
+    accountCheck( rule );
+
+    if( holeSize < minHole )
+    {
+        wxString  msg;
+        DRC_ITEM* drcItem = DRC_ITEM::Create( DRCE_TOO_SMALL_DRILL );
+
+        msg.Printf( drcItem->GetErrorText() + _( " (%s; actual %s)" ),
+                MessageTextFromValue( userUnits(), minHole, true ),
+                MessageTextFromValue( userUnits(), holeSize, true ) );
+
+        drcItem->SetViolatingRule( rule );
+        drcItem->SetErrorMessage( msg );
+        drcItem->SetItems( aPad );
+
+        ReportWithMarker( drcItem, aPad->GetPosition() );
+
+        return isErrorLimitExceeded( DRCE_TOO_SMALL_DRILL );
+    }
+
+    return false;
+}
+
+
+bool test::DRC_TEST_PROVIDER_HOLE_SIZE::checkVia( VIA* via )
+{
+    auto rule = m_drcEngine->EvalRulesForItems( test::DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE, via );
+    auto minHole = rule->GetConstraint().GetValue().Min();
+
+    accountCheck( rule );
+
+    if( via->GetDrillValue() < minHole )
+    {
+        wxString msg;
+        int errorCode = via->GetViaType() == VIATYPE::MICROVIA ? DRCE_TOO_SMALL_MICROVIA_DRILL :
+                                                                 DRCE_TOO_SMALL_DRILL;
+
+        DRC_ITEM* drcItem = DRC_ITEM::Create( errorCode );
+
+        msg.Printf( drcItem->GetErrorText() + _( " (%s; actual %s)" ),
+                MessageTextFromValue( userUnits(), minHole, true ),
+                MessageTextFromValue( userUnits(), via->GetDrillValue(), true ) );
+
+        drcItem->SetViolatingRule( rule );
+        drcItem->SetErrorMessage( msg );
+        drcItem->SetItems( via );
+
+        ReportWithMarker( drcItem, via->GetPosition() );
+
+        return isErrorLimitExceeded( errorCode );
+    }
+
+    return false;
+}
+
+
+std::set<test::DRC_RULE_ID_T> test::DRC_TEST_PROVIDER_HOLE_SIZE::GetMatchingRuleIds() const
+{
+    return { DRC_RULE_ID_T::DRC_RULE_ID_HOLE_SIZE };
+}
+
+
+namespace detail
+{
+static test::DRC_REGISTER_TEST_PROVIDER<test::DRC_TEST_PROVIDER_HOLE_SIZE> dummy;
+}