Add set pacs settings.

src/forms/settings/SystemSettingForm.cpp

@@ -4,11 +4,13 @@
 #include <QPushButton>
 #include <QToolButton>
 #include <QGridLayout>
+#include <QThread>
 
 #include "dialogs/DialogManager.h"
+#include "dialogs/MultyMessageDialogManager.h"
 #include "json/jsonobject.h"
 #include "event/EventCenter.h"
-#include "device/DeviceManager.h"
+#include "recon/ReconManager.h"
 #include "json/cmdhelper.h"
 #include "components/ListBox.h"
 
@@ -62,21 +64,21 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
     gridLayout->addWidget(line6, 7, 0);
 
     mDiskInfoCaller = QThread::create([=]()
+    {
+        double disksize = 0;
+        mDiskSizeFlag = cmdHelper::Instance()->getDiskSize(disksize);
+        mDiskSize = disksize;
+        updateStorageSize();
+        while (true)
         {
-            double disksize = 0;
+            double duse = 0;
-            mDiskSizeFlag = cmdHelper::Instance()->getDiskSize(disksize);
+            mDiskUsedSizeFlag = cmdHelper::Instance()->getDiskUsed(duse);
-            mDiskSize = disksize;
+            mDiskUsedSize = duse;
-            updateStorageSize();
+            updateStorageUsed();
-            while (true)
+            QMetaObject::invokeMethod(mUI->batIcon, "startAnimation", Qt::QueuedConnection);
-            {
+            QThread::msleep(30000);
-                double duse = 0;
+        }
-                mDiskUsedSizeFlag = cmdHelper::Instance()->getDiskUsed(duse);
+    });
-                mDiskUsedSize = duse;
-                updateStorageUsed();
-                QMetaObject::invokeMethod(mUI->batIcon, "startAnimation", Qt::QueuedConnection);
-                QThread::msleep(30000);
-            }
-        });
     mDiskInfoCaller->start();
 
     //connection
@@ -85,66 +87,72 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
         {
             ////
         }
-        });
+    });
     connect(scanConfirmButton, &ImageSwitch::clicked, [=]() {
         JsonObject::Instance()->setScanConfirm(scanConfirmButton->getChecked());
-        });
+    });
     connect(scanCompleteButton, &ImageSwitch::clicked, [=]() {
         JsonObject::Instance()->setCompleteNotify(scanCompleteButton->getChecked());
-        });
+    });
     connect(mUI->btnNetwork, &QToolButton::clicked, [=]() {
         if (DialogManager::Default()->requestInputAdminPasswd() == QDialog::Accepted)
         {
             //JsonObject::Instance()->setPassword(dialog.getPsw());
             DialogManager::Default()->requestEditNetworkConfig();
         }
-        });
+    });
 
-    connect(mUI->btnDICOM, &QToolButton::clicked, [=]() {
+    connect(mUI->btnDICOM, &QToolButton::clicked, [&]() {
-        DialogManager::Default()->requestEditDicomConfig();
+        if(DialogManager::Default()->requestEditDicomConfig() == QDialog::Accepted)
-        });
+        {
+            auto server = JsonObject::Instance()->getServer(JsonObject::PACS);
+            emit pacsSettingsSaved(server.name, server.ae, server.ip, server.port.toInt());
+        }
+    });
 
 
 
     connect(mUI->btnPro, &QPushButton::clicked, [=]()
+    {
+        DialogResult result = DialogManager::Default()->requestSelectProtocal();
+        if (result.ResultCode == QDialog::Accepted)
         {
-            DialogResult result = DialogManager::Default()->requestSelectProtocal();
+            QString pro = result.ResultData.toString();
-            if (result.ResultCode == QDialog::Accepted)
+            //take effect
-            {
+            JsonObject::Instance()->setDefaultProtocal(pro);
-                QString pro = result.ResultData.toString();
+            mUI->btnPro->setText(JsonObject::Instance()->defaultProtocal());
-                //take effect
+        }
-                JsonObject::Instance()->setDefaultProtocal(pro);
+    });
-                mUI->btnPro->setText(JsonObject::Instance()->defaultProtocal());
-            }
-        });
 
     connect(mUI->btnFlt, &QPushButton::clicked, [=]()
+    {
+        DialogResult result = DialogManager::Default()->requestSelectFilter();
+        if (result.ResultCode == QDialog::Accepted)
         {
-            DialogResult result = DialogManager::Default()->requestSelectFilter();
+            QString flt = result.ResultData.toString();
-            if (result.ResultCode == QDialog::Accepted)
+            //take effect
-            {
+            JsonObject::Instance()->setDefaultFilter(flt);
-                QString flt = result.ResultData.toString();
+            mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());
-                //take effect
+        }
-                JsonObject::Instance()->setDefaultFilter(flt);
+    });
-                mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());
-            }
-        });
 
     connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]()
-        {
+    {
-            mUI->retranslateUi(this);
+        mUI->retranslateUi(this);
-            mUI->btnPro->setText(JsonObject::Instance()->defaultProtocal());
+        mUI->btnPro->setText(JsonObject::Instance()->defaultProtocal());
-            mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());
+        mUI->btnFlt->setText(JsonObject::Instance()->defaultFilter());
-            mUI->swt_verify->setChecked(true);
+        mUI->swt_verify->setChecked(true);
-            updateStorageSize();
+        updateStorageSize();
-            updateStorageUsed();
+        updateStorageUsed();
-        });
+    });
-}
 
+    connect(ReconManager::getInstance(), &ReconManager::setPacsSettingsResponsed, this, &SystemSettingForm::processPacsSettingsResponsed);
+    connect(this, &SystemSettingForm::pacsSettingsSaved, ReconManager::getInstance(), &ReconManager::setPacsSettings, Qt::QueuedConnection);
+
+}
 
 SystemSettingForm::~SystemSettingForm()
 {
-    mDiskInfoCaller->terminate();
     delete mDiskInfoCaller;
 }
 
@@ -160,6 +168,7 @@ void SystemSettingForm::updateStorageUsed()
         mUI->lbl_used->setText(tr("Get disk used size fail!"));
     }
 }
+
 void SystemSettingForm::updateStorageSize()
 {
     //bool flag = AppGlobalValues::StorageFlag();
@@ -176,3 +185,8 @@ void SystemSettingForm::updateStorageSize()
         mUI->lbl_size->setText(tr("Get disk total size fail!"));
     }
 }
+
+void SystemSettingForm::processPacsSettingsResponsed(bool aResult, const QVariant& aMessage)
+{
+    MultyMessageDialogManager::getInstance()->raiseDialog(aMessage.toString(), aResult ? MessageLevel::Sucess : MessageLevel::Error);
+}

src/forms/settings/SystemSettingForm.h

@@ -16,6 +16,12 @@ public:
     explicit SystemSettingForm(QWidget* aParent = nullptr);
     ~SystemSettingForm();
 
+signals:
+    void pacsSettingsSaved(const QString& aClientAETitle, const QString& aServerAETitle, const QString& aServerIP, int aServerPort);
+
+private slots:
+    void processPacsSettingsResponsed(bool aResult, const QVariant& aMessage);
+
 private:
     void updateStorageSize();
     void updateStorageUsed();

src/recon/ReconManager.cpp

@@ -94,3 +94,18 @@ void ReconManager::queryReconStatus(const QStringList& aScanIDs)
     }
     emit queryReconStateResponsed(true, QVariant::fromValue(result));
 }
+
+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;
+        emit setPacsSettingsResponsed(false, QVariant::fromValue(msg));
+        return;
+    }
+
+    emit setPacsSettingsResponsed(true, QVariant::fromValue(QString("Set PACS settings succeed.")));
+}

src/recon/ReconManager.h

@@ -23,6 +23,7 @@ public slots:
     void createEmptyScan(const QString& aScanID, const QString& aPath);
     void createScan(const QString& aScanID, const QString& aPatientID, const QString& aReferenceID, const QString& aPath);
     void queryReconStatus(const QStringList& aScanIDs);
+    void setPacsSettings(const QString& aClientAETitle, const QString& aServerAETitle, const QString& aServerIP, int aServerPort);
 
 private:
     void init();
@@ -31,6 +32,7 @@ signals:
     void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "");
     void createScanResponsed(bool aResult,  const QString& aScanID, const QString& aMessage = "");
     void queryReconStateResponsed(bool aResult, const QVariant& aData);
+    void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage);
 
 private:
     Recon::ReconClient* mReconClient;