Commit cfeb55a2 authored by Marco Mattila's avatar Marco Mattila
Browse files

Fix clearance problem between zones and edge segments in pcbnew.

parent 9f9e7fd5

pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
            if( item_boundingbox.Intersects( zone_boundingbox ) )

            if( item_boundingbox.Intersects( zone_boundingbox ) )

            {

            {

                ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(

                ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(

                    cornerBufferPolysToSubstract, m_ZoneClearance,

                    cornerBufferPolysToSubstract, zone_clearance,

                    s_CircleToSegmentsCount, s_Correction );

                    s_CircleToSegmentsCount, s_Correction );

            }

            }

        }

        }
@@ -297,7 +297,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
        case TYPE_DRAWSEGMENT:

        case TYPE_DRAWSEGMENT:

            ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(

            ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(

                cornerBufferPolysToSubstract,

                cornerBufferPolysToSubstract,

                m_ZoneClearance,

                zone_clearance,

                s_CircleToSegmentsCount,

                s_CircleToSegmentsCount,

                s_Correction );

                s_Correction );

            break;

            break;
@@ -306,7 +306,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
        case TYPE_TEXTE:

        case TYPE_TEXTE:

            ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(

            ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(

                cornerBufferPolysToSubstract,

                cornerBufferPolysToSubstract,

                m_ZoneClearance,

                zone_clearance,

                s_CircleToSegmentsCount,

                s_CircleToSegmentsCount,

                s_Correction );

                s_Correction );

            break;

            break;

pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
            if( item_boundingbox.Intersects( zone_boundingbox ) )

            if( item_boundingbox.Intersects( zone_boundingbox ) )

            {

            {

                ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(

                ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(

                    cornerBufferPolysToSubstract, m_ZoneClearance,

                    cornerBufferPolysToSubstract, zone_clearance,

                    s_CircleToSegmentsCount, s_Correction );

                    s_CircleToSegmentsCount, s_Correction );

            }

            }

        }

        }
@@ -335,7 +335,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
        case TYPE_DRAWSEGMENT:

        case TYPE_DRAWSEGMENT:

            ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(

            ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(

                cornerBufferPolysToSubstract,

                cornerBufferPolysToSubstract,

                m_ZoneClearance,

                zone_clearance,

                s_CircleToSegmentsCount,

                s_CircleToSegmentsCount,

                s_Correction );

                s_Correction );

            break;

            break;
@@ -344,7 +344,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) 
        case TYPE_TEXTE:

        case TYPE_TEXTE:

            ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(

            ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(

                cornerBufferPolysToSubstract,

                cornerBufferPolysToSubstract,

                m_ZoneClearance,

                zone_clearance,

                s_CircleToSegmentsCount,

                s_CircleToSegmentsCount,

                s_Correction );

                s_Correction );

            break;

            break;