Eeschema: remove the run cvpcb menu entry from eeschema tools menu when running as stand alone.

Pcbnew: fixes a problem exporting to DSN where the layername for B_Cu provided to the *.DSN file was incorrect
This commit is contained in:
unknown 2015-06-18 15:29:26 +02:00 committed by jean-pierre charras
parent 6ff03b41fd
commit 1c8fd8b207
2 changed files with 13 additions and 11 deletions

View File

@ -465,12 +465,15 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
toolsMenu->AppendSeparator(); toolsMenu->AppendSeparator();
if( !Kiface().IsSingle() ) // only with a functional KIWAY, not single_top
{
// Run CvPcb // Run CvPcb
AddMenuItem( toolsMenu, AddMenuItem( toolsMenu,
ID_RUN_CVPCB, ID_RUN_CVPCB,
_( "A&ssign Component Footprint" ), _( "A&ssign Component Footprint" ),
_( "Run CvPcb" ), _( "Run CvPcb" ),
KiBitmap( cvpcb_xpm ) ); KiBitmap( cvpcb_xpm ) );
}
// Run Pcbnew // Run Pcbnew
AddMenuItem( toolsMenu, AddMenuItem( toolsMenu,

View File

@ -109,13 +109,12 @@ void SPECCTRA_DB::buildLayerMaps( BOARD* aBoard )
for( unsigned i = 0; i < pcbLayer2kicad.size(); ++i ) for( unsigned i = 0; i < pcbLayer2kicad.size(); ++i )
{ {
if( i < layerCount-1 ) LAYER_ID id = ( i < layerCount-1 ) ? ToLAYER_ID( i ) : B_Cu;
pcbLayer2kicad[i] = ToLAYER_ID( i );
else kicadLayer2pcb[i] = id;
pcbLayer2kicad[i] = B_Cu;
// save the specctra layer name in SPECCTRA_DB::layerIds for later. // save the specctra layer name in SPECCTRA_DB::layerIds for later.
layerIds.push_back( TO_UTF8( aBoard->GetLayerName( ToLAYER_ID( i ) ) ) ); layerIds.push_back( TO_UTF8( aBoard->GetLayerName( id ) ) );
} }
#endif #endif