From 4dd477f6041d24df31d4c7d6eaf0ff0e12c62a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sun, 19 Mar 2023 21:43:03 +0100
Subject: [PATCH] Apply buttons for graph setup dialogs

---
 .../LibreVNA-GUI/Traces/smithchartdialog.ui   |  2 +-
 .../LibreVNA-GUI/Traces/tracesmithchart.cpp   | 22 +++++++++++++------
 .../Traces/waterfallaxisdialog.cpp            |  5 +++++
 .../Traces/waterfallaxisdialog.ui             |  6 ++---
 .../LibreVNA-GUI/Traces/xyplotaxisdialog.cpp  |  3 +++
 .../LibreVNA-GUI/Traces/xyplotaxisdialog.ui   |  6 ++---
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/smithchartdialog.ui b/Software/PC_Application/LibreVNA-GUI/Traces/smithchartdialog.ui
index 57926c7..f594477 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/smithchartdialog.ui
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/smithchartdialog.ui
@@ -255,7 +255,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/tracesmithchart.cpp b/Software/PC_Application/LibreVNA-GUI/Traces/tracesmithchart.cpp
index 2f70049..9e07774 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/tracesmithchart.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/tracesmithchart.cpp
@@ -107,14 +107,22 @@ void TraceSmithChart::axisSetupDialog()
     ui->lineTable->setItemDelegateForColumn(SmithChartContantLineModel::ColIndexType, new SmithChartTypeDelegate);
     ui->lineTable->setItemDelegateForColumn(SmithChartContantLineModel::ColIndexParam, new SmithChartParamDelegate);
 
+    auto updateSettings = [=]() {
+        limitToSpan = ui->displayModeFreq->currentIndex() == 1;
+        limitToEdge = ui->displayModeImp->currentIndex() == 1;
+        manualFrequencyRange = ui->displayFreqOverride->isChecked();
+        fmin = ui->displayStartFreq->value();
+        fmax = ui->displayStopFreq->value();
+        updateContextMenu();
+        triggerReplot();
+    };
+
+    connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=](){
+       updateSettings();
+    });
+
     connect(ui->buttonBox, &QDialogButtonBox::accepted, [=](){
-       limitToSpan = ui->displayModeFreq->currentIndex() == 1;
-       limitToEdge = ui->displayModeImp->currentIndex() == 1;
-       manualFrequencyRange = ui->displayFreqOverride->isChecked();
-       fmin = ui->displayStartFreq->value();
-       fmax = ui->displayStopFreq->value();
-       updateContextMenu();
-       triggerReplot();
+       updateSettings();
     });
     connect(ui->zoomFactor, &SIUnitEdit::valueChanged, [=](){
         edgeReflection = 1.0 / ui->zoomFactor->value();
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.cpp b/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.cpp
index fa6a3c4..7b18cd4 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.cpp
@@ -3,6 +3,7 @@
 #include "ui_waterfallaxisdialog.h"
 
 #include <QStandardItemModel>
+#include <QPushButton>
 
 using namespace std;
 
@@ -100,6 +101,10 @@ WaterfallAxisDialog::WaterfallAxisDialog(TraceWaterfall *plot) :
         ui->Xlinear->setChecked(true);
     }
     ui->Xalignment->setCurrentIndex((int) plot->align);
+
+    connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=](){
+       on_buttonBox_accepted();
+    });
 }
 
 WaterfallAxisDialog::~WaterfallAxisDialog()
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.ui b/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.ui
index bb50e8c..bc31654 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.ui
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/waterfallaxisdialog.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>451</width>
-    <height>351</height>
+    <width>515</width>
+    <height>377</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -344,7 +344,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.cpp
index d459f1b..37dabf0 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.cpp
@@ -258,6 +258,9 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
         editLine(plot->constantLines[ui->lineList->currentRow()]);
     });
 
+    connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=](){
+       on_buttonBox_accepted();
+    });
 }
 
 XYplotAxisDialog::~XYplotAxisDialog()
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.ui b/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.ui
index 6db0d45..15b7dc5 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.ui
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/xyplotaxisdialog.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>814</width>
-    <height>439</height>
+    <height>458</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -541,7 +541,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -592,8 +592,8 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="Y1group"/>
   <buttongroup name="Xgroup"/>
+  <buttongroup name="Y1group"/>
   <buttongroup name="Y2group"/>
  </buttongroups>
 </ui>