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

eeschema/lib_arc.cpp

@@ -561,15 +561,15 @@ void LIB_ARC::BeginEdit( int aEditMode, const wxPoint aPosition )
         // Drag either the start, end point or the outline
         if( HitTestPoints( m_ArcStart, aPosition, MINIMUM_SELECTION_DISTANCE ) )
         {
-            m_editSelectPoint = START;
+            m_editSelectPoint = ARC_STATUS_START;
         }
         else if( HitTestPoints( m_ArcEnd, aPosition, MINIMUM_SELECTION_DISTANCE ) )
         {
-            m_editSelectPoint = END;
+            m_editSelectPoint = ARC_STATUS_END;
         }
         else
         {
-            m_editSelectPoint = OUTLINE;
+            m_editSelectPoint = ARC_STATUS_OUTLINE;
         }
 
         m_editState = 0;
@@ -619,12 +619,12 @@ void LIB_ARC::calcEdit( const wxPoint& aPosition )
         wxPoint newCenterPoint, startPos, endPos;
 
         // Choose the point of the arc to be adjusted
-        if( m_editSelectPoint == START )
+        if( m_editSelectPoint == ARC_STATUS_START )
         {
             startPos = aPosition;
             endPos   = m_ArcEnd;
         }
-        else if( m_editSelectPoint == END )
+        else if( m_editSelectPoint == ARC_STATUS_END )
         {
             endPos   = aPosition;
             startPos = m_ArcStart;
@@ -658,7 +658,7 @@ void LIB_ARC::calcEdit( const wxPoint& aPosition )
                 newCenterPoint = m_Pos;
         }
 
-        if( m_editSelectPoint == START || m_editSelectPoint == END )
+        if( m_editSelectPoint == ARC_STATUS_START || m_editSelectPoint == ARC_STATUS_END )
         {
             // Compute the new center point when the start/end points are modified
             wxPoint middlePoint = wxPoint( (startPos.x + endPos.x) / 2,

eeschema/lib_arc.h

@@ -37,15 +37,15 @@ class TRANSFORM;
 
 class LIB_ARC : public LIB_ITEM
 {
-    enum SELECT_T
+    enum SELECT_T               // When creating an arc: status of arc
     {
-        START,
-        END,
-        OUTLINE,
+        ARC_STATUS_START,
+        ARC_STATUS_END,
+        ARC_STATUS_OUTLINE,
     };
 
     int      m_Radius;
-    int      m_t1;              /* First radius angle of the arc in 0.1 degrees. */
+    int      m_t1;              // First radius angle of the arc in 0.1 degrees.
     int      m_t2;              /* Second radius angle of the arc in 0.1 degrees. */
     wxPoint  m_ArcStart;
     wxPoint  m_ArcEnd;          /* Arc end position. */

pcbnew/autorouter/solve.cpp

@@ -1302,12 +1302,12 @@ static void AddNewTrace( PCB_EDIT_FRAME* pcbframe, wxDC* DC )
         g_CurrentTrackList.PushBack( newTrack );
     }
 
-    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, START );
+    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, FLG_START );
 
     if( g_FirstTrackSegment->start )
         g_FirstTrackSegment->SetState( BEGIN_ONPAD, ON );
 
-    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, END );
+    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, FLG_END );
 
     if( g_CurrentTrackSegment->end )
         g_CurrentTrackSegment->SetState( END_ONPAD, ON );

pcbnew/class_board.cpp

@@ -1681,7 +1681,7 @@ D_PAD* BOARD::GetPad( TRACK* aTrace, int aEndPoint )
 
     int     aLayerMask = GetLayerMask( aTrace->GetLayer() );
 
-    if( aEndPoint == START )
+    if( aEndPoint == FLG_START )
     {
         aPosition = aTrace->m_Start;
     }
