diff --git a/src/forms/settings/SystemSettingForm.cpp b/src/forms/settings/SystemSettingForm.cpp index d53c672..e330a5c 100644 --- a/src/forms/settings/SystemSettingForm.cpp +++ b/src/forms/settings/SystemSettingForm.cpp @@ -58,11 +58,7 @@ SystemSettingForm::SystemSettingForm(QWidget* parent) connect(mUI->mPacsButton, &QToolButton::clicked, [&]() { - if(DialogManager::Default()->requestPacsSettings() == QDialog::Accepted) - { - auto server = JsonObject::Instance()->getServer(JsonObject::PACS); - emit pacsSettingsSaved(server.localAE, server.ae, server.ip, server.port.toInt()); - } + DialogManager::Default()->requestPacsSettings(); }); connect(mUI->mReconButton, &QToolButton::clicked, [&]() @@ -105,9 +101,7 @@ SystemSettingForm::SystemSettingForm(QWidget* parent) // mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter()); // }); - connect(ReconManager::getInstance(), &ReconManager::setPacsSettingsResponsed, this, &SystemSettingForm::processPacsSettingsResponsed); connect(ReconManager::getInstance(), &ReconManager::setMppsSettingsResponsed, this, &SystemSettingForm::processPacsSettingsResponsed); - connect(this, &SystemSettingForm::pacsSettingsSaved, ReconManager::getInstance(), &ReconManager::setPacsSettings, Qt::QueuedConnection); connect(this, &SystemSettingForm::mppsSettingsSaved, ReconManager::getInstance(), &ReconManager::setMppsSettings, Qt::QueuedConnection); } diff --git a/src/forms/settings/SystemSettingForm.h b/src/forms/settings/SystemSettingForm.h index f5a3f93..9482e5a 100644 --- a/src/forms/settings/SystemSettingForm.h +++ b/src/forms/settings/SystemSettingForm.h @@ -19,7 +19,6 @@ public: ~SystemSettingForm(); signals: - void pacsSettingsSaved(const QString& aClientAETitle, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); void mppsSettingsSaved(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); private slots: diff --git a/src/recon/ReconManager.cpp b/src/recon/ReconManager.cpp index 1f991e3..33a81dc 100644 --- a/src/recon/ReconManager.cpp +++ b/src/recon/ReconManager.cpp @@ -141,23 +141,6 @@ void ReconManager::checkReconConnection() emit reconStateResponsed(mIsConnected, state); } -void ReconManager::setPacsSettings(const QString& aClientAETitle, const QString& aServerAETitle, const QString& aServerIP, int aServerPort) -{ - PACSSetting settings = {aClientAETitle.toStdString(), aServerAETitle.toStdString(), aServerIP.toStdString(), aServerPort}; - auto response = mReconClient->SetPACSSetting(settings); - if(response.bad()) - { - QString msg = QString("Set PACS settings failed : ") + response.error().data(); - qDebug()<< msg; - LOG_SYS_OPERATION(msg) - emit setPacsSettingsResponsed(false, QVariant::fromValue(tr("Set PACS settings failed"))); - return; - } - QString message = "Set PACS settings succeed."; - LOG_SYS_OPERATION(message) - emit setPacsSettingsResponsed(true, QVariant::fromValue(tr("Set PACS settings succeed"))); -} - void ReconManager::setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort) { MPPSSetting settings = {aIsOpen ? 1 : 0, aServerAETitle.toStdString(), aServerIP.toStdString(), aServerPort}; diff --git a/src/recon/ReconManager.h b/src/recon/ReconManager.h index a0a1e67..eb05347 100644 --- a/src/recon/ReconManager.h +++ b/src/recon/ReconManager.h @@ -27,7 +27,6 @@ public slots: void createEmptyScan(const QString& aScanID, const QString& aPath); void createScan(const QString& aScanID, const QString& aStudyUID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath); void queryReconStatus(const QStringList& aScanIDs); - void setPacsSettings(const QString& aClientAETitle, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); void setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort); void checkReconConnection(); void getReconVersion(); @@ -40,7 +39,6 @@ signals: void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true); void createScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true); void queryReconStateResponsed(bool aResult, const QVariant& aData); - void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage); void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage); void checkReconConnectionResponsed(bool aResult); void getReconVersionResponsed(const QString& aResult);