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

Gerbview: Fix an issue in aperture macro for a Circle AM primitive inside a macro definition

This commit is contained in:
jean-pierre charras 2017-04-08 17:41:53 +02:00
parent 36255d8523
commit 9992a07def
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gerbview/class_aperture_macro.cpp
View File

@ -92,6 +92,7 @@ bool AM_PRIMITIVE::IsAMPrimitiveExposureOn(GERBER_DRAW_ITEM* aParent) const
} }
} }
const int seg_per_circle = 64; // Number of segments to approximate a circle
void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent, void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent,
SHAPE_POLY_SET& aShapeBuffer, SHAPE_POLY_SET& aShapeBuffer,
@ -101,7 +102,6 @@ void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent,
for( unsigned jj = 0; jj < polybuffer.size(); jj++ )\ for( unsigned jj = 0; jj < polybuffer.size(); jj++ )\
aShapeBuffer.Append( polybuffer[jj].x, polybuffer[jj].y );} aShapeBuffer.Append( polybuffer[jj].x, polybuffer[jj].y );}
const int seg_per_circle = 64; // Number of segments to approximate a circle
// Draw the primitive shape for flashed items. // Draw the primitive shape for flashed items.
static std::vector<wxPoint> polybuffer; // create a static buffer to avoid a lot of memory reallocation static std::vector<wxPoint> polybuffer; // create a static buffer to avoid a lot of memory reallocation
polybuffer.clear(); polybuffer.clear();
@ -117,15 +117,10 @@ void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent,
/* Generated by an aperture macro declaration like: /* Generated by an aperture macro declaration like:
* "1,1,0.3,0.5, 1.0*" * "1,1,0.3,0.5, 1.0*"
* type (1), exposure, diameter, pos.x, pos.y, <rotation> * type (1), exposure, diameter, pos.x, pos.y, <rotation>
* <rotation> is a optional parameter: rotation form origin * <rotation> is a optional parameter: rotation from origin.
* type is not stored in parameters list, so the first parameter is exposure * type is not stored in parameters list, so the first parameter is exposure
*/ */
wxPoint center = mapPt( params[2].GetValue( tool ), params[3].GetValue( tool ), m_GerbMetric ); ConvertShapeToPolygon( aParent, polybuffer );
int radius = scaletoIU( params[1].GetValue( tool ), m_GerbMetric ) / 2;
TransformCircleToPolygon( aShapeBuffer, center, radius, seg_per_circle );
SHAPE_LINE_CHAIN& poly = aShapeBuffer.Outline( aShapeBuffer.OutlineCount() - 1 );
// shape rotation (if any): // shape rotation (if any):
if( params.size() >= 5 ) if( params.size() >= 5 )
@ -134,13 +129,20 @@ void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent,
if( rotation != 0) if( rotation != 0)
{ {
for( int ii = 0; ii < poly.PointCount(); ii++ ) for( unsigned ii = 0; ii < polybuffer.size(); ii++ )
RotatePoint( &poly.Point(ii).x, &poly.Point(ii).y, rotation ); RotatePoint( &polybuffer[ii], -rotation );
} }
} }
// Move to current position: // Move to current position:
poly.Move( aParent->GetABPosition( curPos ) ); for( unsigned ii = 0; ii < polybuffer.size(); ii++ )
{
polybuffer[ii] += curPos;
polybuffer[ii] = aParent->GetABPosition( polybuffer[ii] );
}
TO_POLY_SHAPE;
} }
break; break;
@ -437,7 +439,28 @@ void AM_PRIMITIVE::ConvertShapeToPolygon( GERBER_DRAW_ITEM* aParent,
switch( primitive_id ) switch( primitive_id )
{ {
case AMP_CIRCLE: // Circle, currently convertion not needed case AMP_CIRCLE:
{
/* Generated by an aperture macro declaration like:
* "1,1,0.3,0.5, 1.0*"
* type (1), exposure, diameter, pos.x, pos.y, <rotation>
* <rotation> is a optional parameter: rotation from origin.
* type is not stored in parameters list, so the first parameter is exposure
*/
wxPoint center = mapPt( params[2].GetValue( tool ), params[3].GetValue( tool ), m_GerbMetric );
int radius = scaletoIU( params[1].GetValue( tool ), m_GerbMetric ) / 2;
wxPoint corner;
const int delta = 3600 / seg_per_circle; // rot angle in 0.1 degree
for( int angle = 0; angle < 3600; angle += delta )
{
corner.x = radius;
corner.y = 0;
RotatePoint( &corner, angle );
corner += center;
aBuffer.push_back( corner );
}
}
break; break;
case AMP_LINE2: case AMP_LINE2: