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

Minor fixes in Gerber files, in file attribute for copper layers.

This commit is contained in:
jean-pierre charras 2014-07-01 21:20:38 +02:00
parent dc38c50258
commit 8a1fd49377
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common_plotGERBER_functions.cpp
View File

@ -104,7 +104,7 @@ bool GERBER_PLOTTER::StartPlot()
m_gerberUnitInch ? "inch" : "mm" ); m_gerberUnitInch ? "inch" : "mm" );
wxString Title = creator + wxT( " " ) + GetBuildVersion(); wxString Title = creator + wxT( " " ) + GetBuildVersion();
fprintf( outputFile, "G04 (created by %s) date %s*\n", fprintf( outputFile, "G04 Created by KiCad (%s) date %s*\n",
TO_UTF8( Title ), TO_UTF8( DateAndTime() ) ); TO_UTF8( Title ), TO_UTF8( DateAndTime() ) );
/* Mass parameter: unit = INCHES/MM */ /* Mass parameter: unit = INCHES/MM */

17
pcbnew/pcbplot.cpp
View File

@ -135,29 +135,22 @@ wxString GetGerberFileFunction( const BOARD *aBoard, LAYER_NUM aLayer )
break; break;
case Eco1_User: case Eco1_User:
case Eco2_User: attrib = wxString( wxT( "Other,ECO1" ) );
attrib = wxString::Format( wxT( "Other,ECO%d" ), aLayer - Eco1_User + 1 );
break; break;
case F_Cu: case Eco2_User:
attrib = wxString( wxT( "Copper,L1" ) ); attrib = wxString( wxT( "Other,ECO2" ) );
break; break;
case B_Cu: case B_Cu:
attrib = wxString::Format( wxT( "Copper,L%d" ), aBoard->GetCopperLayerCount() ); attrib = wxString::Format( wxT( "Copper,L%d" ), aBoard->GetCopperLayerCount() );
break; break;
case F_Cu:
default: default:
if( IsCopperLayer( aLayer ) ) if( IsCopperLayer( aLayer ) )
{ {
#if 0 // was: attrib = wxString::Format( wxT( "Copper,L%d" ), aLayer+1 );
// LAYER_N_2 is the first inner layer counting from the bottom; this
// must be converted to a 1-based number starting from the top
attrib = wxString::Format( wxT( "Copper,L%d" ),
aBoard->GetCopperLayerCount() - ( aLayer - LAYER_N_2 + 1 ) );
#else
attrib = wxString::Format( wxT( "Copper,L%d" ), aLayer );
#endif
} }
break; break;
} }