From 5fa7be0320b2617df39eb2883a1761a31ba980bb Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 22 Feb 2023 09:53:52 +0000
Subject: [PATCH] Update signals after running a sim.

Fixes https://gitlab.com/kicad/code/kicad/issues/14016
---
 eeschema/sim/sim_plot_frame.cpp | 33 +++++++++++++++++++++++++--------
 eeschema/sim/sim_plot_frame.h   |  1 +
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 0140ece24e..1ac8c90cd0 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -1019,14 +1019,22 @@ void SIM_PLOT_FRAME::OnFilterMouseMoved( wxMouseEvent& aEvent )
 }
 
 
+/**
+ * For user-defined signals we display the expression such as "V(out)-V(in)", but the SPICE
+ * signal we actually have to plot will be "user0" or some-such.
+ */
+wxString SIM_PLOT_FRAME::getTraceName( const wxString& aSignalName )
+{
+    if( alg::contains( m_userDefinedSignals, aSignalName ) )
+        return m_userDefinedSignalToSpiceVecName[ aSignalName ];
+
+    return aSignalName;
+}
+
+
 wxString SIM_PLOT_FRAME::getTraceName( int aRow )
 {
-    wxString signalName = m_signalsGrid->GetCellValue( aRow, COL_SIGNAL_NAME );
-
-    if( alg::contains( m_userDefinedSignals, signalName ) )
-        signalName = m_userDefinedSignalToSpiceVecName[ signalName ];
-
-    return signalName;
+    return getTraceName( m_signalsGrid->GetCellValue( aRow, COL_SIGNAL_NAME ) );
 }
 
 
@@ -2573,6 +2581,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     m_simFinished = true;
 
     applyUserDefinedSignals();
+    rebuildSignalsList();
 
     // If there are any signals plotted, update them
     if( SIM_PANEL_BASE::IsPlottable( simType ) )
@@ -2588,14 +2597,22 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 
         std::vector<struct TRACE_DESC> traceInfo;
 
-        // Get information about all the traces on the plot, remove and add again
+        // Get information about all the traces on the plot, remove any no longer in the
+        // signals list, and then update the remainder
         for( const auto& [name, trace] : plotPanel->GetTraces() )
         {
             struct TRACE_DESC placeholder;
             placeholder.m_name = trace->GetName();
             placeholder.m_type = trace->GetType();
 
-            traceInfo.push_back( placeholder );
+            for( const wxString& signal : m_signals )
+            {
+                if( getTraceName( signal ) == placeholder.m_name )
+                {
+                    traceInfo.push_back( placeholder );
+                    break;
+                }
+            }
         }
 
         for( const struct TRACE_DESC& trace : traceInfo )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 1f8a9835f8..4a43e48de8 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -265,6 +265,7 @@ private:
     /**
      * For user-defined traces we have a separate SPICE vector name.
      */
+    wxString getTraceName( const wxString& aSignalName );
     wxString getTraceName( int aRow );
 
     /**