BOARD::GetLayerName()

pcbnew/class_board_item.cpp

@@ -38,7 +38,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
 
     case TYPEMODULE:
         text << _( "Footprint" ) << wxT( " " ) << ( (MODULE*) item )->GetReference();
-        text << wxT( " (" ) << ReturnPcbLayerName( item->m_Layer ).Trim() << wxT( ")" );
+        text << wxT( " (" ) << aPcb->GetLayerName( item->m_Layer ).Trim() << wxT( ")" );
         break;
 
     case TYPEPAD:
@@ -48,15 +48,15 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         if ( (pad->m_Masque_Layer & ALL_CU_LAYERS) == ALL_CU_LAYERS )
             text << _("all copper layers");
         else if( (pad->m_Masque_Layer & CUIVRE_LAYER) == CUIVRE_LAYER )
-            text << _("copper layer");
+            text << aPcb->GetLayerName( COPPER_LAYER_N ).Trim();
         else if( (pad->m_Masque_Layer & CMP_LAYER) == CMP_LAYER )
-            text << _("cmp layer");
+            text << aPcb->GetLayerName( LAYER_CMP_N );
         else text << _("???");
         text << _( ") of " ) << ( (MODULE*) GetParent() )->GetReference();
         break;
 
     case TYPEDRAWSEGMENT:
-        text << _( "Pcb Graphic" ) << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim();  // @todo: extend text
+        text << _( "Pcb Graphic" ) << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim();  // @todo: extend text
         break;
 
     case TYPETEXTE:
@@ -65,7 +65,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
             text << ( (TEXTE_PCB*) item )->m_Text;
         else
             text += ( (TEXTE_PCB*) item )->m_Text.Left( 10 ) + wxT( ".." );
-        text << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim();
+        text << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim();
         break;
 
     case TYPETEXTEMODULE:
@@ -128,7 +128,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         }
 
         text << cp;
-        text << wxT( " (" ) << ReturnPcbLayerName( ((EDGE_MODULE*) item )->m_Layer ).Trim() << wxT( ")" );
+        text << wxT( " (" ) << aPcb->GetLayerName( ((EDGE_MODULE*) item )->m_Layer ).Trim() << wxT( ")" );
         text << _( " of " )
              << ( (MODULE*) GetParent() )->GetReference();
         break;
@@ -145,7 +145,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
             {
                 text << wxT( " [" ) << net->m_Netname << wxT( "]" );
             }
-            text << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim()
+            text << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim()
                  << wxT("  ") << _("Net:") << ((TRACK*)item)->GetNet()
                  << wxT("  ") << _("Length:") << valeur_param( (int) ((TRACK*)item)->GetLength(), txt );
         }
@@ -156,7 +156,8 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         {
             ZONE_CONTAINER* area = (ZONE_CONTAINER*) this;
             int ncont = area->m_Poly->GetContour(area->m_CornerSelection);
-        if ( ncont ) text << wxT(" ") << _("(Cutout)");
+            if( ncont )
+                text << wxT(" ") << _("(Cutout)");
         }
         text << wxT( " " );
         {
@@ -164,7 +165,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
             TimeStampText.Printf( wxT( "(%8.8X)" ), item->m_TimeStamp );
             text << TimeStampText;
         }
-        if ( ((ZONE_CONTAINER*) item)->GetNet() >= 0 )
+        if( ((ZONE_CONTAINER*) item)->GetNet() >= 0 )
         {
             net = aPcb->FindNet( ( (ZONE_CONTAINER*) item )->GetNet() );
             if( net )
@@ -177,7 +178,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
             text << wxT( " [" ) << ( (ZONE_CONTAINER*) item )->m_Netname << wxT( "]" );
             text << wxT(" <") << _("Not Found") << wxT(">");
         }
-        text << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim();
+        text << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim();
         break;
 
     case TYPEZONE:
@@ -193,7 +194,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         {
             text << wxT( " [" ) << net->m_Netname << wxT( "]" );
         }
-        text << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim();
+        text << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim();
         break;
 
     case TYPEVIA:
@@ -221,8 +222,8 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
                 int topLayer;
                 int botLayer;
                 via->ReturnLayerPair( &topLayer, &botLayer );