@@ -2271,7 +2271,7 @@ TRACK* BOARD::CreateLockPoint( wxPoint& aPosition, TRACK* aSegment, PICKED_ITEMS
     aSegment->end = newTrack;
     aSegment->SetState( END_ONPAD, OFF );
 
-    D_PAD * pad = GetPad( newTrack, START );
+    D_PAD * pad = GetPad( newTrack, FLG_START );
 
     if ( pad )
     {

pcbnew/class_track.cpp

@@ -1282,7 +1282,7 @@ TRACK* TRACK::GetTrace( TRACK* aStartTrace, TRACK* aEndTrace, int aEndPoint )
     int     ii;
     int     max_dist;
 
-    if( aEndPoint == START )
+    if( aEndPoint == FLG_START )
         position = m_Start;
     else
         position = m_End;

pcbnew/class_zone.h

@@ -613,7 +613,7 @@ private:
 
     /* set of filled polygons used to draw a zone as a filled area.
      * from outlines (m_Poly) but unlike m_Poly these filled polygons have no hole
-     * (they are* all in one piece)  In very simple cases m_FilledPolysList is same
+     * (they are all in one piece)  In very simple cases m_FilledPolysList is same
      * as m_Poly.  In less simple cases (when m_Poly has holes) m_FilledPolysList is
      * a polygon equivalent to m_Poly, without holes but with extra outline segment
      * connecting "holes" with external main outline.  In complex cases an outline

pcbnew/clean.cpp

@@ -272,7 +272,7 @@ static void DeleteUnconnectedTracks( PCB_EDIT_FRAME* aFrame )
 
         if( (type_end & START_ON_PAD ) == 0 )
         {
-            other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, START );
+            other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_START );
 
             if( other == NULL )     // Test a connection to zones
             {
@@ -306,7 +306,7 @@ static void DeleteUnconnectedTracks( PCB_EDIT_FRAME* aFrame )
                     segment->SetState( BUSY, ON );
 
                     SEGVIA* via = (SEGVIA*) other;
-                    other = via->GetTrace( aFrame->GetBoard()->m_Track, NULL, START );
+                    other = via->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_START );
 
                     if( other == NULL )
                     {
@@ -327,7 +327,7 @@ static void DeleteUnconnectedTracks( PCB_EDIT_FRAME* aFrame )
         // if not connected to a pad, test if segment's END is connected to another track
         if( (type_end & END_ON_PAD ) == 0 )
         {
-            other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, END );
+            other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_END );
 
             if( other == NULL )     // Test a connection to zones
             {
@@ -362,7 +362,7 @@ static void DeleteUnconnectedTracks( PCB_EDIT_FRAME* aFrame )
                     segment->SetState( BUSY, ON );
 
                     SEGVIA* via = (SEGVIA*) other;
-                    other = via->GetTrace( aFrame->GetBoard()->m_Track, NULL, END );
+                    other = via->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_END );
 
                     if( other == NULL )
                     {
@@ -486,7 +486,7 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
         // search for a possible point that connects on the START point of the segment
         for( segStart = segment->Next(); ; )
         {
-            segStart = segment->GetTrace( segStart, NULL, START );
+            segStart = segment->GetTrace( segStart, NULL, FLG_START );
 
             if( segStart )
             {
@@ -500,7 +500,7 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
 
                 // We must have only one segment connected
                 segStart->SetState( BUSY, ON );
-                other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, START );
+                other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_START );
                 segStart->SetState( BUSY, OFF );
 
                 if( other == NULL )
@@ -514,7 +514,7 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
         if( flag )   // We have the starting point of the segment is connected to an other segment
         {
             segDelete = MergeColinearSegmentIfPossible( aFrame->GetBoard(), segment, segStart,
-                                                        START );
+                                                        FLG_START );
 
             if( segDelete )
             {
@@ -526,7 +526,7 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
         // search for a possible point that connects on the END point of the segment:
         for( segEnd = segment->Next(); ; )
         {
-            segEnd = segment->GetTrace( segEnd, NULL, END );
+            segEnd = segment->GetTrace( segEnd, NULL, FLG_END );
 
             if( segEnd )
             {
@@ -538,7 +538,7 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
 
                 // We must have only one segment connected
                 segEnd->SetState( BUSY, ON );
-                other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, END );
+                other = segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_END );
                 segEnd->SetState( BUSY, OFF );
 
                 if( other == NULL )
@@ -554,7 +554,8 @@ static void clean_segments( PCB_EDIT_FRAME* aFrame )
 
         if( flag & 2 )  // We have the ending point of the segment is connected to an other segment
         {
-            segDelete = MergeColinearSegmentIfPossible( aFrame->GetBoard(), segment, segEnd, END );
+            segDelete = MergeColinearSegmentIfPossible( aFrame->GetBoard(),
+                                                        segment, segEnd, FLG_END );
 
             if( segDelete )
             {
@@ -643,7 +644,7 @@ TRACK* MergeColinearSegmentIfPossible( BOARD* aPcb, TRACK* aTrackRef, TRACK* aCa
      * (this function) is called when there is only 2 connected segments,
      *and if this point is not on a pad, it can be removed and the 2 segments will be merged
      */
-    if( aEndType == START )
+    if( aEndType == FLG_START )
     {
         // We must not have a pad, which is a always terminal point for a track
         if( aPcb->GetPadFast( aTrackRef->m_Start, aTrackRef->ReturnMaskLayer() ) )
@@ -712,7 +713,7 @@ bool PCB_EDIT_FRAME::RemoveMisConnectedTracks()
         }
         else
         {
-            other = segment->GetTrace( GetBoard()->m_Track, NULL, START );
+            other = segment->GetTrace( GetBoard()->m_Track, NULL, FLG_START );
 
             if( other )
                 net_code_s = other->GetNet();
@@ -730,7 +731,7 @@ bool PCB_EDIT_FRAME::RemoveMisConnectedTracks()
         }
         else
         {
-            other = segment->GetTrace( GetBoard()->m_Track, NULL, END );
+            other = segment->GetTrace( GetBoard()->m_Track, NULL, FLG_END );
 
             if( other )
                 net_code_e = other->GetNet();
@@ -871,14 +872,14 @@ void ConnectDanglingEndToPad( PCB_EDIT_FRAME* aFrame )
         if( aFrame->GetCanvas()->GetAbortRequest() )
             return;
 
-        pad = aFrame->GetBoard()->GetPad( segment, START );
+        pad = aFrame->GetBoard()->GetPad( segment, FLG_START );
 
         if( pad )
         {
             // test if the track start point is not exactly starting on the pad
             if( segment->m_Start != pad->GetPosition() )
             {
-                if( segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, START ) == NULL )
+                if( segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_START ) == NULL )
                 {
                     TRACK* newTrack = (TRACK*) segment->Clone();
 
@@ -893,14 +894,14 @@ void ConnectDanglingEndToPad( PCB_EDIT_FRAME* aFrame )
             }
         }
 
-        pad = aFrame->GetBoard()->GetPad( segment, END );
+        pad = aFrame->GetBoard()->GetPad( segment, FLG_END );
 
         if( pad )
         {
             // test if the track end point is not exactly on the pad
             if( segment->m_End != pad->GetPosition() )
             {
-                if( segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, END ) == NULL )
+                if( segment->GetTrace( aFrame->GetBoard()->m_Track, NULL, FLG_END ) == NULL )
                 {
                     TRACK* newTrack = (TRACK*)segment->Clone();
 

pcbnew/editrack.cpp

@@ -263,7 +263,7 @@ TRACK* PCB_EDIT_FRAME::Begin_Route( TRACK* aTrack, wxDC* aDC )
 
             newTrack->SetState( BEGIN_ONPAD | END_ONPAD, OFF );
 
-            D_PAD* pad = GetBoard()->GetPad( previousTrack, END );
+            D_PAD* pad = GetBoard()->GetPad( previousTrack, FLG_END );
 
             if( pad )
             {
@@ -1042,7 +1042,7 @@ void DeleteNullTrackSegments( BOARD* pcb, DLIST<TRACK>& aTrackList )
     while( track != NULL )
     {
         TRACK* next_track = track->Next();
-        LockPoint = pcb->GetPad( track, END );
+        LockPoint = pcb->GetPad( track, FLG_END );
 
         if( LockPoint )
         {

pcbnew/move_or_drag_track.cpp

@@ -887,7 +887,7 @@ void PCB_EDIT_FRAME::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC*  DC
     s_StartSegmentPresent = s_EndSegmentPresent = true;
 
     if( ( track->start == NULL ) || ( track->start->Type() == PCB_TRACE_T ) )
-        TrackToStartPoint = track->GetTrace( GetBoard()->m_Track, NULL, START );
+        TrackToStartPoint = track->GetTrace( GetBoard()->m_Track, NULL, FLG_START );
 
     //  Test if more than one segment is connected to this point
     if( TrackToStartPoint )
@@ -895,14 +895,14 @@ void PCB_EDIT_FRAME::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC*  DC
         TrackToStartPoint->SetState( BUSY, ON );
 
         if( ( TrackToStartPoint->Type() == PCB_VIA_T )
-           || track->GetTrace( GetBoard()->m_Track, NULL, START ) )
+           || track->GetTrace( GetBoard()->m_Track, NULL, FLG_START ) )
             error = true;
 
         TrackToStartPoint->SetState( BUSY, OFF );
     }
 
     if( ( track->end == NULL ) || ( track->end->Type() == PCB_TRACE_T ) )
-        TrackToEndPoint = track->GetTrace( GetBoard()->m_Track, NULL, END );
+        TrackToEndPoint = track->GetTrace( GetBoard()->m_Track, NULL, FLG_END );
 
     //  Test if more than one segment is connected to this point
     if( TrackToEndPoint )
@@ -910,7 +910,7 @@ void PCB_EDIT_FRAME::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC*  DC
         TrackToEndPoint->SetState( BUSY, ON );
 
         if( (TrackToEndPoint->Type() == PCB_VIA_T)
-           || track->GetTrace( GetBoard()->m_Track, NULL, END ) )
+           || track->GetTrace( GetBoard()->m_Track, NULL, FLG_END ) )
             error = true;
 
         TrackToEndPoint->SetState( BUSY, OFF );

pcbnew/pcbnew.h

@@ -25,8 +25,8 @@
 #define VISIBLE_ONLY  (1 << 3)   ///< if module not on a visible layer, do not select
 
 
-#define START 0                  /* Flag used in locate routines */
-#define END   1
+#define FLG_START 0             // Flag used in locate routines
+#define FLG_END   1             // Flag used in locate routines
 
 #define DIM_ANCRE_MODULE 3       /* Anchor size (footprint center) */
 #define DIM_ANCRE_TEXTE  2       /* Anchor size (Text center) */

pcbnew/zone_filling_algorithm.cpp

@@ -89,39 +89,12 @@ int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb, std::vector <CPolyPt>
         break;
     }
 
-    m_smoothedPoly->MakeKboolPoly( -1, -1, NULL, true );
-    int count = 0;
-    while( m_smoothedPoly->GetKboolEngine()->StartPolygonGet() )
-    {
-        CPolyPt corner( 0, 0, false );
-        while( m_smoothedPoly->GetKboolEngine()->PolygonHasMorePoints() )
-        {
-            corner.x = (int) m_smoothedPoly->GetKboolEngine()->GetPolygonXPoint();
-            corner.y = (int) m_smoothedPoly->GetKboolEngine()->GetPolygonYPoint();
-            corner.end_contour = false;
-            if( aCornerBuffer )
-                aCornerBuffer->push_back( corner );
-            else
-                m_FilledPolysList.push_back( corner );
-            count++;
-        }
-
-        corner.end_contour = true;
-        if( aCornerBuffer )
-        {
-            aCornerBuffer->pop_back();
-            aCornerBuffer->push_back( corner );
-        }
-        else
-        {
-            m_FilledPolysList.pop_back();
-            m_FilledPolysList.push_back( corner );
-        }
-        m_smoothedPoly->GetKboolEngine()->EndPolygonGet();
-    }
-
-    m_smoothedPoly->FreeKboolEngine();
-
+    if( aCornerBuffer )
+        ConvertPolysListWithHolesToOnePolygon( m_smoothedPoly->m_CornersList,
+                                               *aCornerBuffer );
+    else
+        ConvertPolysListWithHolesToOnePolygon( m_smoothedPoly->m_CornersList,
+                                               m_FilledPolysList );
     /* For copper layers, we now must add holes in the Polygon list.
      * holes are pads and tracks with their clearance area
      */
@@ -134,7 +107,7 @@ int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb, std::vector <CPolyPt>
             Fill_Zone_Areas_With_Segments( );
     }
 
-    return count;
+    return 1;
 }
 
 // Sort function to build filled zones

pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp

@@ -524,10 +524,6 @@ int CopyPolygonsFromKiPolygonListToFilledPolysList( ZONE_CONTAINER* aZone,
             corner.x = point.x();
             corner.y = point.y();
             corner.end_contour = false;
-
-            // Flag this corner if starting a hole connection segment:
-            // This is used by draw functions to draw only useful segments (and not extra segments)
-            // corner.utility = (aBoolengine->GetPolygonPointEdgeType() == KB_FALSE_EDGE) ? 1 : 0;
             polysList.push_back( corner );
             count++;
         }

pcbnew/zones_test_and_combine_areas.cpp

@@ -31,7 +31,6 @@
  */
 
 #include <fctsys.h>
-#include <polygons_defs.h>
 #include <common.h>
 #include <confirm.h>
 #include <class_undoredo_container.h>
@@ -779,58 +778,6 @@ int BOARD::TestAreaIntersection( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_
     return 1;
 }
 
-/**
- * Function CopyPolysListToKiPolygonWithHole
- * converts the outline contours aPolysList to a KI_POLYGON_WITH_HOLES
- *
- * @param aPolysList = the list of corners of contours
- * @param aPolygoneWithHole = a KI_POLYGON_WITH_HOLES to populate
- */
-void CopyPolysListToKiPolygonWithHole( const std::vector<CPolyPt>& aPolysList,
-                                        KI_POLYGON_WITH_HOLES& aPolygoneWithHole )
-{
-    unsigned corners_count = aPolysList.size();
-
-    std::vector<KI_POLY_POINT> cornerslist;
-    KI_POLYGON poly;
-
-    // Enter main outline: this is the first contour
-    unsigned ic = 0;
-    while( ic < corners_count )
-    {
-        const CPolyPt& corner = aPolysList[ic++];
-        cornerslist.push_back( KI_POLY_POINT( corner.x, corner.y ) );
-
-        if( corner.end_contour )
-            break;
-    }
-
-    aPolygoneWithHole.set( cornerslist.begin(), cornerslist.end() );
-
-    // Enter holes: they are next contours (when exist)
-    if( ic < corners_count )
-    {
-        KI_POLYGON_SET holePolyList;
-        while( ic < corners_count )
-        {
-            cornerslist.clear();
-
-            while( ic < corners_count )
-            {
-                const CPolyPt& corner = aPolysList[ic++];
-                cornerslist.push_back( KI_POLY_POINT( corner.x, corner.y ) );
-
-                if( corner.end_contour )
-                    break;
-            }
-
-            bpl::set_points( poly, cornerslist.begin(), cornerslist.end() );
-            holePolyList.push_back( poly );
-        }
-        aPolygoneWithHole.set_holes( holePolyList.begin(), holePolyList.end() );
-    }
-}
-
 
 /**
  * Function CombineAreas