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

refactor: Change struct host's property name to localAE.

Browse Source
This commit is contained in:
chenhuijun
2024-06-03 17:02:50 +08:00
parent 3bcaf0add9
commit c1db4f002c
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cfgs/usct-product.json
View File

@@ -47,26 +47,26 @@
"worklist": { "worklist": {
"ae": "DCM4CHEE", "ae": "DCM4CHEE",
"ip": "192.168.1.10", "ip": "192.168.1.10",
"name": "gui", "localAE": "gui",
"port": "11112" "port": "11112"
}, },
"pacs": { "pacs": {
"ae": "ORTHANC", "ae": "ORTHANC",
"ip": "192.168.1.10", "ip": "192.168.1.10",
"name": "Radiant", "localAE": "Radiant",
"port": "4242" "port": "4242"
}, },
"recon": { "recon": {
"ae": "krad", "ae": "krad",
"ip": "192.168.1.10", "ip": "192.168.1.10",
"name": "3D recon", "localAE": "3D recon",
"port": "5003" "port": "5003"
}, },
"mpps": { "mpps": {
"open": false, "open": false,
"ae": "mpps", "ae": "mpps",
"ip": "192.168.1.15", "ip": "192.168.1.15",
"name": "Mpps Server", "localAE": "Mpps Server",
"port": "5002" "port": "5002"
}, },
"address": { "address": {

4
src/dialogs/MppsSettingsDialog.cpp
View File

@@ -49,7 +49,7 @@ void MppsSettingsDialog::initConfig()
serverInfo = JsonObject::Instance()->getServer(JsonObject::MPPS); serverInfo = JsonObject::Instance()->getServer(JsonObject::MPPS);
mSettingsArea->setServerAETitle(serverInfo.ae); mSettingsArea->setServerAETitle(serverInfo.ae);
mSettingsArea->setServerIpAddress(serverInfo.ip); mSettingsArea->setServerIpAddress(serverInfo.ip);
mSettingsArea->setMyAETitle(serverInfo.name); mSettingsArea->setMyAETitle(serverInfo.localAE);
mSettingsArea->setServerPort(serverInfo.port); mSettingsArea->setServerPort(serverInfo.port);
mSettingsArea->setMppsMode(); mSettingsArea->setMppsMode();
} }
@@ -101,7 +101,7 @@ bool MppsSettingsDialog::updateReferenceData()
host serverInfo; host serverInfo;
serverInfo.ip = serverIp; serverInfo.ip = serverIp;
serverInfo.ae = serverAETitle; serverInfo.ae = serverAETitle;
serverInfo.name = myAETitle; serverInfo.localAE = myAETitle;
serverInfo.port = serverPort; serverInfo.port = serverPort;
JsonObject::Instance()->setServer(JsonObject::MPPS, serverInfo); JsonObject::Instance()->setServer(JsonObject::MPPS, serverInfo);
JsonObject::Instance()->setMppsOpen(mSettingsArea->getMppsIsOpen()); JsonObject::Instance()->setMppsOpen(mSettingsArea->getMppsIsOpen());

4
src/dialogs/PacsSettingsDialog.cpp
View File

@@ -47,7 +47,7 @@ void PacsSettingsDialog::initConfig()
serverInfo = JsonObject::Instance()->getServer(JsonObject::PACS); serverInfo = JsonObject::Instance()->getServer(JsonObject::PACS);
mSettingsArea->setServerAETitle(serverInfo.ae); mSettingsArea->setServerAETitle(serverInfo.ae);
mSettingsArea->setServerIpAddress(serverInfo.ip); mSettingsArea->setServerIpAddress(serverInfo.ip);
mSettingsArea->setMyAETitle(serverInfo.name); mSettingsArea->setMyAETitle(serverInfo.localAE);
mSettingsArea->setServerPort(serverInfo.port); mSettingsArea->setServerPort(serverInfo.port);
} }
@@ -98,7 +98,7 @@ bool PacsSettingsDialog::updateReferenceData()
host serverInfo; host serverInfo;
serverInfo.ip = serverIp; serverInfo.ip = serverIp;
serverInfo.ae = serverAETitle; serverInfo.ae = serverAETitle;
serverInfo.name = myAETitle; serverInfo.localAE = myAETitle;
serverInfo.port = serverPort; serverInfo.port = serverPort;
JsonObject::Instance()->setServer(JsonObject::PACS, serverInfo); JsonObject::Instance()->setServer(JsonObject::PACS, serverInfo);

4
src/dialogs/ReconSettingsDialog.cpp
View File