-                text << _( " on " ) << ReturnPcbLayerName( topLayer).Trim() << wxT(" <-> ")
-                    << ReturnPcbLayerName( botLayer ).Trim();
+                text << _( " on " ) << aPcb->GetLayerName( topLayer).Trim() << wxT(" <-> ")
+                    << aPcb->GetLayerName( botLayer ).Trim();
             }
         }
         break;
@@ -238,7 +239,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
 
     case TYPEMIRE:
         valeur_param( ((MIREPCB*)item)->m_Size, msg );
-        text << _( "Target" ) << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim()
+        text << _( "Target" ) << _( " on " ) << aPcb->GetLayerName( item->GetLayer() ).Trim()
             << wxT( " " ) << _( "size" ) << wxT( " " ) << msg
             ;
         break;

pcbnew/class_edge_mod.cpp

@@ -278,6 +278,10 @@ void EDGE_MODULE::Display_Infos( WinEDA_DrawFrame* frame )
     if( !module )
         return;
 
+    BOARD* board = (BOARD*) module->m_Parent;
+    if( !board )
+        return;
+
     frame->MsgPanel->EraseMsgBox();
 
     Affiche_1_Parametre( frame, 1, _( "Seg" ), wxEmptyString, DARKCYAN );
@@ -288,10 +292,9 @@ void EDGE_MODULE::Display_Infos( WinEDA_DrawFrame* frame )
 
     Affiche_1_Parametre( frame, 24, _( "TimeStamp" ), bufcar, BROWN );
 
-    Affiche_1_Parametre( frame, 34, _( "Mod Layer" ), ReturnPcbLayerName( module->GetLayer() ), RED );
+    Affiche_1_Parametre( frame, 34, _( "Mod Layer" ), board->GetLayerName( module->GetLayer() ), RED );
 
-    Affiche_1_Parametre( frame, 44, _( "Seg Layer" ),
-                         ReturnPcbLayerName( module->GetLayer() ), RED );
+    Affiche_1_Parametre( frame, 44, _( "Seg Layer" ), board->GetLayerName( module->GetLayer() ), RED );
 
     valeur_param( m_Width, bufcar );
     Affiche_1_Parametre( frame, 54, _( "Width" ), bufcar, BLUE );

pcbnew/class_module.cpp

@@ -1048,6 +1048,7 @@ void MODULE::Display_Infos( WinEDA_DrawFrame* frame )
     int      pos;
     bool     flag = FALSE;
     wxString msg;
+    BOARD*   board = (BOARD*) m_Parent;
 
     frame->MsgPanel->EraseMsgBox();    /* Effacement de la zone message */
     if( frame->m_Ident != PCB_FRAME )
@@ -1076,14 +1077,15 @@ void MODULE::Display_Infos( WinEDA_DrawFrame* frame )
     }
 
     pos += 12;
-    Affiche_1_Parametre( frame, pos, _( "Layer" ), ReturnPcbLayerName( m_Layer ), RED );
+    Affiche_1_Parametre( frame, pos, _( "Layer" ), board->GetLayerName( m_Layer ), RED );
 
     pos += 6;
     EDA_BaseStruct* PtStruct = m_Pads;
     nbpad = 0;
     while( PtStruct )
     {
-        nbpad++; PtStruct = PtStruct->Pnext;
+        nbpad++;
+        PtStruct = PtStruct->Pnext;
     }
 
     msg.Printf( wxT( "%d" ), nbpad );
