From eb069d0b69e7f8b4d02f4c5f960e908926be7f03 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Sun, 7 Apr 2024 11:10:17 +0800 Subject: [PATCH] Apply the math options after dialog be closed --- DSView/pv/dialogs/mathoptions.cpp | 5 ++++- DSView/pv/dialogs/mathoptions.h | 2 ++ DSView/pv/toolbars/trigbar.cpp | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp index 908b9408..fe424490 100644 --- a/DSView/pv/dialogs/mathoptions.cpp +++ b/DSView/pv/dialogs/mathoptions.cpp @@ -174,9 +174,12 @@ void MathOptions::retranslateUi() void MathOptions::accept() { - using namespace Qt; + using namespace Qt; QDialog::accept(); +} +void MathOptions::Apply() +{ int src1 = -1; int src2 = -1; data::MathStack::MathType type = data::MathStack::MATH_ADD; diff --git a/DSView/pv/dialogs/mathoptions.h b/DSView/pv/dialogs/mathoptions.h index b6ccd7b6..30b5c43b 100644 --- a/DSView/pv/dialogs/mathoptions.h +++ b/DSView/pv/dialogs/mathoptions.h @@ -56,6 +56,8 @@ public: MathOptions(SigSession *session, QWidget *parent); ~MathOptions(); + void Apply(); + private: void retranslateUi(); diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp index d41eb238..f79793ff 100644 --- a/DSView/pv/toolbars/trigbar.cpp +++ b/DSView/pv/toolbars/trigbar.cpp @@ -285,7 +285,10 @@ void TrigBar::on_actionFft_triggered() void TrigBar::on_actionMath_triggered() { pv::dialogs::MathOptions math_dlg(_session, this); - math_dlg.exec(); + if (math_dlg.exec() == QDialog::Accepted) + { + math_dlg.Apply(); + } } void TrigBar::on_actionDark_triggered()