From fb564206549559c7af7bf05c49fa72631f20d990 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 11 Aug 2016 14:42:10 +0200 Subject: [PATCH] Do not store Spice vector names, but regenerate them --- eeschema/sim/sim_plot_frame.cpp | 6 ++---- eeschema/sim/sim_plot_frame.h | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index 684fe99dd7..b3e405cf5a 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -88,9 +88,6 @@ TRACE_DESC::TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxSt SIM_PLOT_TYPE aType, const wxString& aParam ) : m_name( aName ), m_type( aType ), m_param( aParam ) { - // Spice vector generation - m_spiceVector = aExporter.GetSpiceVector( aName, aType, aParam ); - // Title generation 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; 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 ) ) { diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h index 4e1bce9d83..c778407da4 100644 --- a/eeschema/sim/sim_plot_frame.h +++ b/eeschema/sim/sim_plot_frame.h @@ -83,11 +83,6 @@ public: return m_type; } - const wxString& GetSpiceVector() const - { - return m_spiceVector; - } - private: // Three basic parameters ///> Name of the measured net/device @@ -102,9 +97,6 @@ private: // Generated data ///> Title displayed in the signal list/plot legend wxString m_title; - - ///> Spice vector name - wxString m_spiceVector; }; /** Implementing SIM_PLOT_FRAME_BASE */