fix export_gencad.cpp

include/layers_id_colors_and_visibility.h

 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
+ * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
  *
@@ -106,7 +107,7 @@ enum LAYER_ID
     Edge_Cuts,
     Margin,
 
-    F_CrtYd,        // CrtYd & Body are footprint only
+    F_CrtYd,        // CrtYd & Fab are footprint only
     B_CrtYd,
     F_Fab,
     B_Fab,

pcbnew/class_board.cpp

@@ -323,11 +323,8 @@ bool BOARD::SetLayer( LAYER_ID aIndex, const LAYER& aLayer )
 }
 
 
-wxString BOARD::GetLayerName( LAYER_ID aLayer ) const
+const wxString BOARD::GetLayerName( LAYER_ID aLayer ) const
 {
-    if( !IsPcbLayer( aLayer ) )
-        return wxEmptyString;
-
     // All layer names are stored in the BOARD.
     if( IsLayerEnabled( aLayer ) )
     {

pcbnew/class_board.h

@@ -644,7 +644,7 @@ public:
      * @return wxString -   the layer name, which for copper layers may
      *                      be custom, else standard.
      */
-    wxString GetLayerName( LAYER_ID aLayer ) const;
+    const wxString GetLayerName( LAYER_ID aLayer ) const;
 
     /**
      * Function SetLayerName

pcbnew/dialogs/dialog_copper_zones.cpp

@@ -262,7 +262,9 @@ void DIALOG_COPPER_ZONE::initDialog()
 
         m_LayerId.push_back( layer );
 
-        msg = board->GetLayerName( layer ).Trim();
+        msg = board->GetLayerName( layer );
+
+        msg.Trim();
 
         EDA_COLOR_T layerColor = board->GetLayerColor( layer );
 

pcbnew/pcb_plot_params.cpp

@@ -129,13 +129,10 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
     aFormatter->Print( aNestLevel+1, "(%s 0x%s)\n", getTokenName( T_layerselection ),
                        m_layerSelection.FmtHex().c_str() );
 
-   aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberextensions ),
-                       m_useGerberExtensions ? trueStr : falseStr );
-
     aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberextensions ),
                        m_useGerberExtensions ? trueStr : falseStr );
 
-   if( m_useGerberAttributes )  // save this option only if active,
+    if( m_useGerberAttributes )  // save this option only if active,
                                 // to avoid incompatibility with older Pcbnew version
         aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberattributes ), trueStr );
 
@@ -153,10 +150,12 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
                        m_useAuxOrigin ? trueStr : falseStr );
     aFormatter->Print( aNestLevel+1, "(%s %d)\n", getTokenName( T_hpglpennumber ),
                        m_HPGLPenNum );
-//  Obsolete parameter, pen speed is no more managed, because hpgl format
-// is now an export format, and for this, pen speed has no meaning
-//    aFormatter->Print( aNestLevel+1, "(%s %d)\n", getTokenName( T_hpglpenspeed ),
-//                       m_HPGLPenSpeed );
+
+    //  Obsolete parameter, pen speed is no more managed, because hpgl format
+    // is now an export format, and for this, pen speed has no meaning
+    //    aFormatter->Print( aNestLevel+1, "(%s %d)\n", getTokenName( T_hpglpenspeed ),
+    //                       m_HPGLPenSpeed );
+
     aFormatter->Print( aNestLevel+1, "(%s %d)\n", getTokenName( T_hpglpenspeed ),
                        m_HPGLPenSpeed );
     aFormatter->Print( aNestLevel+1, "(%s %d)\n", getTokenName( T_hpglpendiameter ),

pcbnew/zones_non_copper_type_functions.cpp

@@ -105,7 +105,9 @@ void DIALOG_NON_COPPER_ZONES_EDITOR::Init()
     {
         LAYER_ID layer = *seq;
 
-        wxString msg = m_Parent->GetBoard()->GetLayerName( layer ).Trim();
+        wxString msg = m_Parent->GetBoard()->GetLayerName( layer );
+
+        msg.Trim();
 
         m_LayerSelectionCtrl->InsertItems( 1, &msg, ii );