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

Try to fix use of a non const method in a const method (created by commit 5abe257) 

(not detected by my compil).
This commit is contained in:
jean-pierre charras 2021-09-14 14:04:25 +02:00
parent 4d478d6f17
commit c504b5165d
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gerbview/gerber_draw_item.cpp
View File

@ -388,12 +388,20 @@ const EDA_RECT GERBER_DRAW_ITEM::GetBoundingBox() const
if( code && code->m_Shape == APT_RECT )
{
if( m_Polygon.OutlineCount() == 0 )
ConvertSegmentToPolygon();
if( m_Polygon.OutlineCount() > 0 )
{
auto bb = m_Polygon.BBox();
bbox.Inflate( bb.GetWidth() / 2, bb.GetHeight() / 2 );
// We cannot initialize m_Polygon, because we are in a const function.
// So use a temporary polygon
SHAPE_POLY_SET poly_shape;
ConvertSegmentToPolygon( &poly_shape );
BOX2I bb = poly_shape.BBox();
bbox.SetSize( bb.GetWidth(), bb.GetHeight() );
bbox.SetOrigin( bb.GetOrigin().x, bb.GetOrigin().y );
}
else
{
BOX2I bb = m_Polygon.BBox();
bbox.SetSize( bb.GetWidth(), bb.GetHeight() );
bbox.SetOrigin( bb.GetOrigin().x, bb.GetOrigin().y );
}
}
@ -585,10 +593,10 @@ void GERBER_DRAW_ITEM::Print( wxDC* aDC, const wxPoint& aOffset, GBR_DISPLAY_OPT
}
void GERBER_DRAW_ITEM::ConvertSegmentToPolygon()
void GERBER_DRAW_ITEM::ConvertSegmentToPolygon( SHAPE_POLY_SET* aPolygon ) const
{
m_Polygon.RemoveAllContours();
m_Polygon.NewOutline();
aPolygon->RemoveAllContours();
aPolygon->NewOutline();
wxPoint start = m_Start;
wxPoint end = m_End;
@ -618,34 +626,40 @@ void GERBER_DRAW_ITEM::ConvertSegmentToPolygon()
corner.x -= m_Size.x/2;
corner.y -= m_Size.y/2;
wxPoint close = corner;
m_Polygon.Append( VECTOR2I( corner ) ); // Lower left corner, start point (1)
aPolygon->Append( VECTOR2I( corner ) ); // Lower left corner, start point (1)
corner.y += m_Size.y;
m_Polygon.Append( VECTOR2I( corner ) ); // upper left corner, start point (2)
aPolygon->Append( VECTOR2I( corner ) ); // upper left corner, start point (2)
if( delta.x || delta.y )
{
corner += delta;
m_Polygon.Append( VECTOR2I( corner ) ); // upper left corner, end point (3)
aPolygon->Append( VECTOR2I( corner ) ); // upper left corner, end point (3)
}
corner.x += m_Size.x;
m_Polygon.Append( VECTOR2I( corner ) ); // upper right corner, end point (4)
aPolygon->Append( VECTOR2I( corner ) ); // upper right corner, end point (4)
corner.y -= m_Size.y;
m_Polygon.Append( VECTOR2I( corner ) ); // lower right corner, end point (5)
aPolygon->Append( VECTOR2I( corner ) ); // lower right corner, end point (5)
if( delta.x || delta.y )
{
corner -= delta;
m_Polygon.Append( VECTOR2I( corner ) ); // lower left corner, start point (6)
aPolygon->Append( VECTOR2I( corner ) ); // lower left corner, start point (6)
}
m_Polygon.Append( VECTOR2I( close ) ); // close the shape
aPolygon->Append( VECTOR2I( close ) ); // close the shape
// Create final polygon:
if( change )
m_Polygon.Mirror( false, true );
aPolygon->Mirror( false, true );
m_Polygon.Move( VECTOR2I( start ) );
aPolygon->Move( VECTOR2I( start ) );
}
void GERBER_DRAW_ITEM::ConvertSegmentToPolygon()
{
ConvertSegmentToPolygon( &m_Polygon );
}

3
gerbview/gerber_draw_item.h
View File

@ -186,8 +186,11 @@ public:
*
* Useful when a line is plotted using a rectangular pen.
* In this case, the usual segment plot function cannot be used
* @param aPolygon is the SHAPE_POLY_SET to fill. If null (usual case),
* m_Polygon will be used
*/
void ConvertSegmentToPolygon();
void ConvertSegmentToPolygon( SHAPE_POLY_SET* aPolygon ) const;
/**
* Print the polygon stored in m_PolyCorners.