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

Minor changes.

This commit is contained in:
Maciej Suminski 2014-02-03 13:26:25 +01:00
parent 864c86062d
commit 2fe85cf43d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/pcb_painter.cpp
View File

@ -261,13 +261,14 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
VECTOR2D start( aTrack->GetStart() ); VECTOR2D start( aTrack->GetStart() );
VECTOR2D end( aTrack->GetEnd() ); VECTOR2D end( aTrack->GetEnd() );
int width = aTrack->GetWidth(); int width = aTrack->GetWidth();
int netNumber = aTrack->GetNet();
COLOR4D color; COLOR4D color;
if( m_pcbSettings->m_netNamesOnTracks && IsNetnameLayer( aLayer ) ) if( m_pcbSettings->m_netNamesOnTracks && IsNetnameLayer( aLayer ) )
{ {
int netCode = aTrack->GetNet();
// If there is a net name - display it on the track // If there is a net name - display it on the track
if( netNumber > 0 ) if( netCode > 0 )
{ {
VECTOR2D line = ( end - start ); VECTOR2D line = ( end - start );
double length = line.EuclideanNorm(); double length = line.EuclideanNorm();
@ -276,11 +277,11 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
if( length < 10 * width ) if( length < 10 * width )
return; return;
NETINFO_ITEM* net = ( (BOARD*) aTrack->GetParent() )->FindNet( netNumber ); NETINFO_ITEM* net = ( (BOARD*) aTrack->GetParent() )->FindNet( netCode );
if( !net ) if( !net )
return; return;
std::wstring netName = std::wstring( net->GetShortNetname().wc_str() ); wxString netName = net->GetShortNetname();
VECTOR2D textPosition = start + line / 2.0; // center of the track VECTOR2D textPosition = start + line / 2.0; // center of the track
double textOrientation = -atan( line.y / line.x ); double textOrientation = -atan( line.y / line.x );
double textSize = std::min( static_cast<double>( width ), length / netName.length() ); double textSize = std::min( static_cast<double>( width ), length / netName.length() );
@ -304,7 +305,7 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
m_gal->StrokeText( netName, textPosition, textOrientation ); m_gal->StrokeText( netName, textPosition, textOrientation );
} }
} }
else if( IsCopperLayer( aLayer )) else if( IsCopperLayer( aLayer ) )
{ {
// Draw a regular track // Draw a regular track
color = m_pcbSettings->GetColor( aTrack, aLayer ); color = m_pcbSettings->GetColor( aTrack, aLayer );

1
pcbnew/pcb_painter.h
View File

@ -114,6 +114,7 @@ protected:
///> Colors for all layers (darkened) ///> Colors for all layers (darkened)
COLOR4D m_layerColorsDark[TOTAL_LAYER_COUNT]; COLOR4D m_layerColorsDark[TOTAL_LAYER_COUNT];
///> Flag determining if items on a given layer should be drawn as an outline or a full item
bool m_sketchModeSelect[TOTAL_LAYER_COUNT]; bool m_sketchModeSelect[TOTAL_LAYER_COUNT];
///> Flag determining if pad numbers should be visible ///> Flag determining if pad numbers should be visible