@@ -49,7 +49,7 @@ void ReconSettingsDialog::initConfig()
serverInfo = JsonObject::Instance()->getServer(JsonObject::RECON); serverInfo = JsonObject::Instance()->getServer(JsonObject::RECON);
mSettingsArea->setServerAETitle(serverInfo.ae); mSettingsArea->setServerAETitle(serverInfo.ae);
mSettingsArea->setServerIpAddress(serverInfo.ip); mSettingsArea->setServerIpAddress(serverInfo.ip);
mSettingsArea->setMyAETitle(serverInfo.name); mSettingsArea->setMyAETitle(serverInfo.localAE);
mSettingsArea->setServerPort(serverInfo.port); mSettingsArea->setServerPort(serverInfo.port);
} }
@@ -100,7 +100,7 @@ bool ReconSettingsDialog::updateReferenceData()
host serverInfo; host serverInfo;
serverInfo.ip = serverIp; serverInfo.ip = serverIp;
serverInfo.ae = serverAETitle; serverInfo.ae = serverAETitle;
serverInfo.name = myAETitle; serverInfo.localAE = myAETitle;
serverInfo.port = serverPort; serverInfo.port = serverPort;
JsonObject::Instance()->setServer(JsonObject::RECON, serverInfo); JsonObject::Instance()->setServer(JsonObject::RECON, serverInfo);
ReconManager::getInstance()->setReconIpAndPort(serverIp, serverPort); ReconManager::getInstance()->setReconIpAndPort(serverIp, serverPort);

4
src/dialogs/WorklistSettingsDialog.cpp
View File

@@ -48,7 +48,7 @@ void WorklistSettingsDialog::initConfig()
serverInfo = JsonObject::Instance()->getServer(JsonObject::WORKLIST); serverInfo = JsonObject::Instance()->getServer(JsonObject::WORKLIST);
mSettingsArea->setServerAETitle(serverInfo.ae); mSettingsArea->setServerAETitle(serverInfo.ae);
mSettingsArea->setServerIpAddress(serverInfo.ip); mSettingsArea->setServerIpAddress(serverInfo.ip);
mSettingsArea->setMyAETitle(serverInfo.name); mSettingsArea->setMyAETitle(serverInfo.localAE);
mSettingsArea->setServerPort(serverInfo.port); mSettingsArea->setServerPort(serverInfo.port);
} }
@@ -99,7 +99,7 @@ bool WorklistSettingsDialog::updateReferenceData()
host serverInfo; host serverInfo;
serverInfo.ip = serverIp; serverInfo.ip = serverIp;
serverInfo.ae = serverAETitle; serverInfo.ae = serverAETitle;
serverInfo.name = myAETitle; serverInfo.localAE = myAETitle;
serverInfo.port = serverPort; serverInfo.port = serverPort;
JsonObject::Instance()->setServer(JsonObject::WORKLIST, serverInfo); JsonObject::Instance()->setServer(JsonObject::WORKLIST, serverInfo);

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

@@ -61,7 +61,7 @@ SystemSettingForm::SystemSettingForm(QWidget* parent)
if(DialogManager::Default()->requestPacsSettings() == QDialog::Accepted) if(DialogManager::Default()->requestPacsSettings() == QDialog::Accepted)
{ {
auto server = JsonObject::Instance()->getServer(JsonObject::PACS); auto server = JsonObject::Instance()->getServer(JsonObject::PACS);
emit pacsSettingsSaved(server.name, server.ae, server.ip, server.port.toInt()); emit pacsSettingsSaved(server.localAE, server.ae, server.ip, server.port.toInt());
} }
}); });

12
src/json/jsonobject.cpp
View File

