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

Fixed LAYER_NUM usage in the specctra code. 

A specctra layer is not a LAYER_NUM, so that's probably why it was difficult to use.
This commit is contained in:
Lorenzo Marcantonio 2013-05-05 12:11:30 +02:00
parent d00c83cde9
commit e5dae4b149
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/specctra.cpp
View File

@ -99,7 +99,7 @@ void SPECCTRA_DB::buildLayerMaps( BOARD* aBoard )
int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const
{ {
for( LAYER_NUM i=FIRST_LAYER; i<int(layerIds.size()); ++i ) for( int i=0; i < int(layerIds.size()); ++i )
{ {
if( 0 == aLayerName.compare( layerIds[i] ) ) if( 0 == aLayerName.compare( layerIds[i] ) )
return i; return i;

2
pcbnew/specctra.h
View File

@ -3743,7 +3743,7 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
* or delete it. * or delete it.
*/ */
PADSTACK* makeVia( int aCopperDiameter, int aDrillDiameter, PADSTACK* makeVia( int aCopperDiameter, int aDrillDiameter,
LAYER_NUM aTopLayer, LAYER_NUM aBotLayer ); int aTopLayer, int aBotLayer );
/** /**
* Function makeVia * Function makeVia

2
pcbnew/specctra_export.cpp
View File

@ -1851,7 +1851,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
wire->wire_type = T_protect; // @todo, this should be configurable wire->wire_type = T_protect; // @todo, this should be configurable
LAYER_NUM kiLayer = track->GetLayer(); LAYER_NUM kiLayer = track->GetLayer();
LAYER_NUM pcbLayer = kicadLayer2pcb[kiLayer]; int pcbLayer = kicadLayer2pcb[kiLayer];
path = new PATH( wire ); path = new PATH( wire );

2
pcbnew/specctra_import.cpp
View File

@ -224,7 +224,7 @@ static wxPoint mapPt( const POINT& aPoint, UNIT_RES* aResolution )
TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR ) TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR )
{ {
LAYER_NUM layerNdx = findLayerName( aPath->layer_id ); int layerNdx = findLayerName( aPath->layer_id );
if( layerNdx == -1 ) if( layerNdx == -1 )
{ {