@@ -1249,11 +1251,13 @@ SEARCH_RESULT MODULE::Visit( INSPECTOR* inspector, const void* testData,
  */
 void MODULE::Show( int nestLevel, std::ostream& os )
 {
+    BOARD*  board = (BOARD*) m_Parent;
+
     // for now, make it look like XML, expand on this later.
     NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() <<
         " ref=\"" << m_Reference->m_Text.mb_str() << '"' <<
         " value=\"" << m_Value->m_Text.mb_str()     << '"' <<
-        " layer=\"" << ReturnPcbLayerName(m_Layer,true).mb_str() << '"' <<
+        " layer=\"" << board->GetLayerName(m_Layer).mb_str() << '"' <<
         ">\n";
 
     NestedSpace( nestLevel+1, os ) <<

pcbnew/class_pad.cpp

@@ -853,7 +853,7 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
 /* Affiche en bas d'ecran les caract de la pastille demandee */
 {
     int      ii;
-    MODULE*  Module;
+    MODULE*  module;
     wxString Line;
     int      pos = 1;
 
@@ -874,10 +874,10 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
     frame->MsgPanel->EraseMsgBox();
 
     /* Recherche du module correspondant */
-    Module = (MODULE*) m_Parent;
-    if( Module )
+    module = (MODULE*) m_Parent;
+    if( module )
     {
-        wxString msg = Module->m_Reference->m_Text;
+        wxString msg = module->GetReference();
         Affiche_1_Parametre( frame, pos, _( "Module" ), msg, DARKCYAN );
         ReturnStringPadName( Line );
         pos += 8;
@@ -894,6 +894,7 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
 #endif
 
     wxString LayerInfo;
+
     ii = 0;
     if( m_Masque_Layer & CUIVRE_LAYER )
         ii = 2;
@@ -1002,7 +1003,7 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
     }
 
 
-    int module_orient = Module ? Module->m_Orient : 0;
+    int module_orient = module ? module->m_Orient : 0;
     if( module_orient )
         Line.Printf( wxT( "%3.1f(+%3.1f)" ),
                      (float) (m_Orient - module_orient) / 10, (float) module_orient / 10 );

pcbnew/class_track.cpp

@@ -750,6 +750,7 @@ void TRACK::Display_Infos( WinEDA_DrawFrame* frame )
 {
     wxString    msg;
     int         text_pos;
+    BOARD*      board = ((WinEDA_PcbFrame*)frame)->m_Pcb;
 
 #ifdef RATSNET_DEBUG
     DbgDisplayTrackInfos( this );
@@ -779,11 +780,12 @@ void TRACK::Display_Infos( WinEDA_DrawFrame* frame )
 
     /* Display NetName pour les segments de piste type cuivre */
     text_pos += 15;
+
     if(  Type() == TYPETRACK
          || Type() == TYPEZONE
          || Type() == TYPEVIA )
     {
-        EQUIPOT* equipot = ( (WinEDA_PcbFrame*) frame )->m_Pcb->FindNet( GetNet() );
+        EQUIPOT* equipot = board->FindNet( GetNet() );
 
         if( equipot )
             msg = equipot->m_Netname;
@@ -824,11 +826,11 @@ void TRACK::Display_Infos( WinEDA_DrawFrame* frame )
         int     top_layer, bottom_layer;
 
         Via->ReturnLayerPair( &top_layer, &bottom_layer );
-        msg = ReturnPcbLayerName( top_layer, TRUE ) + wxT( "/" )
-              + ReturnPcbLayerName( bottom_layer, TRUE );
+        msg = board->GetLayerName( top_layer ) + wxT( "/" )
+              + board->GetLayerName( bottom_layer );
     }
     else
-        msg = ReturnPcbLayerName( m_Layer );
+        msg = board->GetLayerName( m_Layer );
 
     text_pos += 5;
     Affiche_1_Parametre( frame, text_pos, _( "Layer" ), msg, BROWN );
@@ -978,13 +980,18 @@ void SEGVIA::Show( int nestLevel, std::ostream& os )
 
     int         topLayer;
     int         botLayer;
+    BOARD*      board = (BOARD*) m_Parent;
+
 
     ReturnLayerPair( &topLayer, &botLayer );
 
     NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() <<
-    " type=\"" << cp << '"' <<
-    " layers=\"" << ReturnPcbLayerName( topLayer ).Trim().mb_str() << ","
-                                 << ReturnPcbLayerName( botLayer ).Trim().mb_str() << '"' <<
+    " type=\"" << cp << '"';
+
+    if( board )
+        os << " layers=\"" << board->GetLayerName( topLayer ).Trim().mb_str() << ","
+                                 << board->GetLayerName( botLayer ).Trim().mb_str() << '"';
+    os <<
     " width=\"" << m_Width << '"' <<
     " drill=\"" << GetDrillValue() << '"' <<
     " netcode=\"" << GetNet() << "\">" <<