pcbnew: draw net labels on vias [wip]

include/layers_id_colors_and_visibility.h

@@ -153,6 +153,7 @@ enum NETNAMES_LAYER_ID: int
     LAYER_PAD_FR_NETNAMES,
     LAYER_PAD_BK_NETNAMES,
     LAYER_PADS_NETNAMES,
+    LAYER_VIAS_NETNAMES,
 
     NETNAMES_LAYER_ID_END
 };
@@ -750,6 +751,7 @@ inline int GetNetnameLayer( int aLayer )
         return LAYER_PAD_FR_NETNAMES;
     else if( aLayer == LAYER_PAD_BK )
         return LAYER_PAD_BK_NETNAMES;
+    // fixme :via names
 
     // Fallback
     return Cmts_User;

pcbnew/pcb_painter.cpp

@@ -393,6 +393,64 @@ void PCB_PAINTER::draw( const VIA* aVia, int aLayer )
     VECTOR2D center( aVia->GetStart() );
     double   radius = 0.0;
 
+    // Only draw the via if at least one of the layers it crosses is being displayed
+    BOARD*  brd =  aVia->GetBoard( );
+    if( !( brd->GetVisibleLayers() & aVia->GetLayerSet() ).any() )
+        return;
+
+        // Draw description layer
+        if( IsNetnameLayer( aLayer ) )
+        {
+            VECTOR2D position( center );
+
+            // Is anything that we can display enabled?
+            if( m_pcbSettings.m_netNamesOnVias )
+            {
+                bool displayNetname = ( !aVia->GetNetname().empty() );
+                double maxSize = PCB_RENDER_SETTINGS::MAX_FONT_SIZE;
+                double size = aVia->GetWidth();
+
+                // Font size limits
+                if( size > maxSize )
+                    size = maxSize;
+
+                m_gal->Save();
+                m_gal->Translate( position );
+
+                // Default font settings
+                m_gal->SetHorizontalJustify( GR_TEXT_HJUSTIFY_CENTER );
+                m_gal->SetVerticalJustify( GR_TEXT_VJUSTIFY_CENTER );
+                m_gal->SetFontBold( false );
+                m_gal->SetFontItalic( false );
+                m_gal->SetTextMirrored( false );
+                m_gal->SetStrokeColor( m_pcbSettings.GetColor( NULL, aLayer ) );
+                m_gal->SetIsStroke( true );
+                m_gal->SetIsFill( false );
+
+                // Set the text position to the pad shape position (the pad position is not the best place)
+                VECTOR2D textpos( 0.0, 0.0 );
+
+                if( displayNetname )
+                {
+                    // calculate the size of net name text:
+                    double tsize = 1.5 * size / aVia->GetShortNetname().Length();
+                    tsize = std::min( tsize, size );
+                    // Use a smaller text size to handle interline, pen size..
+                    tsize *= 0.7;
+                    VECTOR2D namesize( tsize, tsize );
+
+                    m_gal->SetGlyphSize( namesize );
+                    m_gal->SetLineWidth( namesize.x / 12.0 );
+                    m_gal->BitmapText( aVia->GetShortNetname(), textpos, 0.0 );
+                }
+
+
+                m_gal->Restore();
+            }
+            return;
+        }
+
+
     // Choose drawing settings depending on if we are drawing via's pad or hole
     if( aLayer == LAYER_VIAS_HOLES )
         radius = aVia->GetDrillValue() / 2.0;

pcbnew/pcb_painter.h

@@ -145,6 +145,9 @@ protected:
     ///> Flag determining if net names should be visible for tracks
     bool    m_netNamesOnTracks;
 
+    ///> Flag determining if net names should be visible for vias
+    bool    m_netNamesOnVias = true;
+
     ///> Maximum font size for netnames (and other dynamically shown strings)
     static const double MAX_FONT_SIZE;
 
@@ -208,4 +211,3 @@ protected:
 } // namespace KIGFX
 
 #endif /* __CLASS_PAINTER_H */
-