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

Enum SPICE_FIELD

This commit is contained in:
Maciej Suminski 2016-08-11 14:41:38 +02:00
parent 01f40e258c
commit 3a9dcca32f
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/netlist_exporters/netlist_exporter_pspice.cpp
View File

@ -128,10 +128,12 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
} }
wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField, wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
SCH_COMPONENT* aComponent, unsigned aCtl ) SCH_COMPONENT* aComponent, unsigned aCtl )
{ {
if( aField == "Spice_Primitive" ) switch( aField )
{
case SPICE_PRIMITIVE:
{ {
const wxString& refName = aComponent->GetField( REFERENCE )->GetText(); const wxString& refName = aComponent->GetField( REFERENCE )->GetText();
@ -140,9 +142,10 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
return wxString( "X" ); return wxString( "X" );
else else
return refName.GetChar( 0 ); return refName.GetChar( 0 );
break;
} }
if( aField == "Spice_Model" ) case SPICE_MODEL:
{ {
wxChar prim = aComponent->GetField( REFERENCE )->GetText().GetChar( 0 ); wxChar prim = aComponent->GetField( REFERENCE )->GetText().GetChar( 0 );
wxString value = aComponent->GetField( VALUE )->GetText(); wxString value = aComponent->GetField( VALUE )->GetText();
@ -173,14 +176,14 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
} }
return value; return value;
break;
} }
if( aField == "Spice_Netlist_Enabled" ) case SPICE_ENABLED:
{
return wxString( "Y" ); return wxString( "Y" );
} break;
if( aField == "Spice_Node_Sequence" ) case SPICE_NODE_SEQUENCE:
{ {
wxString nodeSeq; wxString nodeSeq;
std::vector<LIB_PIN*> pins; std::vector<LIB_PIN*> pins;
@ -193,9 +196,16 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
nodeSeq.Trim(); nodeSeq.Trim();
return nodeSeq; return nodeSeq;
break;
} }
wxASSERT_MSG( "Missing default value definition for a Spice field: %s" , aField ); case SPICE_LIB_FILE:
// There is no default Spice library
return wxEmptyString;
break;
}
wxASSERT_MSG( false, "Missing default value definition for a Spice field" );
return wxString( "<unknown>" ); return wxString( "<unknown>" );
} }
@ -236,16 +246,16 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
spiceItem.m_parent = comp; spiceItem.m_parent = comp;
// Obtain Spice fields // Obtain Spice fields
SCH_FIELD* fieldPrim = comp->FindField( wxT( "Spice_Primitive" ) ); SCH_FIELD* fieldPrim = comp->FindField( GetSpiceFieldName( SPICE_PRIMITIVE ) );
SCH_FIELD* fieldModel = comp->FindField( wxT( "Spice_Model" ) ); SCH_FIELD* fieldModel = comp->FindField( GetSpiceFieldName( SPICE_MODEL ) );
SCH_FIELD* fieldEnabled = comp->FindField( wxT( "Spice_Netlist_Enabled" ) ); SCH_FIELD* fieldEnabled = comp->FindField( GetSpiceFieldName( SPICE_ENABLED ) );
SCH_FIELD* fieldSeq = comp->FindField( wxT( "Spice_Node_Sequence" ) ); SCH_FIELD* fieldSeq = comp->FindField( GetSpiceFieldName( SPICE_NODE_SEQUENCE ) );
spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0] spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0]
: GetSpiceFieldDefVal( "Spice_Primitive", comp, aCtl )[0]; : GetSpiceFieldDefVal( SPICE_PRIMITIVE, comp, aCtl )[0];
spiceItem.m_model = fieldModel ? fieldModel->GetText() spiceItem.m_model = fieldModel ? fieldModel->GetText()
: GetSpiceFieldDefVal( "Spice_Model", comp, aCtl ); : GetSpiceFieldDefVal( SPICE_MODEL, comp, aCtl );
spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] ); spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
@ -353,6 +363,7 @@ void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, unsi
} }
// Entries in the vector below have to follow the order in SPICE_FIELD enum
const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = { const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
"Spice_Primitive", "Spice_Primitive",
"Spice_Model", "Spice_Model",

15
eeschema/netlist_exporters/netlist_exporter_pspice.h
View File

@ -40,6 +40,14 @@ enum SPICE_NETLIST_OPTIONS {
NET_ALL_FLAGS = 0xffff NET_ALL_FLAGS = 0xffff
}; };
enum SPICE_FIELD {
SPICE_PRIMITIVE,
SPICE_MODEL,
SPICE_ENABLED,
SPICE_NODE_SEQUENCE,
SPICE_LIB_FILE
};
/// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog /// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog
/** /**
@ -104,7 +112,12 @@ public:
return m_spiceFields; return m_spiceFields;
} }
static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, unsigned aCtl ); static const wxString& GetSpiceFieldName( SPICE_FIELD aField )
{
return m_spiceFields[(int) aField];
}
static wxString GetSpiceFieldDefVal( SPICE_FIELD aField, SCH_COMPONENT* aComponent, unsigned aCtl );
void UpdateDirectives( unsigned aCtl ); void UpdateDirectives( unsigned aCtl );