From b03acdfce301af4e3ee67f75d430833b0aadf5be Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Fri, 8 Jun 2018 17:39:57 -0500
Subject: [PATCH] Define a custom button labeled *Discard Measured* to replace
 the standard *Discard* button. This is being done to ensure that the button
 label is the same on different platforms. Update the documentation to
 reference the new Button name.

---
 EqualizationToolsDialog.cpp              | 5 +++--
 doc/user_guide/en/measurement_tools.adoc | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/EqualizationToolsDialog.cpp b/EqualizationToolsDialog.cpp
index 8b40d9d34..2d96fce56 100644
--- a/EqualizationToolsDialog.cpp
+++ b/EqualizationToolsDialog.cpp
@@ -288,7 +288,7 @@ EqualizationToolsDialog::impl::impl (EqualizationToolsDialog * self
   , current_coefficients_ {coefficients}
   , amp_poly_low_ {0}
   , amp_poly_high_ {6000}
-  , button_box_ {QDialogButtonBox::Discard | QDialogButtonBox::Apply
+  , button_box_ {QDialogButtonBox::Apply
         | QDialogButtonBox::RestoreDefaults | QDialogButtonBox::Close
         , Qt::Vertical}
 {
@@ -362,6 +362,7 @@ EqualizationToolsDialog::impl::impl (EqualizationToolsDialog * self
 
   auto load_phase_button = button_box_.addButton (tr ("Phase ..."), QDialogButtonBox::ActionRole);
   auto refresh_button = button_box_.addButton (tr ("Refresh"), QDialogButtonBox::ActionRole);
+  auto discard_measured_button = button_box_.addButton (tr ("Discard Measured"), QDialogButtonBox::ActionRole);
   layout_.addWidget (&button_box_);
   setLayout (&layout_);
 
@@ -390,7 +391,7 @@ EqualizationToolsDialog::impl::impl (EqualizationToolsDialog * self
           Q_EMIT self_->phase_equalization_changed (current_coefficients_);
           plot_current ();
         }
-      else if (button == button_box_.button (QDialogButtonBox::Discard))
+      else if (button == discard_measured_button)
         {
           new_coefficients_ = QVector<double> {0., 0., 0., 0., 0.};
 
diff --git a/doc/user_guide/en/measurement_tools.adoc b/doc/user_guide/en/measurement_tools.adoc
index 9007c5046..57c113709 100644
--- a/doc/user_guide/en/measurement_tools.adoc
+++ b/doc/user_guide/en/measurement_tools.adoc
@@ -169,8 +169,9 @@ light green curve labeled "Current" to indicate that the phase
 equalization curve is now being applied to the received data. Another
 curve labeled "Group Delay" will appear. The "Group Delay" curve shows
 the group delay variation across the passband, in ms. Click the
-*Discard*  button to remove the captured data, leaving only the applied
-phase equalization curve and corresponding group delay curve.
+*Discard Measured*  button to remove the captured data from the plot, 
+leaving only the applied phase equalization curve and corresponding 
+group delay curve.
 
 - To revert to no phase equalization, push the *Restore Defaults*
 button followed by the *Apply* button.