Skip to content

K
kicad-source-mirror
Commit ef5f1b9e authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Start work on a better support of polygons in Kicad (code cleaning). 

Some coding style policy fix.
parent 9259b21f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 386 deletions
3d-viewer/3d_draw.cpp
View file @ ef5f1b9e
...@@ -305,7 +305,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() ...@@ -305,7 +305,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List()
{ {
CPolyPt* endcorner = &polysList[ic]; CPolyPt* endcorner = &polysList[ic];
if( begincorner->utility == 0 ) if( begincorner->m_utility == 0 )
{ {
// Draw only basic outlines, not extra segments // Draw only basic outlines, not extra segments
dummysegment.m_Start.x = begincorner->x; dummysegment.m_Start.x = begincorner->x;
...@@ -318,7 +318,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() ...@@ -318,7 +318,7 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List()
if( (endcorner->end_contour) || (ic == imax) ) if( (endcorner->end_contour) || (ic == imax) )
{ {
// the last corner of a filled area is found: draw it // the last corner of a filled area is found: draw it
if( endcorner->utility == 0 ) if( endcorner->m_utility == 0 )
{ {
// Draw only basic outlines, not extra segments // Draw only basic outlines, not extra segments
dummysegment.m_Start.x = endcorner->x; dummysegment.m_Start.x = endcorner->x;
......
pcbnew/board_items_to_polygon_shape_transform.cpp
View file @ ef5f1b9e
...@@ -167,19 +167,19 @@ void ZONE_CONTAINER::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt> ...@@ -167,19 +167,19 @@ void ZONE_CONTAINER::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt>
// Calculate the polygon with clearance and holes // Calculate the polygon with clearance and holes
// holes are linked to the main outline, so only one polygon should be created. // holes are linked to the main outline, so only one polygon should be created.
KPolygonSet polyset_zone_solid_areas; KI_POLYGON_SET polyset_zone_solid_areas;
std::vector<KPolyPoint> cornerslist; std::vector<KI_POLY_POINT> cornerslist;
unsigned ic = 0; unsigned ic = 0;
unsigned corners_count = zoneOutines.size(); unsigned corners_count = zoneOutines.size();
while( ic < corners_count ) while( ic < corners_count )
{ {
cornerslist.clear(); cornerslist.clear();
KPolygon poly; KI_POLYGON poly;
{ {
for( ; ic < corners_count; ic++ ) for( ; ic < corners_count; ic++ )
{ {
CPolyPt* corner = &zoneOutines[ic]; CPolyPt* corner = &zoneOutines[ic];
cornerslist.push_back( KPolyPoint( corner->x, corner->y ) ); cornerslist.push_back( KI_POLY_POINT( corner->x, corner->y ) );
if( corner->end_contour ) if( corner->end_contour )
{ {
ic++; ic++;
...@@ -197,12 +197,12 @@ void ZONE_CONTAINER::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt> ...@@ -197,12 +197,12 @@ void ZONE_CONTAINER::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt>
// Put the resultng polygon in buffer // Put the resultng polygon in buffer
for( unsigned ii = 0; ii < polyset_zone_solid_areas.size(); ii++ ) for( unsigned ii = 0; ii < polyset_zone_solid_areas.size(); ii++ )
{ {
KPolygon& poly = polyset_zone_solid_areas[ii]; KI_POLYGON& poly = polyset_zone_solid_areas[ii];
CPolyPt corner( 0, 0, false ); CPolyPt corner( 0, 0, false );
for( unsigned jj = 0; jj < poly.size(); jj++ ) for( unsigned jj = 0; jj < poly.size(); jj++ )
{ {
KPolyPoint point = *(poly.begin() + jj); KI_POLY_POINT point = *(poly.begin() + jj);
corner.x = point.x(); corner.x = point.x();
corner.y = point.y(); corner.y = point.y();
corner.end_contour = false; corner.end_contour = false;
......
pcbnew/class_zone.cpp
View file @ ef5f1b9e
...@@ -210,7 +210,7 @@ void ZONE_CONTAINER::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, int aDrawMode, const ...@@ -210,7 +210,7 @@ void ZONE_CONTAINER::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, int aDrawMode, const
{ {
seg_start = GetCornerPosition( ic ) + offset; seg_start = GetCornerPosition( ic ) + offset;
if( m_Poly->corner[ic].end_contour == false && ic < GetNumCorners() - 1 ) if( m_Poly->m_CornersList[ic].end_contour == false && ic < GetNumCorners() - 1 )
{ {
seg_end = GetCornerPosition( ic + 1 ) + offset; seg_end = GetCornerPosition( ic + 1 ) + offset;
} }
...@@ -306,7 +306,7 @@ void ZONE_CONTAINER::DrawFilledArea( EDA_DRAW_PANEL* panel, ...@@ -306,7 +306,7 @@ void ZONE_CONTAINER::DrawFilledArea( EDA_DRAW_PANEL* panel,
CornersBuffer.push_back( coord ); CornersBuffer.push_back( coord );
CornersTypeBuffer.push_back( (char) corner->utility ); CornersTypeBuffer.push_back( (char) corner->m_utility );
if( (corner->end_contour) || (ic == imax) ) // the last corner of a filled area is found: draw it if( (corner->end_contour) || (ic == imax) ) // the last corner of a filled area is found: draw it
{ {
...@@ -432,13 +432,13 @@ void ZONE_CONTAINER::DrawWhileCreateOutline( EDA_DRAW_PANEL* panel, wxDC* DC, in ...@@ -432,13 +432,13 @@ void ZONE_CONTAINER::DrawWhileCreateOutline( EDA_DRAW_PANEL* panel, wxDC* DC, in
int yi = GetCornerPosition( ic ).y; int yi = GetCornerPosition( ic ).y;
int xf, yf; int xf, yf;
if( m_Poly->corner[ic].end_contour == false && ic < icmax ) if( m_Poly->m_CornersList[ic].end_contour == false && ic < icmax )
{ {
is_close_segment = false; is_close_segment = false;
xf = GetCornerPosition( ic + 1 ).x; xf = GetCornerPosition( ic + 1 ).x;
yf = GetCornerPosition( ic + 1 ).y; yf = GetCornerPosition( ic + 1 ).y;
if( (m_Poly->corner[ic + 1].end_contour) || (ic == icmax - 1) ) if( (m_Poly->m_CornersList[ic + 1].end_contour) || (ic == icmax - 1) )
current_gr_mode = GR_XOR; current_gr_mode = GR_XOR;
else else
current_gr_mode = draw_mode; current_gr_mode = draw_mode;
...@@ -507,12 +507,12 @@ bool ZONE_CONTAINER::HitTestForCorner( const wxPoint& refPos ) ...@@ -507,12 +507,12 @@ bool ZONE_CONTAINER::HitTestForCorner( const wxPoint& refPos )
int min_dist = MIN_DIST_IN_MILS*IU_PER_MILS; int min_dist = MIN_DIST_IN_MILS*IU_PER_MILS;
wxPoint delta; wxPoint delta;
unsigned lim = m_Poly->corner.size(); unsigned lim = m_Poly->m_CornersList.size();
for( unsigned item_pos = 0; item_pos < lim; item_pos++ ) for( unsigned item_pos = 0; item_pos < lim; item_pos++ )
{ {
delta.x = refPos.x - m_Poly->corner[item_pos].x; delta.x = refPos.x - m_Poly->m_CornersList[item_pos].x;
delta.y = refPos.y - m_Poly->corner[item_pos].y; delta.y = refPos.y - m_Poly->m_CornersList[item_pos].y;
// Calculate a distance: // Calculate a distance:
int dist = MAX( abs( delta.x ), abs( delta.y ) ); int dist = MAX( abs( delta.x ), abs( delta.y ) );
...@@ -530,7 +530,7 @@ bool ZONE_CONTAINER::HitTestForCorner( const wxPoint& refPos ) ...@@ -530,7 +530,7 @@ bool ZONE_CONTAINER::HitTestForCorner( const wxPoint& refPos )
bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos ) bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos )
{ {
unsigned lim = m_Poly->corner.size(); unsigned lim = m_Poly->m_CornersList.size();
m_CornerSelection = -1; // Set to not found m_CornerSelection = -1; // Set to not found
...@@ -547,7 +547,7 @@ bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos ) ...@@ -547,7 +547,7 @@ bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos )
* the last segment of the current outline starts at current corner, and ends * the last segment of the current outline starts at current corner, and ends
* at the first corner of the outline * at the first corner of the outline
*/ */
if( m_Poly->corner[item_pos].end_contour || end_segm >= lim ) if( m_Poly->m_CornersList[item_pos].end_contour || end_segm >= lim )
{ {
unsigned tmp = first_corner_pos; unsigned tmp = first_corner_pos;
first_corner_pos = end_segm; // first_corner_pos is now the beginning of the next outline first_corner_pos = end_segm; // first_corner_pos is now the beginning of the next outline
...@@ -557,10 +557,10 @@ bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos ) ...@@ -557,10 +557,10 @@ bool ZONE_CONTAINER::HitTestForEdge( const wxPoint& refPos )
/* test the dist between segment and ref point */ /* test the dist between segment and ref point */
int dist = (int) GetPointToLineSegmentDistance( refPos.x, int dist = (int) GetPointToLineSegmentDistance( refPos.x,
refPos.y, refPos.y,
m_Poly->corner[item_pos].x, m_Poly->m_CornersList[item_pos].x,
m_Poly->corner[item_pos].y, m_Poly->m_CornersList[item_pos].y,
m_Poly->corner[end_segm].x, m_Poly->m_CornersList[end_segm].x,
m_Poly->corner[end_segm].y ); m_Poly->m_CornersList[end_segm].y );
if( dist < min_dist ) if( dist < min_dist )
{ {
...@@ -703,7 +703,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame ) ...@@ -703,7 +703,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
msg = board->GetLayerName( m_Layer ); msg = board->GetLayerName( m_Layer );
frame->AppendMsgPanel( _( "Layer" ), msg, BROWN ); frame->AppendMsgPanel( _( "Layer" ), msg, BROWN );
msg.Printf( wxT( "%d" ), (int) m_Poly->corner.size() ); msg.Printf( wxT( "%d" ), (int) m_Poly->m_CornersList.size() );
frame->AppendMsgPanel( _( "Corners" ), msg, BLUE ); frame->AppendMsgPanel( _( "Corners" ), msg, BLUE );
if( m_FillMode ) if( m_FillMode )
...@@ -730,7 +730,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame ) ...@@ -730,7 +730,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
void ZONE_CONTAINER::Move( const wxPoint& offset ) void ZONE_CONTAINER::Move( const wxPoint& offset )
{ {
/* move outlines */ /* move outlines */
for( unsigned ii = 0; ii < m_Poly->corner.size(); ii++ ) for( unsigned ii = 0; ii < m_Poly->m_CornersList.size(); ii++ )
{ {
SetCornerPosition( ii, GetCornerPosition( ii ) + offset ); SetCornerPosition( ii, GetCornerPosition( ii ) + offset );
} }
...@@ -761,7 +761,7 @@ void ZONE_CONTAINER::MoveEdge( const wxPoint& offset ) ...@@ -761,7 +761,7 @@ void ZONE_CONTAINER::MoveEdge( const wxPoint& offset )
SetCornerPosition( ii, GetCornerPosition( ii ) + offset ); SetCornerPosition( ii, GetCornerPosition( ii ) + offset );
// Move the end point of the selected edge: // Move the end point of the selected edge:
if( m_Poly->corner[ii].end_contour || ii == GetNumCorners() - 1 ) if( m_Poly->m_CornersList[ii].end_contour || ii == GetNumCorners() - 1 )
{ {
int icont = m_Poly->GetContour( ii ); int icont = m_Poly->GetContour( ii );
ii = m_Poly->GetContourStart( icont ); ii = m_Poly->GetContourStart( icont );
...@@ -781,13 +781,13 @@ void ZONE_CONTAINER::Rotate( const wxPoint& centre, double angle ) ...@@ -781,13 +781,13 @@ void ZONE_CONTAINER::Rotate( const wxPoint& centre, double angle )
{ {
wxPoint pos; wxPoint pos;
for( unsigned ii = 0; ii < m_Poly->corner.size(); ii++ ) for( unsigned ii = 0; ii < m_Poly->m_CornersList.size(); ii++ )
{ {
pos.x = m_Poly->corner[ii].x; pos.x = m_Poly->m_CornersList[ii].x;
pos.y = m_Poly->corner[ii].y; pos.y = m_Poly->m_CornersList[ii].y;
RotatePoint( &pos, centre, angle ); RotatePoint( &pos, centre, angle );
m_Poly->corner[ii].x = pos.x; m_Poly->m_CornersList[ii].x = pos.x;
m_Poly->corner[ii].y = pos.y; m_Poly->m_CornersList[ii].y = pos.y;
} }
m_Poly->Hatch(); m_Poly->Hatch();
...@@ -820,11 +820,11 @@ void ZONE_CONTAINER::Flip( const wxPoint& aCentre ) ...@@ -820,11 +820,11 @@ void ZONE_CONTAINER::Flip( const wxPoint& aCentre )
void ZONE_CONTAINER::Mirror( const wxPoint& mirror_ref ) void ZONE_CONTAINER::Mirror( const wxPoint& mirror_ref )
{ {
for( unsigned ii = 0; ii < m_Poly->corner.size(); ii++ ) for( unsigned ii = 0; ii < m_Poly->m_CornersList.size(); ii++ )
{ {
m_Poly->corner[ii].y -= mirror_ref.y; m_Poly->m_CornersList[ii].y -= mirror_ref.y;
NEGATE( m_Poly->corner[ii].y ); NEGATE( m_Poly->m_CornersList[ii].y );
m_Poly->corner[ii].y += mirror_ref.y; m_Poly->m_CornersList[ii].y += mirror_ref.y;
} }
m_Poly->Hatch(); m_Poly->Hatch();
......
pcbnew/kicad_plugin.cpp
View file @ ef5f1b9e
...@@ -1059,7 +1059,7 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const ...@@ -1059,7 +1059,7 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
const std::vector< CPolyPt >& cv = aZone->m_Poly->corner; const std::vector< CPolyPt >& cv = aZone->m_Poly->m_CornersList;
int newLine = 0; int newLine = 0;
if( cv.size() ) if( cv.size() )
......
pcbnew/legacy_plugin.cpp
View file @ ef5f1b9e
...@@ -3609,7 +3609,7 @@ void LEGACY_PLUGIN::saveZONE_CONTAINER( const ZONE_CONTAINER* me ) const ...@@ -3609,7 +3609,7 @@ void LEGACY_PLUGIN::saveZONE_CONTAINER( const ZONE_CONTAINER* me ) const
typedef std::vector< CPolyPt > CPOLY_PTS; typedef std::vector< CPolyPt > CPOLY_PTS;
// Save the corner list // Save the corner list
const CPOLY_PTS& cv = me->m_Poly->corner; const CPOLY_PTS& cv = me->m_Poly->m_CornersList;
for( CPOLY_PTS::const_iterator it = cv.begin(); it != cv.end(); ++it ) for( CPOLY_PTS::const_iterator it = cv.begin(); it != cv.end(); ++it )
{ {
fprintf( m_fp, "ZCorner %s %d\n", fprintf( m_fp, "ZCorner %s %d\n",
...@@ -3623,12 +3623,12 @@ void LEGACY_PLUGIN::saveZONE_CONTAINER( const ZONE_CONTAINER* me ) const ...@@ -3623,12 +3623,12 @@ void LEGACY_PLUGIN::saveZONE_CONTAINER( const ZONE_CONTAINER* me ) const
{ {
fprintf( m_fp, "$POLYSCORNERS\n" ); fprintf( m_fp, "$POLYSCORNERS\n" );
for( CPOLY_PTS::const_iterator it = fv.begin(); it != fv.end(); ++it ) for( CPOLY_PTS::const_iterator it = fv.begin(); it != fv.end(); ++it )
{ {
fprintf( m_fp, "%s %d %d\n", fprintf( m_fp, "%s %d %d\n",
fmtBIUPair( it->x, it->y ).c_str(), fmtBIUPair( it->x, it->y ).c_str(),
it->end_contour, it->end_contour,
it->utility ); it->m_utility );
} }
fprintf( m_fp, "$endPOLYSCORNERS\n" ); fprintf( m_fp, "$endPOLYSCORNERS\n" );
......
pcbnew/polygons_defs.h
View file @ ef5f1b9e
...@@ -12,10 +12,55 @@ ...@@ -12,10 +12,55 @@
namespace bpl = boost::polygon; // bpl = boost polygon library namespace bpl = boost::polygon; // bpl = boost polygon library
using namespace bpl::operators; // +, -, =, ... using namespace bpl::operators; // +, -, =, ...
// Definitions needed by boost::polygon
typedef int coordinate_type; typedef int coordinate_type;
typedef bpl::polygon_data<int> KPolygon; /**
typedef std::vector<KPolygon> KPolygonSet; * KI_POLYGON defines a single polygon ( boost::polygon_data type.
* When holes are created in a KPolygon, they are
* linked to main outline by overlapping segments,
* so there is always one polygon and one list of corners
* coordinates are int
*/
typedef bpl::polygon_data<int> KI_POLYGON;
/**
* KI_POLYGON_SET defines a set of single KI_POLYGON.
* A KI_POLYGON_SET is used to store a set of polygons
* when performing operations between 2 polygons
* or 2 sets of polygons
* The result of operations like and, xor... between 2 polygons
* is always stored in a KI_POLYGON_SET, because these operations
* can create many polygons
*/
typedef std::vector<KI_POLYGON> KI_POLYGON_SET;
/**
* KI_POLY_POINT defines a point for boost::polygon.
* KI_POLY_POINT store x and y coordinates (int)
*/
typedef bpl::point_data<int> KI_POLY_POINT;
/**
* KI_POLYGON_WITH_HOLES defines a single polygon with holes
* When holes are created in a KI_POLYGON_WITH_HOLES, they are
* stored as separate single polygons,
* KI_POLYGON_WITH_HOLES store always one polygon for the external outline
* and one list of polygons (holes) which can be empty
*/
typedef bpl::polygon_with_holes_data<int> KI_POLYGON_WITH_HOLES;
/**
* KI_POLYGON_WITH_HOLES_SET defines a set of KI_POLYGON_WITH_HOLES.
* A KI_POLYGON_WITH_HOLES_SET is used to store a set of polygons with holes
* when performing operations between 2 polygons
* or 2 sets of polygons with holes
* The result of operations like and, xor... between 2 polygons with holes
* is always stored in a KI_POLYGON_WITH_HOLES_SET, because these operations
* can create many separate polygons with holespolygons
*/
typedef std::vector<KI_POLYGON_WITH_HOLES> KI_POLYGON_WITH_HOLES_SET;
typedef bpl::point_data<int> KPolyPoint;
#endif // #ifndef _POLYGONS_DEFS_H_ #endif // #ifndef _POLYGONS_DEFS_H_
pcbnew/specctra_export.cpp
View file @ ef5f1b9e
...@@ -1178,16 +1178,16 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1178,16 +1178,16 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
mainPolygon->layer_id = layerIds[ kicadLayer2pcb[ item->GetLayer() ] ]; mainPolygon->layer_id = layerIds[ kicadLayer2pcb[ item->GetLayer() ] ];
int count = item->m_Poly->corner.size(); int count = item->m_Poly->m_CornersList.size();
int ndx = 0; // used in 2 for() loops below int ndx = 0; // used in 2 for() loops below
for( ; ndx<count; ++ndx ) for( ; ndx<count; ++ndx )
{ {
wxPoint point( item->m_Poly->corner[ndx].x, wxPoint point( item->m_Poly->m_CornersList[ndx].x,
item->m_Poly->corner[ndx].y ); item->m_Poly->m_CornersList[ndx].y );
mainPolygon->AppendPoint( mapPt(point) ); mainPolygon->AppendPoint( mapPt(point) );
// this was the end of the main polygon // this was the end of the main polygon
if( item->m_Poly->corner[ndx].end_contour ) if( item->m_Poly->m_CornersList[ndx].end_contour )
break; break;
} }
...@@ -1197,7 +1197,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1197,7 +1197,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
// handle the cutouts // handle the cutouts
for( ++ndx; ndx<count; ++ndx ) for( ++ndx; ndx<count; ++ndx )
{ {
if( item->m_Poly->corner[ndx-1].end_contour ) if( item->m_Poly->m_CornersList[ndx-1].end_contour )
{ {
window = new WINDOW( plane ); window = new WINDOW( plane );
plane->AddWindow( window ); plane->AddWindow( window );
...@@ -1211,8 +1211,8 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1211,8 +1211,8 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
wxASSERT( window ); wxASSERT( window );
wxASSERT( cutout ); wxASSERT( cutout );
wxPoint point(item->m_Poly->corner[ndx].x, wxPoint point(item->m_Poly->m_CornersList[ndx].x,
item->m_Poly->corner[ndx].y ); item->m_Poly->m_CornersList[ndx].y );
cutout->AppendPoint( mapPt(point) ); cutout->AppendPoint( mapPt(point) );
} }
} }
...@@ -1253,16 +1253,16 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1253,16 +1253,16 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
mainPolygon->layer_id = layerIds[ kicadLayer2pcb[ item->GetLayer() ] ]; mainPolygon->layer_id = layerIds[ kicadLayer2pcb[ item->GetLayer() ] ];
int count = item->m_Poly->corner.size(); int count = item->m_Poly->m_CornersList.size();
int ndx = 0; // used in 2 for() loops below int ndx = 0; // used in 2 for() loops below
for( ; ndx<count; ++ndx ) for( ; ndx<count; ++ndx )
{ {
wxPoint point( item->m_Poly->corner[ndx].x, wxPoint point( item->m_Poly->m_CornersList[ndx].x,
item->m_Poly->corner[ndx].y ); item->m_Poly->m_CornersList[ndx].y );
mainPolygon->AppendPoint( mapPt(point) ); mainPolygon->AppendPoint( mapPt(point) );
// this was the end of the main polygon // this was the end of the main polygon
if( item->m_Poly->corner[ndx].end_contour ) if( item->m_Poly->m_CornersList[ndx].end_contour )
break; break;
} }
...@@ -1272,7 +1272,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1272,7 +1272,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
// handle the cutouts // handle the cutouts
for( ++ndx; ndx<count; ++ndx ) for( ++ndx; ndx<count; ++ndx )
{ {
if( item->m_Poly->corner[ndx-1].end_contour ) if( item->m_Poly->m_CornersList[ndx-1].end_contour )
{ {
window = new WINDOW( keepout ); window = new WINDOW( keepout );
keepout->AddWindow( window ); keepout->AddWindow( window );
...@@ -1286,8 +1286,8 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) ...@@ -1286,8 +1286,8 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
wxASSERT( window ); wxASSERT( window );
wxASSERT( cutout ); wxASSERT( cutout );
wxPoint point(item->m_Poly->corner[ndx].x, wxPoint point(item->m_Poly->m_CornersList[ndx].x,
item->m_Poly->corner[ndx].y ); item->m_Poly->m_CornersList[ndx].y );
cutout->AppendPoint( mapPt(point) ); cutout->AppendPoint( mapPt(point) );
} }
} }
......
pcbnew/zone_filling_algorithm.cpp
View file @ ef5f1b9e
...@@ -188,7 +188,7 @@ int ZONE_CONTAINER::Fill_Zone_Areas_With_Segments() ...@@ -188,7 +188,7 @@ int ZONE_CONTAINER::Fill_Zone_Areas_With_Segments()
x_coordinates.clear(); x_coordinates.clear();
for( ics = istart, ice = iend; ics <= iend; ice = ics, ics++ ) for( ics = istart, ice = iend; ics <= iend; ice = ics, ics++ )
{ {
if ( m_FilledPolysList[ice].utility ) if ( m_FilledPolysList[ice].m_utility )
continue; continue;
int seg_startX = m_FilledPolysList[ics].x; int seg_startX = m_FilledPolysList[ics].x;
int seg_startY = m_FilledPolysList[ics].y; int seg_startY = m_FilledPolysList[ics].y;
......
pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
View file @ ef5f1b9e
...@@ -81,14 +81,14 @@ extern void CreateThermalReliefPadPolygon( std::vector<CPolyPt>& aCornerBuffer, ...@@ -81,14 +81,14 @@ extern void CreateThermalReliefPadPolygon( std::vector<CPolyPt>& aCornerBuffer,
int aThermalRot ); int aThermalRot );
// Local Functions: helper function to calculate solid areas // Local Functions: helper function to calculate solid areas
static void AddPolygonCornersToKPolygonList( std::vector <CPolyPt>& aCornersBuffer, static void AddPolygonCornersToKiPolygonList( std::vector <CPolyPt>& aCornersBuffer,
KPolygonSet& aKPolyList ); KI_POLYGON_SET& aKiPolyList );
static int CopyPolygonsFromKPolygonListToFilledPolysList( ZONE_CONTAINER* aZone, static int CopyPolygonsFromKiPolygonListToFilledPolysList( ZONE_CONTAINER* aZone,
KPolygonSet& aKPolyList ); KI_POLYGON_SET& aKiPolyList );
static int CopyPolygonsFromFilledPolysListTotKPolygonList( ZONE_CONTAINER* aZone, static int CopyPolygonsFromFilledPolysListToKiPolygonList( ZONE_CONTAINER* aZone,
KPolygonSet& aKPolyList ); KI_POLYGON_SET& aKiPolyList );
// Local Variables: // Local Variables:
...@@ -148,8 +148,8 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) ...@@ -148,8 +148,8 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
*/ */
s_Correction = 1.0 / cos( 3.14159265 / s_CircleToSegmentsCount ); s_Correction = 1.0 / cos( 3.14159265 / s_CircleToSegmentsCount );
// This KPolygonSet is the area(s) to fill, with m_ZoneMinThickness/2 // This KI_POLYGON_SET is the area(s) to fill, with m_ZoneMinThickness/2
KPolygonSet polyset_zone_solid_areas; KI_POLYGON_SET polyset_zone_solid_areas;
int margin = m_ZoneMinThickness / 2; int margin = m_ZoneMinThickness / 2;
/* First, creates the main polygon (i.e. the filled area using only one outline) /* First, creates the main polygon (i.e. the filled area using only one outline)
...@@ -160,7 +160,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) ...@@ -160,7 +160,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
* the main polygon is stored in polyset_zone_solid_areas * the main polygon is stored in polyset_zone_solid_areas
*/ */
CopyPolygonsFromFilledPolysListTotKPolygonList( this, polyset_zone_solid_areas ); CopyPolygonsFromFilledPolysListToKiPolygonList( this, polyset_zone_solid_areas );
polyset_zone_solid_areas -= margin; polyset_zone_solid_areas -= margin;
if( polyset_zone_solid_areas.size() == 0 ) if( polyset_zone_solid_areas.size() == 0 )
...@@ -431,15 +431,15 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) ...@@ -431,15 +431,15 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
// Calculate now actual solid areas // Calculate now actual solid areas
if( cornerBufferPolysToSubstract.size() > 0 ) if( cornerBufferPolysToSubstract.size() > 0 )
{ {
KPolygonSet polyset_holes; KI_POLYGON_SET polyset_holes;
AddPolygonCornersToKPolygonList( cornerBufferPolysToSubstract, polyset_holes ); AddPolygonCornersToKiPolygonList( cornerBufferPolysToSubstract, polyset_holes );
// Remove holes from initial area.: // Remove holes from initial area.:
polyset_zone_solid_areas -= polyset_holes; polyset_zone_solid_areas -= polyset_holes;
} }
// put solid areas in m_FilledPolysList: // put solid areas in m_FilledPolysList:
m_FilledPolysList.clear(); m_FilledPolysList.clear();
CopyPolygonsFromKPolygonListToFilledPolysList( this, polyset_zone_solid_areas ); CopyPolygonsFromKiPolygonListToFilledPolysList( this, polyset_zone_solid_areas );
// Remove insulated islands: // Remove insulated islands:
if( GetNet() > 0 ) if( GetNet() > 0 )
...@@ -455,13 +455,13 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) ...@@ -455,13 +455,13 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
// remove copper areas // remove copper areas
if( cornerBufferPolysToSubstract.size() ) if( cornerBufferPolysToSubstract.size() )
{ {
KPolygonSet polyset_holes; KI_POLYGON_SET polyset_holes;
AddPolygonCornersToKPolygonList( cornerBufferPolysToSubstract, polyset_holes ); AddPolygonCornersToKiPolygonList( cornerBufferPolysToSubstract, polyset_holes );
polyset_zone_solid_areas -= polyset_holes; polyset_zone_solid_areas -= polyset_holes;
// put these areas in m_FilledPolysList // put these areas in m_FilledPolysList
m_FilledPolysList.clear(); m_FilledPolysList.clear();
CopyPolygonsFromKPolygonListToFilledPolysList( this, polyset_zone_solid_areas ); CopyPolygonsFromKiPolygonListToFilledPolysList( this, polyset_zone_solid_areas );
if( GetNet() > 0 ) if( GetNet() > 0 )
Test_For_Copper_Island_And_Remove_Insulated_Islands( aPcb ); Test_For_Copper_Island_And_Remove_Insulated_Islands( aPcb );
...@@ -470,12 +470,12 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) ...@@ -470,12 +470,12 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
cornerBufferPolysToSubstract.clear(); cornerBufferPolysToSubstract.clear();
} }
void AddPolygonCornersToKPolygonList( std::vector <CPolyPt>& aCornersBuffer, void AddPolygonCornersToKiPolygonList( std::vector <CPolyPt>& aCornersBuffer,
KPolygonSet& aKPolyList ) KI_POLYGON_SET& aKiPolyList )
{ {
unsigned ii; unsigned ii;
std::vector<KPolyPoint> cornerslist; std::vector<KI_POLY_POINT> cornerslist;
int polycount = 0; int polycount = 0;
...@@ -485,42 +485,42 @@ void AddPolygonCornersToKPolygonList( std::vector <CPolyPt>& aCornersBuffer, ...@@ -485,42 +485,42 @@ void AddPolygonCornersToKPolygonList( std::vector <CPolyPt>& aCornersBuffer,
polycount++; polycount++;
} }
aKPolyList.reserve( polycount ); aKiPolyList.reserve( polycount );
for( unsigned icnt = 0; icnt < aCornersBuffer.size(); ) for( unsigned icnt = 0; icnt < aCornersBuffer.size(); )
{ {
KPolygon poly; KI_POLYGON poly;
cornerslist.clear(); cornerslist.clear();
for( ii = icnt; ii < aCornersBuffer.size(); ii++ ) for( ii = icnt; ii < aCornersBuffer.size(); ii++ )
{ {
cornerslist.push_back( KPolyPoint( aCornersBuffer[ii].x, aCornersBuffer[ii].y ) ); cornerslist.push_back( KI_POLY_POINT( aCornersBuffer[ii].x, aCornersBuffer[ii].y ) );
if( aCornersBuffer[ii].end_contour ) if( aCornersBuffer[ii].end_contour )
break; break;
} }
bpl::set_points( poly, cornerslist.begin(), cornerslist.end() ); bpl::set_points( poly, cornerslist.begin(), cornerslist.end() );
aKPolyList.push_back( poly ); aKiPolyList.push_back( poly );
icnt = ii + 1; icnt = ii + 1;
} }
} }
int CopyPolygonsFromKPolygonListToFilledPolysList( ZONE_CONTAINER* aZone, int CopyPolygonsFromKiPolygonListToFilledPolysList( ZONE_CONTAINER* aZone,
KPolygonSet& aKPolyList ) KI_POLYGON_SET& aKiPolyList )
{ {
int count = 0; int count = 0;
std::vector<CPolyPt> polysList; std::vector<CPolyPt> polysList;
for( unsigned ii = 0; ii < aKPolyList.size(); ii++ ) for( unsigned ii = 0; ii < aKiPolyList.size(); ii++ )
{ {
KPolygon& poly = aKPolyList[ii]; KI_POLYGON& poly = aKiPolyList[ii];
CPolyPt corner( 0, 0, false ); CPolyPt corner( 0, 0, false );
for( unsigned jj = 0; jj < poly.size(); jj++ ) for( unsigned jj = 0; jj < poly.size(); jj++ )
{ {
KPolyPoint point = *(poly.begin() + jj); KI_POLY_POINT point = *(poly.begin() + jj);
corner.x = point.x(); corner.x = point.x();
corner.y = point.y(); corner.y = point.y();
corner.end_contour = false; corner.end_contour = false;
...@@ -542,10 +542,10 @@ int CopyPolygonsFromKPolygonListToFilledPolysList( ZONE_CONTAINER* aZone, ...@@ -542,10 +542,10 @@ int CopyPolygonsFromKPolygonListToFilledPolysList( ZONE_CONTAINER* aZone,
} }
int CopyPolygonsFromFilledPolysListTotKPolygonList( ZONE_CONTAINER* aZone, int CopyPolygonsFromFilledPolysListToKiPolygonList( ZONE_CONTAINER* aZone,
KPolygonSet& aKPolyList ) KI_POLYGON_SET& aKiPolyList )
{ {
std::vector<CPolyPt> polysList = aZone->GetFilledPolysList(); const std::vector<CPolyPt>& polysList = aZone->GetFilledPolysList();
unsigned corners_count = polysList.size(); unsigned corners_count = polysList.size();
int count = 0; int count = 0;
unsigned ic = 0; unsigned ic = 0;
...@@ -554,35 +554,32 @@ int CopyPolygonsFromFilledPolysListTotKPolygonList( ZONE_CONTAINER* aZone, ...@@ -554,35 +554,32 @@ int CopyPolygonsFromFilledPolysListTotKPolygonList( ZONE_CONTAINER* aZone,
for( unsigned ii = 0; ii < corners_count; ii++ ) for( unsigned ii = 0; ii < corners_count; ii++ )
{ {
CPolyPt* corner = &polysList[ic]; const CPolyPt& corner = polysList[ii];
if( corner->end_contour ) if( corner.end_contour )
polycount++; polycount++;
} }
aKPolyList.reserve( polycount ); aKiPolyList.reserve( polycount );
std::vector<KPolyPoint> cornerslist; std::vector<KI_POLY_POINT> cornerslist;
while( ic < corners_count ) while( ic < corners_count )
{ {
cornerslist.clear(); cornerslist.clear();
KPolygon poly; KI_POLYGON poly;
{ {
for( ; ic < corners_count; ic++ ) while( ic < corners_count )
{ {
CPolyPt* corner = &polysList[ic]; const CPolyPt& corner = polysList[ic++];
cornerslist.push_back( KPolyPoint( corner->x, corner->y ) ); cornerslist.push_back( KI_POLY_POINT( corner.x, corner.y ) );
count++; count++;
if( corner->end_contour ) if( corner.end_contour )
{
ic++;
break; break;
}
} }
bpl::set_points( poly, cornerslist.begin(), cornerslist.end() ); bpl::set_points( poly, cornerslist.begin(), cornerslist.end() );
aKPolyList.push_back( poly ); aKiPolyList.push_back( poly );
} }
} }
......
pcbnew/zones_functions_for_undo_redo.cpp
View file @ ef5f1b9e
...@@ -115,7 +115,7 @@ bool ZONE_CONTAINER::IsSame( const ZONE_CONTAINER& aZoneToCompare ) ...@@ -115,7 +115,7 @@ bool ZONE_CONTAINER::IsSame( const ZONE_CONTAINER& aZoneToCompare )
wxASSERT( m_Poly ); // m_Poly == NULL Should never happen wxASSERT( m_Poly ); // m_Poly == NULL Should never happen
wxASSERT( aZoneToCompare.m_Poly ); wxASSERT( aZoneToCompare.m_Poly );
if( m_Poly->corner != aZoneToCompare.m_Poly->corner ) // Compare vector if( m_Poly->m_CornersList != aZoneToCompare.m_Poly->m_CornersList ) // Compare vector
return false; return false;
return true; return true;
......
pcbnew/zones_test_and_combine_areas.cpp
View file @ ef5f1b9e
This diff is collapsed.
polygon/PolyLine.cpp
View file @ ef5f1b9e
This diff is collapsed.
polygon/PolyLine.h
View file @ ef5f1b9e
...@@ -31,18 +31,6 @@ enum ...@@ -31,18 +31,6 @@ enum
}; };
/**
* Function ArmBoolEng
* Initialise parameters used in kbool
* @param aBooleng = pointer to the Bool_Engine to initialise
* @param aConvertHoles = mode for holes when a boolean operation is made
* true: holes are linked into outer contours by double overlapping segments
* false: holes are not linked: in this mode contours are added clockwise
* and polygons added counter clockwise are holes (default)
*/
void ArmBoolEng( Bool_Engine* aBooleng, bool aConvertHoles = false );
class CRect class CRect
{ {
public: public:
...@@ -86,22 +74,22 @@ class CPolyPt : public wxPoint ...@@ -86,22 +74,22 @@ class CPolyPt : public wxPoint
{ {
public: public:
CPolyPt( int aX = 0, int aY = 0, bool aEnd = false, int aUtility = 0 ) : CPolyPt( int aX = 0, int aY = 0, bool aEnd = false, int aUtility = 0 ) :
wxPoint( aX, aY ), end_contour( aEnd ), utility( aUtility ) wxPoint( aX, aY ), end_contour( aEnd ), m_utility( aUtility )
{} {}
/// Pure copy constructor is here to dis-ambiguate from the /// Pure copy constructor is here to dis-ambiguate from the
/// specialized CPolyPt( const wxPoint& ) constructor version below. /// specialized CPolyPt( const wxPoint& ) constructor version below.
CPolyPt( const CPolyPt& aPt ) : CPolyPt( const CPolyPt& aPt ) :
wxPoint( aPt.x, aPt.y ), end_contour( aPt.end_contour ), utility( aPt.utility ) wxPoint( aPt.x, aPt.y ), end_contour( aPt.end_contour ), m_utility( aPt.m_utility )
{} {}
CPolyPt( const wxPoint& aPoint ) : CPolyPt( const wxPoint& aPoint ) :
wxPoint( aPoint ), end_contour( false ), utility( 0 ) wxPoint( aPoint ), end_contour( false ), m_utility( 0 )
{} {}
bool end_contour; bool end_contour;
int utility; int m_utility;
bool operator == (const CPolyPt& cpt2 ) const bool operator == (const CPolyPt& cpt2 ) const
{ return (x == cpt2.x) && (y == cpt2.y) && (end_contour == cpt2.end_contour); } { return (x == cpt2.x) && (y == cpt2.y) && (end_contour == cpt2.end_contour); }
...@@ -116,7 +104,7 @@ public: ...@@ -116,7 +104,7 @@ public:
class CPolyLine class CPolyLine
{ {
public: public:
enum side_style { STRAIGHT, ARC_CW, ARC_CCW }; // side styles enum m_SideStyle { STRAIGHT, ARC_CW, ARC_CCW }; // side styles
enum hatch_style { NO_HATCH, DIAGONAL_FULL, DIAGONAL_EDGE }; // hatch styles enum hatch_style { NO_HATCH, DIAGONAL_FULL, DIAGONAL_EDGE }; // hatch styles
// constructors/destructor // constructors/destructor
...@@ -173,21 +161,21 @@ public: ...@@ -173,21 +161,21 @@ public:
int GetNumCorners(); int GetNumCorners();
int GetNumSides(); int GetNumSides();
int GetClosed(); int GetClosed();
int GetNumContours(); int GetContoursCount();
int GetContour( int ic ); int GetContour( int ic );
int GetContourStart( int icont ); int GetContourStart( int icont );
int GetContourEnd( int icont ); int GetContourEnd( int icont );
int GetContourSize( int icont ); int GetContourSize( int icont );
int GetX( int ic ) const { return corner[ic].x; } int GetX( int ic ) const { return m_CornersList[ic].x; }
int GetY( int ic ) const { return corner[ic].y; } int GetY( int ic ) const { return m_CornersList[ic].y; }
const wxPoint& GetPos( int ic ) const { return corner[ic]; } const wxPoint& GetPos( int ic ) const { return m_CornersList[ic]; }
int GetEndContour( int ic ); int GetEndContour( int ic );
int GetUtility( int ic ) { return corner[ic].utility; }; int GetUtility( int ic ) { return m_CornersList[ic].m_utility; };
void SetUtility( int ic, int utility ) { corner[ic].utility = utility; }; void SetUtility( int ic, int utility ) { m_CornersList[ic].m_utility = utility; };
int GetSideStyle( int is ); int GetSideStyle( int is );
int GetHatchPitch() { return m_hatchPitch; } int GetHatchPitch() { return m_hatchPitch; }
int GetDefaultHatchPitchMils() { return 20; } // default hatch pitch value in mils int GetDefaultHatchPitchMils() { return 20; } // default hatch pitch value in mils
...@@ -301,18 +289,18 @@ public: ...@@ -301,18 +289,18 @@ public:
private: private:
int m_layer; // layer to draw on int m_layer; // layer to draw on
int m_Width; // lines width when drawing. Provided but not really used int m_width; // lines width when drawing. Provided but not really used
enum hatch_style m_hatchStyle; // hatch style, see enum above enum hatch_style m_hatchStyle; // hatch style, see enum above
int m_hatchPitch; // for DIAGONAL_EDGE hatched outlines, basic distance between 2 hatch lines int m_hatchPitch; // for DIAGONAL_EDGE hatched outlines, basic distance between 2 hatch lines
// and the len of eacvh segment // and the len of eacvh segment
// for DIAGONAL_FULL, the pitch is twice this value // for DIAGONAL_FULL, the pitch is twice this value
int utility; int m_utility; // a flag used in some calculations
Bool_Engine* m_Kbool_Poly_Engine; // polygons set in kbool engine data Bool_Engine* m_Kbool_Poly_Engine; // polygons set in kbool engine data
public: public:
std::vector <CPolyPt> corner; // array of points for corners std::vector <CPolyPt> m_CornersList; // array of points for corners
std::vector <int> side_style; // array of styles for sides std::vector <int> m_SideStyle; // array of styles for sides
std::vector <CSegment> m_HatchLines; // hatch lines std::vector <CSegment> m_HatchLines; // hatch lines showing the polygon area
}; };
#endif // #ifndef POLYLINE_H #endif // #ifndef POLYLINE_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment