sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Remove PacsSetting editing logic

Browse Source
This commit is contained in:
chenhuijun
2024-07-31 15:56:46 +08:00
parent c718e8f028
commit cb52c81e6e
4 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/forms/settings/SystemSettingForm.cpp
View File

@@ -58,11 +58,7 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
connect(mUI->mPacsButton, &QToolButton::clicked, [&]() connect(mUI->mPacsButton, &QToolButton::clicked, [&]()
{ {
if(DialogManager::Default()->requestPacsSettings() == QDialog::Accepted) DialogManager::Default()->requestPacsSettings();
{
auto server = JsonObject::Instance()->getServer(JsonObject::PACS);
emit pacsSettingsSaved(server.localAE, server.ae, server.ip, server.port.toInt());
}
}); });
connect(mUI->mReconButton, &QToolButton::clicked, [&]() connect(mUI->mReconButton, &QToolButton::clicked, [&]()
@@ -105,9 +101,7 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
// mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter()); // mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());
// }); // });
connect(ReconManager::getInstance(), &ReconManager::setPacsSettingsResponsed, this, &SystemSettingForm::processPacsSettingsResponsed);
connect(ReconManager::getInstance(), &ReconManager::setMppsSettingsResponsed, 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); connect(this, &SystemSettingForm::mppsSettingsSaved, ReconManager::getInstance(), &ReconManager::setMppsSettings, Qt::QueuedConnection);
} }

1
src/forms/settings/SystemSettingForm.h
View File

@@ -19,7 +19,6 @@ public:
~SystemSettingForm(); ~SystemSettingForm();
signals: 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); void mppsSettingsSaved(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort);
private slots: private slots:

17
src/recon/ReconManager.cpp
View File

@@ -141,23 +141,6 @@ void ReconManager::checkReconConnection()
emit reconStateResponsed(mIsConnected, state); 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) void ReconManager::setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort)
{ {
MPPSSetting settings = {aIsOpen ? 1 : 0, aServerAETitle.toStdString(), aServerIP.toStdString(), aServerPort}; MPPSSetting settings = {aIsOpen ? 1 : 0, aServerAETitle.toStdString(), aServerIP.toStdString(), aServerPort};

2
src/recon/ReconManager.h
View File

@@ -27,7 +27,6 @@ public slots:
void createEmptyScan(const QString& aScanID, const QString& aPath); 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 createScan(const QString& aScanID, const QString& aStudyUID,const QString& aMPPSUID, const QString& aReferenceID, const QString& aPath);
void queryReconStatus(const QStringList& aScanIDs); 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 setMppsSettings(bool aIsOpen, const QString& aServerAETitle, const QString& aServerIP, int aServerPort);
void checkReconConnection(); void checkReconConnection();
void getReconVersion(); void getReconVersion();
@@ -40,7 +39,6 @@ signals:
void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true); 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 createScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true);
void queryReconStateResponsed(bool aResult, const QVariant& aData); void queryReconStateResponsed(bool aResult, const QVariant& aData);
void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage);
void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage); void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage);
void checkReconConnectionResponsed(bool aResult); void checkReconConnectionResponsed(bool aResult);
void getReconVersionResponsed(const QString& aResult); void getReconVersionResponsed(const QString& aResult);