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

Opengl display: fix incorrect text size of pad num and pad netname.

This commit is contained in:
jean-pierre charras 2013-11-03 15:06:16 +01:00
parent 1e9cbe8055
commit e9f41a3b98
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pcbnew/pcb_painter.cpp
View File

@ -378,6 +378,7 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
double orientation = aPad->GetOrientation(); double orientation = aPad->GetOrientation();
NORMALIZE_ANGLE_90( orientation ); // do not display descriptions upside down NORMALIZE_ANGLE_90( orientation ); // do not display descriptions upside down
orientation = orientation * M_PI / 1800.0; orientation = orientation * M_PI / 1800.0;
wxString buffer;
// Draw description layer // Draw description layer
if( IsNetnameLayer( aLayer ) ) if( IsNetnameLayer( aLayer ) )
@ -387,32 +388,31 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
{ {
bool displayNetname = ( m_pcbSettings->m_netNamesOnPads && bool displayNetname = ( m_pcbSettings->m_netNamesOnPads &&
!aPad->GetNetname().empty() ); !aPad->GetNetname().empty() );
size = VECTOR2D( aPad->GetSize() / 2 ); VECTOR2D padsize = VECTOR2D( aPad->GetSize() );
size = padsize;
double scale = m_gal->GetZoomFactor(); double scale = m_gal->GetZoomFactor();
double maxSize = PCB_RENDER_SETTINGS::MAX_FONT_SIZE / scale; double maxSize = PCB_RENDER_SETTINGS::MAX_FONT_SIZE;
// Font size limits
if( size.x > maxSize )
size.x = maxSize;
if( size.y > maxSize )
size.y = maxSize;
// Keep the size ratio for the font, but make it smaller // Keep the size ratio for the font, but make it smaller
if( size.x < size.y ) if( padsize.x < padsize.y )
{ {
orientation -= M_PI / 2.0; orientation -= M_PI / 2.0;
size.y = size.x * 4.0 / 3.0; size.y = size.x;
} }
else if( size.x == size.y ) else if( padsize.x == padsize.y )
{ {
// If the text is displayed on a symmetrical pad, do not rotate it // If the text is displayed on a symmetrical pad, do not rotate it
orientation = 0.0; orientation = 0.0;
} }
else else
{ {
size.x = size.y * 3.0 / 4.0; size.x = size.y;
} }
// Font size limits
if( size.x > maxSize )
size.x = size.y = maxSize;
m_gal->Save(); m_gal->Save();
m_gal->Translate( position ); m_gal->Translate( position );
m_gal->Rotate( -orientation ); m_gal->Rotate( -orientation );
@ -433,36 +433,51 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
else else
m_gal->SetStrokeColor( labelColor ); m_gal->SetStrokeColor( labelColor );
VECTOR2D textpos( 0.0, 0.0);
if( displayNetname && m_pcbSettings->m_padNumbers ) if( displayNetname && m_pcbSettings->m_padNumbers )
{ {
m_gal->SetHorizontalJustify( GR_TEXT_HJUSTIFY_CENTER );
m_gal->SetVerticalJustify( GR_TEXT_VJUSTIFY_CENTER );
// Divide the space, when both pad numbers and netnames are enabled // Divide the space, when both pad numbers and netnames are enabled
size = size / 2.0; size = size / 2.0;
m_gal->SetGlyphSize( size ); aPad->ReturnStringPadName( buffer );
m_gal->SetLineWidth( size.y / 8.0 ); VECTOR2D numsize = size / buffer.Length();
VECTOR2D namesize = size / aPad->GetShortNetname().Length();
m_gal->StrokeText( std::string( aPad->GetNetname().mb_str() ), textpos.y = size.y / 2.0;
VECTOR2D( 0.0, size.y ), 0.0 ); m_gal->SetGlyphSize( namesize );
m_gal->SetLineWidth( namesize.y / 8.0 );
m_gal->StrokeText( std::string( aPad->GetShortNetname().mb_str() ),
textpos, 0.0 );
textpos.y = -size.y / 2.0;
m_gal->SetGlyphSize( numsize );
m_gal->SetLineWidth( numsize.y / 8.0 );
m_gal->StrokeText( std::string( aPad->GetPadName().mb_str() ), m_gal->StrokeText( std::string( aPad->GetPadName().mb_str() ),
VECTOR2D( 0.0, -size.y / 2.0 ), 0.0 ); textpos, 0.0 );
} }
else else
{ {
// There is only one thing to display // There is only one thing to display
if( displayNetname ) if( displayNetname )
{ {
m_gal->SetGlyphSize( size / 2.0 ); VECTOR2D namesize = size / aPad->GetShortNetname().Length();
m_gal->SetLineWidth( size.y / 12.0 ); m_gal->SetGlyphSize( namesize / 2.0 );
m_gal->StrokeText( std::string( aPad->GetNetname().mb_str() ), m_gal->SetLineWidth( namesize.y / 8.0 );
VECTOR2D( 0.0, 0.0 ), 0.0 ); m_gal->StrokeText( std::string( aPad->GetShortNetname().mb_str() ),
textpos, 0.0 );
} }
if( m_pcbSettings->m_padNumbers ) if( m_pcbSettings->m_padNumbers )
{ {
m_gal->SetGlyphSize( size ); aPad->ReturnStringPadName( buffer );
m_gal->SetLineWidth( size.y / 10.0 ); VECTOR2D numsize = size / 2 / buffer.Length();
m_gal->SetGlyphSize( numsize );
m_gal->SetLineWidth( numsize.y / 8.0 );
m_gal->StrokeText( std::string( aPad->GetPadName().mb_str() ), m_gal->StrokeText( std::string( aPad->GetPadName().mb_str() ),
VECTOR2D( 0.0, 0.0 ), 0.0 ); textpos, 0.0 );
} }
} }
@ -860,4 +875,4 @@ void PCB_PAINTER::draw( const PCB_TARGET* aTarget )
} }
const double PCB_RENDER_SETTINGS::MAX_FONT_SIZE = 100000000; const double PCB_RENDER_SETTINGS::MAX_FONT_SIZE = Millimeter2iu( 10.0 );