From 1e61eb17cfb0918bfc4b18ea4ced82b471c6c31c Mon Sep 17 00:00:00 2001 From: chenhuijun Date: Wed, 31 Jul 2024 15:50:01 +0800 Subject: [PATCH] feat: Add requestCEchoTest method to DialogManager class --- src/dialogs/DialogManager.cpp | 16 ++++++++++++++++ src/dialogs/DialogManager.h | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/src/dialogs/DialogManager.cpp b/src/dialogs/DialogManager.cpp index d8e6fe3..020a40d 100644 --- a/src/dialogs/DialogManager.cpp +++ b/src/dialogs/DialogManager.cpp @@ -22,6 +22,7 @@ #include "dialogs/IpSettingsDialog.h" #include "dialogs/MppsSettingsDialog.h" #include "dialogs/StartScanProcessDialog.h" +#include "dialogs/CEchoTestDialog.h" #include "network/DicomCfgDialog.h" #include "network/GetAdminPsw.h" @@ -53,6 +54,7 @@ DialogManager::DialogManager() , mSyncDialog(nullptr) , mTopWidget(nullptr) , mGetWorkListDialog(nullptr) +, mCEchoTestDialog(nullptr) { } @@ -438,6 +440,20 @@ int DialogManager::requestPatientConfirm(PatientInformation* patientInf, int typ return ret; } +int DialogManager::requestCEchoTest(const QList& aInputValue) +{ + CEchoTestDialog dialog(mTopWidget); + dialog.setCEchoSettings(aInputValue); + mCEchoTestDialog = &dialog; + setTopWidget(&dialog); + + dialog.setWindowModality(Qt::WindowModal); + int ret = dialog.exec(); + releaseTopWidget(&dialog); + mCEchoTestDialog = nullptr; + return ret; +} + int DialogManager::requestGetWorkList() { GetWorkListDialog dialog(WorkListManager::getInstance()->getTableModel(), WorkListManager::getInstance()->getTableView(), mTopWidget); diff --git a/src/dialogs/DialogManager.h b/src/dialogs/DialogManager.h index 7468c66..1636e30 100644 --- a/src/dialogs/DialogManager.h +++ b/src/dialogs/DialogManager.h @@ -7,6 +7,7 @@ #include #include #include +#include "dicom/CEchoSetting.h" class GUIMessageDialog; class QSqlTableModel; @@ -15,6 +16,7 @@ class LoginDialog; class ScreenSaverWindow; class GetWorkListDialog; class PatientInformation; +class CEchoTestDialog; enum MessageLevel:unsigned int; @@ -67,6 +69,8 @@ public: int requestGetWorkList(); int requestGetWorkList(const QString& aInputValue); int requestPatientConfirm(PatientInformation* patientInf, int type); + int requestCEchoTest(const QList& aInputValue); + DialogResult requestEditIpAndNetMask(); DialogResult requestEditIpAndNetMask(const QStringList& aEditData); DialogResult requestEditRouteInfo(); @@ -101,6 +105,7 @@ private: QWidget* mTopWidget; std::mutex mMutex; GetWorkListDialog* mGetWorkListDialog; + CEchoTestDialog* mCEchoTestDialog; int mDialogCount = 0; };