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

Fixed drawing of polygon segments (eg. microwave extension traces).

This commit is contained in:
Maciej Suminski 2013-07-31 11:36:46 +02:00
parent 544726e4f3
commit 8fda1d2264
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcbnew/pcb_painter.cpp
View File

@ -605,13 +605,11 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment ) void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment )
{ {
COLOR4D strokeColor = getLayerColor( aSegment->GetLayer(), 0, COLOR4D color = getLayerColor( aSegment->GetLayer(), 0, aSegment->ViewIsHighlighted() );
aSegment->ViewIsHighlighted() );
std::deque<VECTOR2D> pointsList;
m_gal->SetIsFill( false ); m_gal->SetIsFill( false );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetStrokeColor( strokeColor ); m_gal->SetStrokeColor( color );
m_gal->SetLineWidth( aSegment->GetWidth() ); m_gal->SetLineWidth( aSegment->GetWidth() );
switch( aSegment->GetShape() ) switch( aSegment->GetShape() )
@ -636,10 +634,29 @@ void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment )
break; break;
case S_POLYGON: case S_POLYGON:
{
std::deque<VECTOR2D> pointsList;
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
m_gal->SetFillColor( color );
m_gal->Save();
m_gal->Translate( VECTOR2D( aSegment->GetPosition() ) );
MODULE* module = aSegment->GetParentModule();
if( module )
{
m_gal->Rotate( -module->GetOrientation() * M_PI / 1800.0 );
}
std::copy( aSegment->GetPolyPoints().begin(), aSegment->GetPolyPoints().end(), std::copy( aSegment->GetPolyPoints().begin(), aSegment->GetPolyPoints().end(),
std::back_inserter( pointsList ) ); std::back_inserter( pointsList ) );
m_gal->DrawPolygon( pointsList ); m_gal->DrawPolygon( pointsList );
m_gal->Restore();
break; break;
}
case S_CURVE: case S_CURVE:
m_gal->DrawCurve( VECTOR2D( aSegment->GetStart() ), m_gal->DrawCurve( VECTOR2D( aSegment->GetStart() ),