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

Fixed minor bugs introduced with outline mode display for module texts and edges.

This commit is contained in:
Maciej Suminski 2014-07-09 15:10:32 +02:00
parent 1495429f68
commit 242d9812eb
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/pcb_painter.cpp
View File

@ -627,6 +627,7 @@ void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment, int aLayer )
{ {
const COLOR4D& color = m_pcbSettings.GetColor( aSegment, aSegment->GetLayer() ); const COLOR4D& color = m_pcbSettings.GetColor( aSegment, aSegment->GetLayer() );
m_gal->SetIsFill( false );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
@ -634,14 +635,11 @@ void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment, int aLayer )
{ {
// Outline mode // Outline mode
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth ); m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
m_gal->SetIsFill( false );
} }
else else
{ {
// Filled mode // Filled mode
m_gal->SetLineWidth( aSegment->GetWidth() ); m_gal->SetLineWidth( aSegment->GetWidth() );
m_gal->SetFillColor( color );
m_gal->SetIsFill( true );
} }
switch( aSegment->GetShape() ) switch( aSegment->GetShape() )
@ -725,16 +723,15 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
{ {
// Outline mode // Outline mode
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth ); m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
m_gal->SetIsFill( false );
} }
else else
{ {
// Filled mode // Filled mode
m_gal->SetLineWidth( aText->GetThickness() ); m_gal->SetLineWidth( aText->GetThickness() );
m_gal->SetFillColor( color );
m_gal->SetIsFill( true );
} }
m_gal->SetIsFill( false );
m_gal->SetIsStroke( true );
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
m_gal->SetTextAttributes( aText ); m_gal->SetTextAttributes( aText );
m_gal->StrokeText( aText->GetText(), position, orientation ); m_gal->StrokeText( aText->GetText(), position, orientation );
@ -754,16 +751,15 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
{ {
// Outline mode // Outline mode
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth ); m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
m_gal->SetIsFill( false );
} }
else else
{ {
// Filled mode // Filled mode
m_gal->SetLineWidth( aText->GetThickness() ); m_gal->SetLineWidth( aText->GetThickness() );
m_gal->SetFillColor( color );
m_gal->SetIsFill( true );
} }
m_gal->SetIsFill( false );
m_gal->SetIsStroke( true );
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
m_gal->SetTextAttributes( aText ); m_gal->SetTextAttributes( aText );
m_gal->StrokeText( aText->GetText(), position, orientation ); m_gal->StrokeText( aText->GetText(), position, orientation );