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

Fix: use correct node numbers in noise simulation directive

This commit is contained in:
Maciej Suminski 2016-08-11 14:41:31 +02:00
parent 3c909e2c32
commit c5227b7279
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/dialogs/dialog_sim_settings.cpp
View File

@ -114,15 +114,19 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
// Noise analysis // Noise analysis
else if( page == m_pgNoise ) else if( page == m_pgNoise )
{ {
const NETLIST_EXPORTER_PSPICE::NET_INDEX_MAP& netMap = m_exporter->GetNetIndexMap();
if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() || if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() ||
m_noisePointsNumber->IsEmpty() || m_noiseFreqStart->IsEmpty() || m_noisePointsNumber->IsEmpty() || m_noiseFreqStart->IsEmpty() ||
m_noiseFreqStop->IsEmpty() ) m_noiseFreqStop->IsEmpty() )
return false; return false;
// TODO missing node number wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString()
wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString() : wxString::Format( ", %d", 42 ); : wxString::Format( ", %d", netMap.at( m_noiseRef->GetValue() ) );
m_simCommand = wxString::Format( ".noise v(%d%s) %s %s %s %s %s", m_simCommand = wxString::Format( ".noise v(%d%s) %s %s %s %s %s",
42, ref, m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ), netMap.at( m_noiseMeas->GetValue() ), ref,
m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() ); m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() );
} }