@@ -70,27 +70,27 @@ void JsonObject::init()
mWorklistHost.ae = QString(getJsonString("worklist", "ae")); mWorklistHost.ae = QString(getJsonString("worklist", "ae"));
mWorklistHost.ip = QString(getJsonString("worklist", "ip")); mWorklistHost.ip = QString(getJsonString("worklist", "ip"));
mWorklistHost.name = QString(getJsonString("worklist", "name")); mWorklistHost.localAE = QString(getJsonString("worklist", "localAE"));
mWorklistHost.port = QString(getJsonString("worklist", "port")); mWorklistHost.port = QString(getJsonString("worklist", "port"));
mPacsHost.ae = QString(getJsonString("pacs", "ae")); mPacsHost.ae = QString(getJsonString("pacs", "ae"));
mPacsHost.ip = QString(getJsonString("pacs", "ip")); mPacsHost.ip = QString(getJsonString("pacs", "ip"));
mPacsHost.name = QString(getJsonString("pacs", "name")); mPacsHost.localAE = QString(getJsonString("pacs", "localAE"));
mPacsHost.port = QString(getJsonString("pacs", "port")); mPacsHost.port = QString(getJsonString("pacs", "port"));
mLocalHost.ae = QString(getJsonString("address", "ae")); mLocalHost.ae = QString(getJsonString("address", "ae"));
mLocalHost.ip = QString(getJsonString("address", "ip")); mLocalHost.ip = QString(getJsonString("address", "ip"));
mLocalHost.name = QString(getJsonString("address", "name")); mLocalHost.localAE = QString(getJsonString("address", "localAE"));
mLocalHost.port = QString(getJsonString("address", "port")); mLocalHost.port = QString(getJsonString("address", "port"));
mReconHost.ae = QString(getJsonString("recon", "ae")); mReconHost.ae = QString(getJsonString("recon", "ae"));
mReconHost.ip = QString(getJsonString("recon", "ip")); mReconHost.ip = QString(getJsonString("recon", "ip"));
mReconHost.name = QString(getJsonString("recon", "name")); mReconHost.localAE = QString(getJsonString("recon", "localAE"));
mReconHost.port = QString(getJsonString("recon", "port")); mReconHost.port = QString(getJsonString("recon", "port"));
mMppsHost.ae = QString(getJsonString("mpps", "ae")); mMppsHost.ae = QString(getJsonString("mpps", "ae"));
mMppsHost.ip = QString(getJsonString("mpps", "ip")); mMppsHost.ip = QString(getJsonString("mpps", "ip"));
mMppsHost.name = QString(getJsonString("mpps", "name")); mMppsHost.localAE = QString(getJsonString("mpps", "localAE"));
mMppsHost.port = QString(getJsonString("mpps", "port")); mMppsHost.port = QString(getJsonString("mpps", "port"));
mMppsOpen = getBool("mpps","open"); mMppsOpen = getBool("mpps","open");
@@ -447,7 +447,7 @@ void JsonObject::setServer(ServerType type, const host& list)
} }
setJsonString(typeName.toStdString().c_str(), "ae", list.ae.toStdString().c_str(), false); setJsonString(typeName.toStdString().c_str(), "ae", list.ae.toStdString().c_str(), false);
setJsonString(typeName.toStdString().c_str(), "ip", list.ip.toStdString().c_str(), false); setJsonString(typeName.toStdString().c_str(), "ip", list.ip.toStdString().c_str(), false);
setJsonString(typeName.toStdString().c_str(), "name", list.name.toStdString().c_str(), false); setJsonString(typeName.toStdString().c_str(), "localAE", list.localAE.toStdString().c_str(), false);
setJsonString(typeName.toStdString().c_str(), "port", list.port.toStdString().c_str(), false); setJsonString(typeName.toStdString().c_str(), "port", list.port.toStdString().c_str(), false);
savecfg(); savecfg();

2
src/json/jsonobject.h
View File

