don't strip common parts of labels if given explicitly

murrayrm · murrayrm · commit 5e405cc47745 · 2024-06-26T08:50:50.000-07:00
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -1046,7 +1046,9 @@ def gen_zero_centered_series(val_min, val_max, period):
             # Get the labels to use, removing common strings
             lines = [line for line in ax.get_lines()
                      if line.get_label()[0] != '_']
-            labels = _make_legend_labels([line.get_label() for line in lines])
+            labels = _make_legend_labels(
+                [line.get_label() for line in lines],
+                ignore_common=line_labels is not None)
 
             # Generate the label, if needed
             if len(labels) > 1 and legend_map[i, j] != None:
diff --git a/control/tests/freqplot_test.py b/control/tests/freqplot_test.py
@@ -361,12 +361,12 @@ def test_gangof4_trace_labels():
     plt.close()
 
     # Override labels
-    out = ct.gangof4_response(P1, C).plot(label='line1')
-    out = ct.gangof4_response(P2, C).plot(label='line2')
+    out = ct.gangof4_response(P1, C).plot(label='xxx, line1, yyy')
+    out = ct.gangof4_response(P2, C).plot(label='xxx, line2, yyy')
     axs = ct.get_plot_axes(out)
     legend = axs[0, 1].get_legend().get_texts()
-    assert legend[0].get_text() == 'line1'
-    assert legend[1].get_text() == 'line2'
+    assert legend[0].get_text() == 'xxx, line1, yyy'
+    assert legend[1].get_text() == 'xxx, line2, yyy'
     plt.close()
 
 
diff --git a/control/timeplot.py b/control/timeplot.py
@@ -808,7 +808,7 @@ def _make_legend_labels(labels, ignore_common=False):
         suffix_len -= 1
 
     # Strip the labels of common information
-    if suffix_len > 0:
+    if suffix_len > 0 and not ignore_common:
         labels = [label[prefix_len:-suffix_len] for label in labels]
     else:
         labels = [label[prefix_len:] for label in labels]
