Skip to content

K
kicad-source-mirror
Commit b62a69fc authored by dickelbeck's avatar dickelbeck
Browse files
Options

more amazing free software

parent e775cee9
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 76 deletions
pcbnew/specctra.h
View file @ b62a69fc
...@@ -1782,7 +1782,7 @@ public: ...@@ -1782,7 +1782,7 @@ public:
ELEM( T_placement, aParent ) ELEM( T_placement, aParent )
{ {
unit = 0; unit = 0;
flip_style = T_mirror_first; flip_style = T_NONE;
} }
~PLACEMENT() ~PLACEMENT()
...@@ -2712,42 +2712,51 @@ public: ...@@ -2712,42 +2712,51 @@ public:
} }
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError ) void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
{ {
out->Print( nestLevel, "(%s ", LEXER::GetTokenText( Type() ) );
if( shape ) if( shape )
shape->Format( out, nestLevel ); shape->Format( out, 0 );
if( net_id.size() ) if( net_id.size() )
{ {
const char* quote = out->GetQuoteChar( net_id.c_str() ); const char* quote = out->GetQuoteChar( net_id.c_str() );
out->Print( nestLevel, "(net %s%s%s)\n", out->Print( 0, "(net %s%s%s)",
quote, net_id.c_str(), quote ); quote, net_id.c_str(), quote );
} }
if( turret >= 0 ) if( turret >= 0 )
out->Print( nestLevel, "(turrent %d)\n", turret ); out->Print( 0, "(turrent %d)", turret );
if( type != T_NONE ) if( type != T_NONE )
out->Print( nestLevel, "(type %s)\n", LEXER::GetTokenText( type ) ); out->Print( 0, "(type %s)", LEXER::GetTokenText( type ) );
if( attr != T_NONE ) if( attr != T_NONE )
out->Print( nestLevel, "(attr %s)\n", LEXER::GetTokenText( attr ) ); out->Print( 0, "(attr %s)", LEXER::GetTokenText( attr ) );
if( shield.size() ) if( shield.size() )
{ {
const char* quote = out->GetQuoteChar( shield.c_str() ); const char* quote = out->GetQuoteChar( shield.c_str() );
out->Print( nestLevel, "(shield %s%s%s)\n", out->Print( 0, "(shield %s%s%s)",
quote, shield.c_str(), quote ); quote, shield.c_str(), quote );
} }
if( windows.size() )
{
out->Print( 0, "\n" );
for( WINDOWS::iterator i=windows.begin(); i!=windows.end(); ++i ) for( WINDOWS::iterator i=windows.begin(); i!=windows.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel+1 );
}
if( connect ) if( connect )
connect->Format( out, nestLevel ); connect->Format( out, 0 );
if( supply ) if( supply )
out->Print( nestLevel, "(supply)\n" ); out->Print( 0, "(supply)" );
out->Print( 0, ")\n" );
} }
}; };
typedef boost::ptr_vector<WIRE> WIRES; typedef boost::ptr_vector<WIRE> WIRES;
...@@ -3407,8 +3416,13 @@ class SPECCTRA_DB : public OUTPUTFORMATTER ...@@ -3407,8 +3416,13 @@ class SPECCTRA_DB : public OUTPUTFORMATTER
STRINGFORMATTER sf; STRINGFORMATTER sf;
// FromBOARD() uses this STRINGS layerIds; ///< indexed by PCB layer number
STRINGS layerIds;
/// maps BOARD layer number to PCB layer numbers
std::vector<int> kicadLayer2pcb;
/// maps PCB layer number to BOARD layer numbers
std::vector<int> pcbLayer2kicad;
/** /**
......
pcbnew/specctra_export.cpp
View file @ b62a69fc
...@@ -215,9 +215,8 @@ static int Pad_list_Sort_by_Shapes( const void* refptr, const void* objptr ) ...@@ -215,9 +215,8 @@ static int Pad_list_Sort_by_Shapes( const void* refptr, const void* objptr )
/*********************************************************************/ /*
static int Track_list_Sort_by_Netcode( const void* o1, const void* o2 ) static int Track_list_Sort_by_Netcode( const void* o1, const void* o2 )
/*********************************************************************/
{ {
TRACK* t1 = *(TRACK**) o1; TRACK* t1 = *(TRACK**) o1;
TRACK* t2 = *(TRACK**) o2; TRACK* t2 = *(TRACK**) o2;
...@@ -232,6 +231,7 @@ static int Track_list_Sort_by_Netcode( const void* o1, const void* o2 ) ...@@ -232,6 +231,7 @@ static int Track_list_Sort_by_Netcode( const void* o1, const void* o2 )
return diff; // zero here return diff; // zero here
} }
*/
/** /**
...@@ -327,13 +327,11 @@ void SPECCTRA_DB::makePADSTACKs( BOARD* aBoard, TYPE_COLLECTOR& aPads ) ...@@ -327,13 +327,11 @@ void SPECCTRA_DB::makePADSTACKs( BOARD* aBoard, TYPE_COLLECTOR& aPads )
D_PAD* old_pad = NULL; D_PAD* old_pad = NULL;
#define COPPER_LAYERS 2 // top and bottom
for( int i=0; i<aPads.GetCount(); ++i ) for( int i=0; i<aPads.GetCount(); ++i )
{ {
D_PAD* pad = (D_PAD*) aPads[i]; D_PAD* pad = (D_PAD*) aPads[i];
bool doLayer[COPPER_LAYERS] = { bool doLayer[2] = { // top and bottom layers only
pad->IsOnLayer( LAYER_CMP_N ), pad->IsOnLayer( LAYER_CMP_N ),
pad->IsOnLayer( COPPER_LAYER_N ) pad->IsOnLayer( COPPER_LAYER_N )
}; };
...@@ -373,8 +371,11 @@ void SPECCTRA_DB::makePADSTACKs( BOARD* aBoard, TYPE_COLLECTOR& aPads ) ...@@ -373,8 +371,11 @@ void SPECCTRA_DB::makePADSTACKs( BOARD* aBoard, TYPE_COLLECTOR& aPads )
POINT padOffset( scale(pad->m_Offset.x), -scale(pad->m_Offset.y) ); POINT padOffset( scale(pad->m_Offset.x), -scale(pad->m_Offset.y) );
// for now, we will report only one layer for the pads. SMD pads are reported on the // For now, we will report only one layer for the pads. SMD pads are reported on the
// top layer, and through hole are reported on <reserved_layer_name> "signal" // top layer, and through hole are reported on <reserved_layer_name> "signal".
// We could do better if there was actually a "layer type" field within
// Kicad which would hold one of: T_signal, T_power, T_mixed, T_jumper
// See bottom of page 74 of the SECCTRA Design Language Reference, May 2000.
int reportedLayers = 1; // how many layers are reported. int reportedLayers = 1; // how many layers are reported.
doLayer[0] = true; doLayer[0] = true;
...@@ -681,12 +682,19 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) ...@@ -681,12 +682,19 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
int layerCount = aBoard->GetCopperLayerCount(); int layerCount = aBoard->GetCopperLayerCount();
layerIds.clear(); layerIds.clear();
pcbLayer2kicad.resize( layerCount );
kicadLayer2pcb.resize( LAYER_CMP_N+1 );
for( int ndx=layerCount-1; ndx >= 0; --ndx ) for( int kiNdx=layerCount-1, pcbNdx=0; kiNdx >= 0; --kiNdx, ++pcbNdx )
{ {
int kilayer = kiNdx>0 && kiNdx==layerCount-1 ? LAYER_CMP_N : kiNdx;
// establish bi-directional mapping between kicad's BOARD layer and PCB layer
pcbLayer2kicad[pcbNdx] = kilayer;
kicadLayer2pcb[kilayer] = pcbNdx;
// 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( CONV_TO_UTF8( layerIds.push_back( CONV_TO_UTF8( aBoard->GetLayerName( kilayer ) ) );
aBoard->GetLayerName( ndx>0 && ndx==layerCount-1 ? LAYER_CMP_N : ndx )));
LAYER* layer = new LAYER( pcb->structure ); LAYER* layer = new LAYER( pcb->structure );
pcb->structure->layers.push_back( layer ); pcb->structure->layers.push_back( layer );
...@@ -699,10 +707,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) ...@@ -699,10 +707,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
// for now, report on only the top and bottom layers with respect to the copper // for now, report on only the top and bottom layers with respect to the copper
// within a pad's padstack. this is usually correct, but not rigorous. We could do // within a pad's padstack. this is usually correct, but not rigorous.
// better if there was actually a "layer type" field within Kicad which would
// hold one of: T_signal, T_power, T_mixed, T_jumper
// See bottom of page 74 of the SECCTRA Design Language Reference, May 2000.
// a space in a quoted token is NOT a terminator, true establishes this. // a space in a quoted token is NOT a terminator, true establishes this.
pcb->parser->space_in_quoted_tokens = true; pcb->parser->space_in_quoted_tokens = true;
...@@ -805,7 +810,49 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) ...@@ -805,7 +810,49 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
} }
//-----<zone containers become planes>-------------------------------------------- //-----<rules>--------------------------------------------------------
{
// put out these rules, the user can then edit them with a text editor
char rule[80]; // padstack name builder
int curTrackWidth = aBoard->m_BoardSettings->m_CurrentTrackWidth;
int curTrackClear = aBoard->m_BoardSettings->m_TrackClearence;
double clearance = scale(curTrackClear);
STRINGS& rules = pcb->structure->rules->rules;
sprintf( rule, "(width %.6g)", scale( curTrackWidth ) );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g)", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type pad_to_turn_gap))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type smd_to_turn_gap))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type via_via))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type via_smd))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type via_pin))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type pin_pin))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type smd_pin))", clearance );
rules.push_back( rule );
sprintf( rule, "(clearance %.6g (type smd_smd))", clearance );
rules.push_back( rule );
}
//-----<zone containers become planes>--------------------------------
{ {
static const KICAD_T scanZONEs[] = { TYPEZONE_CONTAINER, EOT }; static const KICAD_T scanZONEs[] = { TYPEZONE_CONTAINER, EOT };
items.Collect( aBoard, scanZONEs ); items.Collect( aBoard, scanZONEs );
...@@ -958,19 +1005,21 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) ...@@ -958,19 +1005,21 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
//-----<create the wires from tracks>----------------------------------- //-----<create the wires from tracks>-----------------------------------
{ {
#if 0
// export all of them for now, later we'll decide what controls we need // export all of them for now, later we'll decide what controls we need
// on this. // on this.
static KICAD_T scanTRACKs[] = { TYPETRACK, TYPEVIA, EOT }; static KICAD_T scanTRACKs[] = { TYPETRACK, EOT };
items.Collect( aBoard, scanTRACKs ); items.Collect( aBoard, scanTRACKs );
/*
if( items.GetCount() ) if( items.GetCount() )
qsort( (void*) items.BasePtr(), items.GetCount(), qsort( (void*) items.BasePtr(), items.GetCount(),
sizeof(TRACK*), Track_list_Sort_by_Netcode ); sizeof(TRACK*), Track_list_Sort_by_Netcode );
*/
std::string netname;
WIRING* wiring = pcb->wiring; WIRING* wiring = pcb->wiring;
WIRE* wire; PATH* path = 0;
int old_netcode = -1; int old_netcode = -1;
int old_width = -1; int old_width = -1;
...@@ -978,55 +1027,49 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) ...@@ -978,55 +1027,49 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
for( int i=0; i<items.GetCount(); ++i ) for( int i=0; i<items.GetCount(); ++i )
{ {
TRACK* track = (TRACK*) items[i]; // torv == track or via TRACK* track = (TRACK*) items[i];
if( track->GetNet() == 0 ) if( track->GetNet() == 0 )
continue; continue;
if( old_netcode != track->GetNet()
|| old_width != track->m_Width
|| old_layer != track->GetLayer()
|| (path && path->points.back() != mapPt(track->m_Start) )
)
{
old_width = track->m_Width;
old_layer = track->GetLayer();
if( old_netcode != track->GetNet() ) if( old_netcode != track->GetNet() )
{ {
old_netcode = track->GetNet(); old_netcode = track->GetNet();
EQUIPOT* equipot = aBoard->FindNet( track->GetNet() ); EQUIPOT* equipot = aBoard->FindNet( track->GetNet() );
wxASSERT( equipot ); wxASSERT( equipot );
netname = CONV_TO_UTF8( equipot->m_Netname );
}
wire = new WIRE( wiring ); WIRE* wire = new WIRE( wiring );
wiring->wires.push_back( wire ); wiring->wires.push_back( wire );
wire->net_id = netname;
wire->net_id = CONV_TO_UTF8( equipot->m_Netname ); int kiLayer = track->GetLayer();
} int pcbLayer = kicadLayer2pcb[kiLayer];
if( old_width != track->m_Width ) path = new PATH( wire );
{ wire->SetShape( path );
old_width = track->m_Width;
wire = new WIRE( wiring );
wiring.wires.push_back( wire );
wire->net_id = CONV_TO_UTF8( equipot->m_NetName ); path->layer_id = layerIds[pcbLayer];
} path->aperture_width = scale( old_width );
if( (track->Type() == TYPETRACK) || (track->Type() == TYPEZONE) ) path->AppendPoint( mapPt( track->m_Start ) );
{
if( old_layer != track->GetLayer() )
{
old_layer = track->GetLayer();
fprintf( file, "LAYER %s\n",
CONV_TO_UTF8( GenCAD_Layer_Name[track->GetLayer() & 0x1F] ) );
} }
fprintf( file, "LINE %d %d %d %d\n", path->AppendPoint( mapPt( track->m_End ) );
mapXto( track->m_Start.x ), mapYto( track->m_Start.y ),
mapXto( track->m_End.x ), mapYto( track->m_End.y ) );
}
if( track->Type() == TYPEVIA )
{
fprintf( file, "VIA viapad%d %d %d ALL %d via%d\n",
track->m_Width,
mapXto( track->m_Start.x ), mapYto( track->m_Start.y ),
g_DesignSettings.m_ViaDrill, vianum++ );
}
} }
#endif
// @todo vias here.
} }
//-----<restore MODULEs>------------------------------------------------ //-----<restore MODULEs>------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment