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

Do not store Spice vector names, but regenerate them

This commit is contained in:
Maciej Suminski 2016-08-11 14:42:10 +02:00
parent ed8f555331
commit fb56420654
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sim/sim_plot_frame.cpp
View File

@ -88,9 +88,6 @@ TRACE_DESC::TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxSt
SIM_PLOT_TYPE aType, const wxString& aParam ) SIM_PLOT_TYPE aType, const wxString& aParam )
: m_name( aName ), m_type( aType ), m_param( aParam ) : m_name( aName ), m_type( aType ), m_param( aParam )
{ {
// Spice vector generation
m_spiceVector = aExporter.GetSpiceVector( aName, aType, aParam );
// Title generation // Title generation
m_title = wxString::Format( "%s(%s)", aParam, aName ); m_title = wxString::Format( "%s(%s)", aParam, aName );
@ -350,7 +347,8 @@ bool SIM_PLOT_FRAME::updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL*
return false; return false;
SIM_TYPE simType = m_exporter->GetSimType(); SIM_TYPE simType = m_exporter->GetSimType();
wxString spiceVector = aDescriptor.GetSpiceVector(); wxString spiceVector = m_exporter->GetSpiceVector( aDescriptor.GetName(),
aDescriptor.GetType(), aDescriptor.GetParam() );
if( !SIM_PLOT_PANEL::IsPlottable( simType ) ) if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
{ {

8
eeschema/sim/sim_plot_frame.h
View File

@ -83,11 +83,6 @@ public:
return m_type; return m_type;
} }
const wxString& GetSpiceVector() const
{
return m_spiceVector;
}
private: private:
// Three basic parameters // Three basic parameters
///> Name of the measured net/device ///> Name of the measured net/device
@ -102,9 +97,6 @@ private:
// Generated data // Generated data
///> Title displayed in the signal list/plot legend ///> Title displayed in the signal list/plot legend
wxString m_title; wxString m_title;
///> Spice vector name
wxString m_spiceVector;
}; };
/** Implementing SIM_PLOT_FRAME_BASE */ /** Implementing SIM_PLOT_FRAME_BASE */