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

Sim spice: fix unescaped netnames in spice netlist and simulator dialogs. 

Net names in eeschema that include '/' are escaped ('/' replaced by "{slash}")
Escaped netnames are only for internal use, and must be unescaped in spice netlist and dialogs.
This commit is contained in:
jean-pierre charras 2019-06-09 17:46:02 +02:00
parent 838e8aef04
commit bc27b0ed5f
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/dialogs/dialog_signal_list.cpp
View File

@ -54,8 +54,11 @@ bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
// Voltage list // Voltage list
for( const auto& net : m_exporter->GetNetIndexMap() ) for( const auto& net : m_exporter->GetNetIndexMap() )
{ {
if( net.first != "GND" && net.first != "0" ) // netnames are escaped (can contain "{slash}" for '/') Unscape them:
m_signals->Append( wxString::Format( "V(%s)", net.first ) ); wxString netname = UnescapeString( net.first );
if( netname != "GND" && netname != "0" )
m_signals->Append( wxString::Format( "V(%s)", netname ) );
} }
auto simType = m_exporter->GetSimType(); auto simType = m_exporter->GetSimType();

3
eeschema/netlist_exporters/netlist_exporter_pspice.cpp
View File

@ -150,6 +150,9 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
// Replace parenthesis with underscore to prevent parse issues with simulators // Replace parenthesis with underscore to prevent parse issues with simulators
ReplaceForbiddenChars( netName ); ReplaceForbiddenChars( netName );
// unescape net names that contain a escaped sequence ("{slash}"):
netName = UnescapeString( netName );
// Add quotes to nets containing slashes. This isn't added to ReplaceForbidenChars // Add quotes to nets containing slashes. This isn't added to ReplaceForbidenChars
// because this is only necessary for file writing; nets with slashes can be // because this is only necessary for file writing; nets with slashes can be
// handled by ngspice after loading. // handled by ngspice after loading.

6
eeschema/sim/netlist_exporter_pspice_sim.cpp
View File

@ -36,13 +36,15 @@ wxString NETLIST_EXPORTER_PSPICE_SIM::GetSpiceVector( const wxString& aName, SIM
if( aType & SPT_VOLTAGE ) if( aType & SPT_VOLTAGE )
{ {
// netnames are escaped (can contain "{slash}" for '/') Unscape them:
wxString spicenet = UnescapeString( aName );
// Spice netlist netnames does not accept some chars, whicyh are replaced // Spice netlist netnames does not accept some chars, whicyh are replaced
// by eeschema netlist generator. // by eeschema netlist generator.
// Replace these forbidden chars to find the actual spice net name // Replace these forbidden chars to find the actual spice net name
wxString spicenet = aName;
NETLIST_EXPORTER_PSPICE::ReplaceForbiddenChars( spicenet ); NETLIST_EXPORTER_PSPICE::ReplaceForbiddenChars( spicenet );
return wxString::Format( "V(%s)", spicenet.GetData() ); return wxString::Format( "V(%s)", spicenet );
} }
else if( aType & SPT_CURRENT ) else if( aType & SPT_CURRENT )