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

Fix issues due to internal code change in DRAWSEGMENT class, for S_POLYGON shape. 

Remove also duplicate code in 3D viewer, for this DRAWSEGMENT shape.
This commit is contained in:
jean-pierre charras 2017-12-21 15:06:29 +01:00
parent 783b5e2616
commit d9a2b5161c
2 changed files with 19 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -821,89 +821,23 @@ void CINFO3D_VISU::AddShapeWithClearanceToContainer( const DRAWSEGMENT* aDrawSeg
case S_POLYGON: case S_POLYGON:
{ {
// Check for malformed polygon. const int segcountforcircle = 16;
if( aDrawSegment->GetPolyPoints().size() > 2 ) const double correctionFactor = GetCircleCorrectionFactor( segcountforcircle );
{ SHAPE_POLY_SET polyList;
// The polygon is expected to be a simple polygon
// not self intersecting, no hole.
MODULE* module = aDrawSegment->GetParentModule(); // NULL for items not in footprints
const double orientation = module ? module->GetOrientation() : 0.0;
// Build the polygon with the actual position and orientation: aDrawSegment->TransformShapeWithClearanceToPolygon( polyList, aClearanceValue,
std::vector< wxPoint> poly; segcountforcircle, correctionFactor );
poly = aDrawSegment->GetPolyPoints(); // This convert the poly in outline and holes
// Note: This two sequencial calls are need in order to get
// the triangulation function to work properly.
polyList.Simplify( SHAPE_POLY_SET::PM_FAST );
polyList.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
for( unsigned ii = 0; ii < poly.size(); ++ii ) if( polyList.IsEmpty() ) // Just for caution
{ break;
RotatePoint( &poly[ii], orientation );
poly[ii] += aDrawSegment->GetPosition();
}
// Generate polygons for the outline + clearance Convert_shape_line_polygon_to_triangles( polyList, *aDstContainer,
m_biuTo3Dunits, *aDrawSegment );
if( linewidth ) // Add thick outlines
{
CPolyPt corner1( poly[poly.size()-1] );
for( unsigned ii = 0; ii < poly.size(); ++ii )
{
CPolyPt corner2( poly[ii] );
if( corner2 != corner1 )
{
const SFVEC2F start3DU( corner1.x * m_biuTo3Dunits,
-corner1.y * m_biuTo3Dunits );
const SFVEC2F end3DU( corner2.x * m_biuTo3Dunits,
-corner2.y * m_biuTo3Dunits );
if( Is_segment_a_circle( start3DU, end3DU ) )
{
aDstContainer->Add(
new CFILLEDCIRCLE2D( start3DU,
(linewidth / 2) * m_biuTo3Dunits,
*aDrawSegment ) );
}
else
{
aDstContainer->Add( new CROUNDSEGMENT2D( start3DU,
end3DU,
linewidth * m_biuTo3Dunits,
*aDrawSegment ) );
}
}
corner1 = corner2;
}
}
// Polygon for the inside
SHAPE_LINE_CHAIN path;
for( unsigned ii = 0; ii < poly.size(); ++ii )
{
wxPoint corner = poly[ii];
path.Append( corner.x, corner.y );
}
path.SetClosed( true );
SHAPE_POLY_SET polyList;
polyList.AddOutline( path );
// This convert the poly in outline and holes
polyList.Simplify( SHAPE_POLY_SET::PM_FAST );
polyList.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
if( polyList.IsEmpty() ) // Just for caution
break;
Convert_shape_line_polygon_to_triangles( polyList,
*aDstContainer,
m_biuTo3Dunits,
*aDrawSegment );
}
} }
break; break;

6
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -522,6 +522,10 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
// not self intersecting, no hole. // not self intersecting, no hole.
MODULE* module = GetParentModule(); // NULL for items not in footprints MODULE* module = GetParentModule(); // NULL for items not in footprints
double orientation = module ? module->GetOrientation() : 0.0; double orientation = module ? module->GetOrientation() : 0.0;
wxPoint offset;
if( module )
offset = module->GetPosition();
// Build the polygon with the actual position and orientation: // Build the polygon with the actual position and orientation:
std::vector< wxPoint> poly; std::vector< wxPoint> poly;
@ -530,7 +534,7 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
for( unsigned ii = 0; ii < poly.size(); ii++ ) for( unsigned ii = 0; ii < poly.size(); ii++ )
{ {
RotatePoint( &poly[ii], orientation ); RotatePoint( &poly[ii], orientation );
poly[ii] += GetPosition(); poly[ii] += offset;
} }
// Generate polygons for the outline + clearance // Generate polygons for the outline + clearance