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

More accurate rendering display of ZONE_CONTAINERs.

This commit is contained in:
Maciej Suminski 2013-04-17 12:30:21 +02:00
parent 71a1ad6ff5
commit 188ea1f59f
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcbnew/pcb_painter.cpp
View File

@ -495,33 +495,47 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer ) 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() ); COLOR4D fillColor = getLayerColor( aContainer->GetLayer(), aContainer->GetNet() );
std::vector<CPolyPt>::iterator polyIterator; std::vector<CPolyPt>::iterator polyIterator;
std::vector<CPolyPt> polyPoints = aContainer->GetFilledPolysList();
std::deque<VECTOR2D> corners; 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->SetFillColor( fillColor );
m_gal->SetStrokeColor( fillColor ); m_gal->SetStrokeColor( fillColor );
m_gal->SetIsFill( aContainer->IsFilled() ); m_gal->SetIsFill( !fillMode );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetLineWidth( aContainer->GetThermalReliefCopperBridge() / 2.0 ); m_gal->SetLineWidth( aContainer->GetThermalReliefCopperBridge() / 2.0 );
m_gal->SetLineCap( LINE_CAP_ROUND );
m_gal->SetLineJoin( LINE_JOIN_ROUND );
// FIXME implement hatch mode // FIXME implement hatch mode
for( polyIterator = polyPoints.begin(); polyIterator != polyPoints.end(); polyIterator++ ) if( fillMode == 0 )
{ {
// Find out all of polygons and then draw them startPoint = VECTOR2D( polyPoints.front() );
if( !polyIterator->end_contour ) for( polyIterator = polyPoints.begin(); polyIterator != polyPoints.end(); polyIterator++ )
{ {
corners.push_back( VECTOR2D( *polyIterator ) ); // Find out all of polygons and then draw them
} if( !polyIterator->end_contour )
else {
{ corners.push_back( VECTOR2D( *polyIterator ) );
m_gal->DrawPolygon( corners ); }
m_gal->DrawPolyline( corners ); else
corners.clear(); {
m_gal->DrawPolygon( corners );
// Closing point for polyline
corners.push_back( VECTOR2D( startPoint ) );
m_gal->DrawPolyline( corners );
startPoint = VECTOR2D( *( polyIterator + 1 ) );
corners.clear();
}
} }
} }
} }