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

3D-Viewer: remove not used inner holes containers

This commit is contained in:
Mario Luzeiro 2020-09-06 11:20:03 +01:00 committed by Jon Evans
parent 2251716784
commit 3544bc09fd
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
3d-viewer/3d_canvas/board_adapter.h
View File

@ -451,14 +451,6 @@ class BOARD_ADAPTER
return m_through_outer_ring_holes_vias_poly; 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 * @brief GetThroughHole_Inner - Get the ThroughHole container
* @return a container with holes * @return a container with holes
@ -468,15 +460,6 @@ class BOARD_ADAPTER
return m_through_holes_inner; 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 * @brief GetStats_Nr_Vias - Get statistics of the nr of vias
* @return number of vias * @return number of vias
@ -714,18 +697,12 @@ private:
/// It contains polygon contours for through holes (outer cylinder) /// It contains polygon contours for through holes (outer cylinder)
SHAPE_POLY_SET m_through_outer_holes_poly; 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) /// It contains polygon contours for through holes vias (outer cylinder)
SHAPE_POLY_SET m_through_outer_holes_vias_poly; SHAPE_POLY_SET m_through_outer_holes_vias_poly;
/// It contains polygon contours for through holes vias (outer annular ring) /// It contains polygon contours for through holes vias (outer annular ring)
SHAPE_POLY_SET m_through_outer_ring_holes_vias_poly; 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 /// PCB board outline polygon
SHAPE_POLY_SET m_board_poly; SHAPE_POLY_SET m_board_poly;

14
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -103,11 +103,9 @@ void BOARD_ADAPTER::destroyLayers()
m_through_holes_vias_inner.Clear(); m_through_holes_vias_inner.Clear();
m_through_outer_holes_poly_NPTH.RemoveAllContours(); m_through_outer_holes_poly_NPTH.RemoveAllContours();
m_through_outer_holes_poly.RemoveAllContours(); m_through_outer_holes_poly.RemoveAllContours();
//m_through_inner_holes_poly.RemoveAllContours();
m_through_outer_holes_vias_poly.RemoveAllContours(); m_through_outer_holes_vias_poly.RemoveAllContours();
m_through_outer_ring_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(), TransformCircleToPolygon( m_through_outer_holes_poly, via->GetStart(),
hole_outer_radius, ARC_HIGH_DEF ); 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 // Add same thing for vias only
TransformCircleToPolygon( m_through_outer_holes_vias_poly, 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, TransformCircleToPolygon( m_through_outer_ring_holes_vias_poly,
via->GetStart(), hole_outer_ring_radius, ARC_HIGH_DEF ); via->GetStart(), hole_outer_ring_radius, ARC_HIGH_DEF );
} }
//TransformCircleToPolygon( m_through_inner_holes_vias_poly,
// via->GetStart(),
// holediameter / 2,
// GetNrSegmentsCircle( holediameter ) );
} }
} }
} }
@ -476,6 +466,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
m_through_holes_inner.Add( createNewPadDrill( pad, 0 ) ); m_through_holes_inner.Add( createNewPadDrill( pad, 0 ) );
} }
} }
if( m_stats_nr_holes ) if( m_stats_nr_holes )
m_stats_hole_med_diameter /= (float)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 ) if( pad->GetAttribute () != PAD_ATTRIB_HOLE_NOT_PLATED )
{ {
pad->TransformHoleWithClearanceToPolygon( m_through_outer_holes_poly, inflate ); pad->TransformHoleWithClearanceToPolygon( m_through_outer_holes_poly, inflate );
pad->TransformHoleWithClearanceToPolygon( m_through_inner_holes_poly, 0 );
} }
else else
{ {
@ -770,12 +760,10 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
// End Build Copper layers // End Build Copper layers
// This will make a union of all added contourns // 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.Simplify( SHAPE_POLY_SET::PM_FAST );
m_through_outer_holes_poly_NPTH.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_holes_vias_poly.Simplify( SHAPE_POLY_SET::PM_FAST );
m_through_outer_ring_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 // Build Tech layers
// Based on: https://github.com/KiCad/kicad-source-mirror/blob/master/3d-viewer/3d_draw.cpp#L1059 // Based on: https://github.com/KiCad/kicad-source-mirror/blob/master/3d-viewer/3d_draw.cpp#L1059