@@ -8,7 +8,7 @@ class QTranslator;
#include <QString> #include <QString>
struct host { struct host {
QString name; QString localAE;
QString ae; QString ae;
QString ip; QString ip;
QString port; QString port;

12
src/network/DicomCfgDialog.cpp
View File

@@ -48,21 +48,21 @@ void DicomCfgDialog::loadServersInfo()
mUi->recon_AE->setText(serverInfo.ae); mUi->recon_AE->setText(serverInfo.ae);
mUi->recon_IP->setText(serverInfo.ip); mUi->recon_IP->setText(serverInfo.ip);
mUi->recon_IP->setValidator(validator); mUi->recon_IP->setValidator(validator);
mUi->recon_Name->setText(serverInfo.name); mUi->recon_Name->setText(serverInfo.localAE);
mUi->recon_Port->setText(serverInfo.port); mUi->recon_Port->setText(serverInfo.port);
serverInfo = JsonObject::Instance()->getServer(JsonObject::PACS); serverInfo = JsonObject::Instance()->getServer(JsonObject::PACS);
mUi->pacs_AE->setText(serverInfo.ae); mUi->pacs_AE->setText(serverInfo.ae);
mUi->pacs_IP->setText(serverInfo.ip); mUi->pacs_IP->setText(serverInfo.ip);
mUi->pacs_IP->setValidator(validator); mUi->pacs_IP->setValidator(validator);
mUi->pacs_Name->setText(serverInfo.name); mUi->pacs_Name->setText(serverInfo.localAE);
mUi->pacs_Port->setText(serverInfo.port); mUi->pacs_Port->setText(serverInfo.port);
serverInfo = JsonObject::Instance()->getServer(JsonObject::WORKLIST); serverInfo = JsonObject::Instance()->getServer(JsonObject::WORKLIST);
mUi->wl_AE->setText(serverInfo.ae); mUi->wl_AE->setText(serverInfo.ae);
mUi->wl_IP->setText(serverInfo.ip); mUi->wl_IP->setText(serverInfo.ip);
mUi->wl_IP->setValidator(validator); mUi->wl_IP->setValidator(validator);
mUi->wl_Name->setText(serverInfo.name); mUi->wl_Name->setText(serverInfo.localAE);
mUi->wl_Port->setText(serverInfo.port); mUi->wl_Port->setText(serverInfo.port);
} }
@@ -72,19 +72,19 @@ void DicomCfgDialog::saveServersInfo()
host serverInfo; host serverInfo;
serverInfo.ae = mUi->recon_AE->text(); serverInfo.ae = mUi->recon_AE->text();
serverInfo.ip = mUi->recon_IP->text(); serverInfo.ip = mUi->recon_IP->text();
serverInfo.name = mUi->recon_Name->text(); serverInfo.localAE = mUi->recon_Name->text();
serverInfo.port = mUi->recon_Port->text(); serverInfo.port = mUi->recon_Port->text();
JsonObject::Instance()->setServer(JsonObject::RECON, serverInfo); JsonObject::Instance()->setServer(JsonObject::RECON, serverInfo);
serverInfo.ae = mUi->pacs_AE->text(); serverInfo.ae = mUi->pacs_AE->text();
serverInfo.ip = mUi->pacs_IP->text(); serverInfo.ip = mUi->pacs_IP->text();
serverInfo.name = mUi->pacs_Name->text(); serverInfo.localAE = mUi->pacs_Name->text();
serverInfo.port = mUi->pacs_Port->text(); serverInfo.port = mUi->pacs_Port->text();
JsonObject::Instance()->setServer(JsonObject::PACS, serverInfo); JsonObject::Instance()->setServer(JsonObject::PACS, serverInfo);
serverInfo.ip = mUi->wl_IP->text(); serverInfo.ip = mUi->wl_IP->text();
serverInfo.ae = mUi->wl_AE->text(); serverInfo.ae = mUi->wl_AE->text();
serverInfo.name = mUi->wl_Name->text(); serverInfo.localAE = mUi->wl_Name->text();
serverInfo.port = mUi->wl_Port->text(); serverInfo.port = mUi->wl_Port->text();
JsonObject::Instance()->setServer(JsonObject::WORKLIST, serverInfo); JsonObject::Instance()->setServer(JsonObject::WORKLIST, serverInfo);
} }

6
src/network/NetworkCfgDialog.cpp
View File

@@ -211,7 +211,7 @@ bool NetworkCfgDialog::isJsonModified()
{ {
return true; return true;
} }
if (mUi->daq_Name->text() != hostInfo.name) if (mUi->daq_Name->text() != hostInfo.localAE)
{ {
return true; return true;
} }
@@ -227,7 +227,7 @@ void NetworkCfgDialog::loadJsonData()
const host& hostInfo = NetworkManager::getLocalHost(); const host& hostInfo = NetworkManager::getLocalHost();
mUi->daq_AE->setText(hostInfo.ae); mUi->daq_AE->setText(hostInfo.ae);
mUi->daq_IP->setText(hostInfo.ip); mUi->daq_IP->setText(hostInfo.ip);
mUi->daq_Name->setText(hostInfo.name); mUi->daq_Name->setText(hostInfo.localAE);
mUi->daq_Port->setText(hostInfo.port); mUi->daq_Port->setText(hostInfo.port);
} }
@@ -236,7 +236,7 @@ void NetworkCfgDialog::saveJsonData()
host hostInfo; host hostInfo;
hostInfo.ip = mUi->daq_IP->text(); hostInfo.ip = mUi->daq_IP->text();
hostInfo.ae = mUi->daq_AE->text(); hostInfo.ae = mUi->daq_AE->text();
hostInfo.name = mUi->daq_Name->text(); hostInfo.localAE = mUi->daq_Name->text();
hostInfo.port = mUi->daq_Port->text(); hostInfo.port = mUi->daq_Port->text();
NetworkManager::setLocalHost(hostInfo); NetworkManager::setLocalHost(hostInfo);
} }