From 3544bc09fdcb9a8137933b7d84b196b7820ac7ab Mon Sep 17 00:00:00 2001 From: Mario Luzeiro Date: Sun, 6 Sep 2020 11:20:03 +0100 Subject: [PATCH] 3D-Viewer: remove not used inner holes containers --- 3d-viewer/3d_canvas/board_adapter.h | 23 ---------------------- 3d-viewer/3d_canvas/create_layer_items.cpp | 16 ++------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h index 5af17925c6..66bc29cec0 100644 --- a/3d-viewer/3d_canvas/board_adapter.h +++ b/3d-viewer/3d_canvas/board_adapter.h @@ -451,14 +451,6 @@ class BOARD_ADAPTER return m_through_outer_ring_holes_vias_poly; } - /** - * @brief GetThroughHole_Vias_Inner_poly - - */ - const SHAPE_POLY_SET &GetThroughHole_Vias_Inner_poly() const noexcept - { - return m_through_inner_holes_vias_poly; - } - /** * @brief GetThroughHole_Inner - Get the ThroughHole container * @return a container with holes @@ -468,15 +460,6 @@ class BOARD_ADAPTER return m_through_holes_inner; } - /** - * @brief GetThroughHole_Inner_poly - - * @return - */ - const SHAPE_POLY_SET &GetThroughHole_Inner_poly() const noexcept - { - return m_through_inner_holes_poly; - } - /** * @brief GetStats_Nr_Vias - Get statistics of the nr of vias * @return number of vias @@ -714,18 +697,12 @@ private: /// It contains polygon contours for through holes (outer cylinder) SHAPE_POLY_SET m_through_outer_holes_poly; - /// It contains polygon contours for through holes (inner cylinder) - SHAPE_POLY_SET m_through_inner_holes_poly; - /// It contains polygon contours for through holes vias (outer cylinder) SHAPE_POLY_SET m_through_outer_holes_vias_poly; /// It contains polygon contours for through holes vias (outer annular ring) SHAPE_POLY_SET m_through_outer_ring_holes_vias_poly; - /// It contains polygon contours for through holes vias (inner cylinder) - SHAPE_POLY_SET m_through_inner_holes_vias_poly; - /// PCB board outline polygon SHAPE_POLY_SET m_board_poly; diff --git a/3d-viewer/3d_canvas/create_layer_items.cpp b/3d-viewer/3d_canvas/create_layer_items.cpp index 53b21e9309..3fef3c0dbb 100644 --- a/3d-viewer/3d_canvas/create_layer_items.cpp +++ b/3d-viewer/3d_canvas/create_layer_items.cpp @@ -103,11 +103,9 @@ void BOARD_ADAPTER::destroyLayers() m_through_holes_vias_inner.Clear(); m_through_outer_holes_poly_NPTH.RemoveAllContours(); m_through_outer_holes_poly.RemoveAllContours(); - //m_through_inner_holes_poly.RemoveAllContours(); m_through_outer_holes_vias_poly.RemoveAllContours(); m_through_outer_ring_holes_vias_poly.RemoveAllContours(); - m_through_inner_holes_vias_poly.RemoveAllContours(); } @@ -390,9 +388,6 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter ) TransformCircleToPolygon( m_through_outer_holes_poly, via->GetStart(), hole_outer_radius, ARC_HIGH_DEF ); - TransformCircleToPolygon( m_through_inner_holes_poly, via->GetStart(), - holediameter / 2, ARC_HIGH_DEF ); - // Add same thing for vias only TransformCircleToPolygon( m_through_outer_holes_vias_poly, @@ -403,11 +398,6 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter ) TransformCircleToPolygon( m_through_outer_ring_holes_vias_poly, via->GetStart(), hole_outer_ring_radius, ARC_HIGH_DEF ); } - - //TransformCircleToPolygon( m_through_inner_holes_vias_poly, - // via->GetStart(), - // holediameter / 2, - // GetNrSegmentsCircle( holediameter ) ); } } } @@ -473,9 +463,10 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter ) m_through_holes_outer_ring.Add( createNewPadDrill( pad, inflate ) ); } - m_through_holes_inner.Add( createNewPadDrill( pad, 0 ) ); + m_through_holes_inner.Add( createNewPadDrill( pad, 0 ) ); } } + if( m_stats_nr_holes ) m_stats_hole_med_diameter /= (float)m_stats_nr_holes; @@ -496,7 +487,6 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter ) if( pad->GetAttribute () != PAD_ATTRIB_HOLE_NOT_PLATED ) { pad->TransformHoleWithClearanceToPolygon( m_through_outer_holes_poly, inflate ); - pad->TransformHoleWithClearanceToPolygon( m_through_inner_holes_poly, 0 ); } else { @@ -770,12 +760,10 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter ) // End Build Copper layers // This will make a union of all added contourns - m_through_inner_holes_poly.Simplify( SHAPE_POLY_SET::PM_FAST ); m_through_outer_holes_poly.Simplify( SHAPE_POLY_SET::PM_FAST ); m_through_outer_holes_poly_NPTH.Simplify( SHAPE_POLY_SET::PM_FAST ); m_through_outer_holes_vias_poly.Simplify( SHAPE_POLY_SET::PM_FAST ); m_through_outer_ring_holes_vias_poly.Simplify( SHAPE_POLY_SET::PM_FAST ); - //m_through_inner_holes_vias_poly.Simplify( SHAPE_POLY_SET::PM_FAST ); // Not in use // Build Tech layers // Based on: https://github.com/KiCad/kicad-source-mirror/blob/master/3d-viewer/3d_draw.cpp#L1059