Commit 188ea1f5 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

More accurate rendering display of ZONE_CONTAINERs.

parent 71a1ad6f

pcbnew/pcb_painter.cpp

+28 −14
Original line number Diff line number Diff line
@@ -495,21 +495,29 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer ) 


void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer )

{

    std::vector<CPolyPt> polyPoints = aContainer->GetFilledPolysList();

    if( polyPoints.size() == 0 )  // Nothing to draw

                return;



    COLOR4D fillColor = getLayerColor( aContainer->GetLayer(), aContainer->GetNet() );

    std::vector<CPolyPt>::iterator polyIterator;

    std::vector<CPolyPt> polyPoints = aContainer->GetFilledPolysList();

    std::deque<VECTOR2D> corners;

    VECTOR2D startPoint;

    int fillMode = aContainer->GetFillMode();



    m_gal->SetLineCap( LINE_CAP_BUTT );

    m_gal->SetLineJoin( LINE_JOIN_ROUND );

    m_gal->SetFillColor( fillColor );

    m_gal->SetStrokeColor( fillColor );

    m_gal->SetIsFill( aContainer->IsFilled() );

    m_gal->SetIsFill( !fillMode );

    m_gal->SetIsStroke( true );

    m_gal->SetLineWidth( aContainer->GetThermalReliefCopperBridge() / 2.0 );

    m_gal->SetLineCap( LINE_CAP_ROUND );

    m_gal->SetLineJoin( LINE_JOIN_ROUND );



    // FIXME implement hatch mode



    if( fillMode == 0 )

    {

        startPoint = VECTOR2D( polyPoints.front() );

        for( polyIterator = polyPoints.begin(); polyIterator != polyPoints.end(); polyIterator++ )

        {

            // Find out all of polygons and then draw them
@@ -520,11 +528,17 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer ) 
            else

            {

                m_gal->DrawPolygon( corners );



                // Closing point for polyline

                corners.push_back( VECTOR2D( startPoint ) );

                m_gal->DrawPolyline( corners );

                startPoint = VECTOR2D( *( polyIterator + 1 ) );



                corners.clear();

            }

        }

    }

}





void PCB_PAINTER::draw( const DIMENSION* aDimension )