diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json index 601c693..d0d8305 100644 --- a/cfgs/usct-product.json +++ b/cfgs/usct-product.json @@ -51,12 +51,6 @@ "name": "pacsserver22", "port": "102" }, - "daq": { - "ae": "MOON", - "ip": "127.0.0.3", - "name": "daq", - "port": "103" - }, "recon": { "ae": "TURTLE", "ip": "127.0.0.4", @@ -68,6 +62,9 @@ "dhcp": "true", "ip": "192.168.1.197", "mask": "255.255.255.0", + "ae": "MOON", + "name": "daq", + "port": "103", "additional": [{ "ip": "192.168.2.197", "netmask": "255.255.255.0" diff --git a/src/device/networkmanager.cpp b/src/device/networkmanager.cpp index 5a4db6b..18bbc0a 100644 --- a/src/device/networkmanager.cpp +++ b/src/device/networkmanager.cpp @@ -32,8 +32,16 @@ // args << "-c" << cmd; // myProcess->start("/bin/sh", args); //} +host NetworkManager::getLocalHost() +{ + return JsonObject::Instance()->getServer(JsonObject::LOCAL); +} - +bool NetworkManager::setLocalHost(const host& h) +{ + JsonObject::Instance()->setServer(JsonObject::LOCAL, h); + return true; +} QString NetworkManager::interfaceName() { return JsonObject::Instance()->interfaceName(); @@ -67,7 +75,7 @@ bool NetworkManager::restart(QString& err_info) QProcess* myProcess = new QProcess; QString inface = JsonObject::Instance()->interfaceName(); QString pwd = JsonObject::Instance()->passWord(); - QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface); + QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface); QStringList args; args << "-c" << cmd; connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater())); @@ -206,12 +214,12 @@ bool NetworkManager::setDefaultGateway(const QString& gw, QString& err_info) } -bool NetworkManager::checkPassWord(const QString &pwd,QString& err_info) +bool NetworkManager::checkPassWord(const QString& pwd, QString& err_info) { QProcess* myProcess = new QProcess; - //QString pwd = JsonObject::Instance()->passWord(); - QString cmd = QString("echo %1 | sudo -S -k whoami").arg(pwd); + //QString pwd = JsonObject::Instance()->passWord(); + QString cmd = QString("echo %1 | sudo -S -k whoami").arg(pwd); QStringList args; args << "-c" << cmd; connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater())); diff --git a/src/device/networkmanager.h b/src/device/networkmanager.h index 2d19ec5..36d91e4 100644 --- a/src/device/networkmanager.h +++ b/src/device/networkmanager.h @@ -10,6 +10,8 @@ class NetworkManager : public QObject { Q_OBJECT public: + static host getLocalHost(); + static bool setLocalHost(const host& h); //static NetworkManager* Instance(); //static void qIfConfig(const localhost& lhost); static QString interfaceName(); @@ -20,7 +22,7 @@ public: static QList getIpRouteList(); //static void setInterfaceName(const QString& name); - static bool checkPassWord(const QString &pwd,QString& err_info); + static bool checkPassWord(const QString& pwd, QString& err_info); static bool restart(QString& err_info); static bool setJsonDHCP(bool enable); diff --git a/src/dicomcfgdialog.ui b/src/dicomcfgdialog.ui new file mode 100644 index 0000000..4963ec7 --- /dev/null +++ b/src/dicomcfgdialog.ui @@ -0,0 +1,228 @@ + + + dicomCfgDialog + + + + 0 + 0 + 626 + 510 + + + + Dialog + + + + + + + + + DICOM Setting + + + Qt::AlignCenter + + + + + + + 2 + + + + Worklist + + + + + + Name + + + + + + + + + + IP + + + + + + + + + + Port + + + + + + + + + + + + + AE + + + + + + + + PACS + + + + + + Name + + + + + + + + + + AE + + + + + + + + + + IP + + + + + + + + + + Port + + + + + + + + + + + 3D Recon + + + + + + + + + AE + + + + + + + + + + IP + + + + + + + + + + Port + + + + + + + + + + Name + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel + + + + + + + + + + + + btn_group + accepted() + dicomCfgDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + btn_group + rejected() + dicomCfgDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/icons/dicomsettings.png b/src/icons/dicomsettings.png new file mode 100644 index 0000000..3e15f79 Binary files /dev/null and b/src/icons/dicomsettings.png differ diff --git a/src/icons/dicomsettings_d.png b/src/icons/dicomsettings_d.png new file mode 100644 index 0000000..f107249 Binary files /dev/null and b/src/icons/dicomsettings_d.png differ diff --git a/src/icons/networksettings.png b/src/icons/networksettings.png new file mode 100644 index 0000000..616a5f1 Binary files /dev/null and b/src/icons/networksettings.png differ diff --git a/src/icons/networksettings_d.png b/src/icons/networksettings_d.png new file mode 100644 index 0000000..ae39c64 Binary files /dev/null and b/src/icons/networksettings_d.png differ diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp index d239512..84796ec 100644 --- a/src/json/jsonobject.cpp +++ b/src/json/jsonobject.cpp @@ -281,8 +281,8 @@ host JsonObject::getServer(ServerType type) case JsonObject::PACS: typeName = "pacs"; break; - case JsonObject::DAQ: - typeName = "daq"; + case JsonObject::LOCAL: + typeName = "address"; break; case JsonObject::RECON: typeName = "recon"; @@ -310,8 +310,8 @@ void JsonObject::setServer(ServerType type, const host& list) case JsonObject::PACS: typeName = "pacs"; break; - case JsonObject::DAQ: - typeName = "daq"; + case JsonObject::LOCAL: + typeName = "address"; break; case JsonObject::RECON: typeName = "recon"; diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h index 468d908..9f255d3 100644 --- a/src/json/jsonobject.h +++ b/src/json/jsonobject.h @@ -38,7 +38,7 @@ public: } enum ServerType { - WORKLIST, PACS, DAQ, RECON + WORKLIST, PACS, LOCAL, RECON }; //for login diff --git a/src/network/dicomcfgdialog.cpp b/src/network/dicomcfgdialog.cpp new file mode 100644 index 0000000..3f4ad01 --- /dev/null +++ b/src/network/dicomcfgdialog.cpp @@ -0,0 +1,94 @@ +#include "dicomcfgdialog.h" +#include "ui_dicomcfgdialog.h" +#include +#include + +#include "json/jsonobject.h" +dicomCfgDialog::dicomCfgDialog(QWidget* parent) : + QDialog(parent), + ui(new Ui::dicomCfgDialog) +{ + ui->setupUi(this); + this->setObjectName("formDialog"); + this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); + + ui->btn_group->button(QDialogButtonBox::Apply)->setText(tr("Apply")); + ui->btn_group->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); + + loadServersInfo(); + + connect(ui->btn_group->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=]() + { + saveServersInfo(); + accept(); + }); + connect(ui->btn_group->button(QDialogButtonBox::Cancel), &QPushButton::clicked, [=]() + { + reject(); + }); + ui->tabWidget->setCurrentIndex(0); +} + +dicomCfgDialog::~dicomCfgDialog() +{ + delete ui; +} + + +void dicomCfgDialog::loadServersInfo() +{ + host h; + h = JsonObject::Instance()->getServer(JsonObject::RECON); + ui->recon_AE->setText(h.ae); + ui->recon_IP->setText(h.ip); + ui->recon_Name->setText(h.name); + ui->recon_Port->setText(h.port); + + h = JsonObject::Instance()->getServer(JsonObject::PACS); + ui->pacs_AE->setText(h.ae); + ui->pacs_IP->setText(h.ip); + ui->pacs_Name->setText(h.name); + ui->pacs_Port->setText(h.port); + + + h = JsonObject::Instance()->getServer(JsonObject::WORKLIST); + ui->wl_AE->setText(h.ae); + ui->wl_IP->setText(h.ip); + ui->wl_Name->setText(h.name); + ui->wl_Port->setText(h.port); + + + + //qIfConfig(lhost); + + +} + + +void dicomCfgDialog::saveServersInfo() +{ + + host h; + h.ae = ui->recon_AE->text(); + h.ip = ui->recon_IP->text(); + h.name = ui->recon_Name->text(); + h.port = ui->recon_Port->text(); + JsonObject::Instance()->setServer(JsonObject::RECON, h); + + h.ae = ui->pacs_AE->text(); + h.ip = ui->pacs_IP->text(); + h.name = ui->pacs_Name->text(); + h.port = ui->pacs_Port->text(); + JsonObject::Instance()->setServer(JsonObject::PACS, h); + + h.ip = ui->wl_IP->text(); + h.ae = ui->wl_AE->text(); + h.name = ui->wl_Name->text(); + h.port = ui->wl_Port->text(); + JsonObject::Instance()->setServer(JsonObject::WORKLIST, h); + + + + + +} \ No newline at end of file diff --git a/src/network/dicomcfgdialog.h b/src/network/dicomcfgdialog.h new file mode 100644 index 0000000..d6060ca --- /dev/null +++ b/src/network/dicomcfgdialog.h @@ -0,0 +1,25 @@ +#ifndef DICOMCFGDIALOG_H +#define DICOMCFGDIALOG_H + +#include + +namespace Ui { + class dicomCfgDialog; +} + +class dicomCfgDialog : public QDialog +{ + Q_OBJECT + +public: + explicit dicomCfgDialog(QWidget* parent = nullptr); + ~dicomCfgDialog(); + +private: + Ui::dicomCfgDialog* ui; + + void loadServersInfo(); + void saveServersInfo(); +}; + +#endif // DICOMCFGDIALOG_H diff --git a/src/network/networkcfgdialog.cpp b/src/network/networkcfgdialog.cpp index b74cb56..97b17fc 100644 --- a/src/network/networkcfgdialog.cpp +++ b/src/network/networkcfgdialog.cpp @@ -191,9 +191,39 @@ void networkCfgDialog::loadData() model_addr->loadData(NetworkManager::getIpAddrList()); model_route->loadData(NetworkManager::getIpRouteList()); + loadJsonData(); } -bool networkCfgDialog::isModified() +bool networkCfgDialog::isJsonModified() +{ + const host& h = NetworkManager::getLocalHost(); + if (ui->daq_AE->text() != h.ae) return true; + if (ui->daq_Name->text() != h.name) return true; + if (ui->daq_Port->text() != h.port)return true; + return false; +} + +void networkCfgDialog::loadJsonData() +{ + + const host& h = NetworkManager::getLocalHost(); + ui->daq_AE->setText(h.ae); + ui->daq_IP->setText(h.ip); + ui->daq_Name->setText(h.name); + ui->daq_Port->setText(h.port); +} + +void networkCfgDialog::saveJsonData() +{ + host h; + h.ip = ui->daq_IP->text(); + h.ae = ui->daq_AE->text(); + h.name = ui->daq_Name->text(); + h.port = ui->daq_Port->text(); + NetworkManager::setLocalHost(h); +} + +bool networkCfgDialog::isNetModified() { if (ui->sw_dhcp->getChecked() != NetworkManager::isDHCP()) return true; @@ -201,11 +231,14 @@ bool networkCfgDialog::isModified() if (ui->addr_ip->text() != default_addr.ip) return true; if (ui->addr_mask->text() != default_addr.mask) return true; if (ui->led_gw->text() != NetworkManager::getDefaultGateway())return true; + if (model_addr->getData() != NetworkManager::getIpAddrList())return true; if (model_route->getData() != NetworkManager::getIpRouteList()) return true; return false; } + + void networkCfgDialog::afterThreadStart() { msgDialog->showMessage("Saving Network Configuration..."); @@ -213,7 +246,6 @@ void networkCfgDialog::afterThreadStart() } void networkCfgDialog::beforeThreadExit() { - msgDialog->hide(); ui->output->setPlainText(err); myThread->deleteLater(); @@ -221,9 +253,12 @@ void networkCfgDialog::beforeThreadExit() void networkCfgDialog::applyData() { - + if (isJsonModified()) + { + saveJsonData(); + } //if it is the same as the old, just exit - if (!isModified()) + if (!isNetModified()) { accept(); return; diff --git a/src/network/networkcfgdialog.h b/src/network/networkcfgdialog.h index b8eafa8..9f05d33 100644 --- a/src/network/networkcfgdialog.h +++ b/src/network/networkcfgdialog.h @@ -29,7 +29,12 @@ public slots: void beforeThreadExit(); private: - bool isModified(); + bool isJsonModified(); + bool isNetModified(); + void loadJsonData(); + void saveJsonData(); + + const char* boolToStr(bool b) { return b ? "sucess" : "failed"; diff --git a/src/networkcfgdialog.ui b/src/networkcfgdialog.ui index 672d896..bfd40b6 100644 --- a/src/networkcfgdialog.ui +++ b/src/networkcfgdialog.ui @@ -7,7 +7,7 @@ 0 0 819 - 662 + 680 @@ -67,7 +67,7 @@ QLineEdit#led_inface{font-size:15px;border: 0px;} true - 0 + 2 @@ -103,7 +103,7 @@ QLineEdit#led_inface{font-size:15px;border: 0px;} - Dynamic Address + DHCP @@ -432,6 +432,76 @@ QLineEdit#led_inface{font-size:15px;border: 0px;} + + + DICOM + + + + + + + + + Name + + + + + + + + + + + + + + + + Port + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + AE + + + + + + + IP + + + + + + + false + + + + + + + + Result diff --git a/src/res.qrc b/src/res.qrc index 3038e07..5a629dd 100644 --- a/src/res.qrc +++ b/src/res.qrc @@ -27,6 +27,10 @@ icons/female_d.png icons/male_d.png icons/login.png + icons/dicomsettings.png + icons/dicomsettings_d.png + icons/networksettings.png + icons/networksettings_d.png fonts/DroidSansFallback.ttf translations/en_US.qm translations/zh_CN.qm diff --git a/src/systemsettingform.cpp b/src/systemsettingform.cpp index ff65c63..ebb8825 100644 --- a/src/systemsettingform.cpp +++ b/src/systemsettingform.cpp @@ -9,12 +9,14 @@ #include #include #include -#include "json/jsonobject.h" + #include "SelectDialog.h" #include "components/imageswitch.h" #include "network/networkcfgdialog.h" +#include "network/dicomcfgdialog.h" #include "network/getadminpsw.h" +#include "json/jsonobject.h" #include "event/EventCenter.h" systemSettingForm::systemSettingForm(QWidget* parent) : QWidget(parent), @@ -24,29 +26,27 @@ systemSettingForm::systemSettingForm(QWidget* parent) : //style init - ui->btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly); - ui->btnCancel->setIcon(QIcon(":/icons/close_circle.png")); - ui->btnCancel->setIconSize(QSize(50, 50)); - ui->btnAccept->setToolButtonStyle(Qt::ToolButtonIconOnly); - ui->btnAccept->setIcon(QIcon(":/icons/selected.png")); - ui->btnAccept->setIconSize(QSize(50, 50)); + //ui->btn_dicom->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + ui->btn_dicom->setIcon(QIcon(":/icons/dicomsettings.png")); + //ui->btn_dicom->setText(tr("DICOM")); + ui->btn_dicom->setIconSize(QSize(80, 80)); + + //ui->btn_network->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + ui->btn_network->setIcon(QIcon(":/icons/networksettings.png")); + //ui->btn_network->setText(tr("IP")); + ui->btn_network->setIconSize(QSize(80, 80)); + ui->swt_verify->setChecked(true); - //ui->swt_verify->setButtonStyle(ImageSwitch::ButtonStyle_1); - - - - ui->btnFlt->setFixedWidth(200); - ui->btnPro->setFixedWidth(200); - ui->lbl_protocal->setFixedWidth(100); - //lbl_filter - ui->lbl_list->setFixedWidth(100); + //ui->btnFlt->setFixedWidth(200); + //ui->btnPro->setFixedWidth(200); + //ui->lbl_protocal->setFixedWidth(100); ui->lbl_verify->setFixedWidth(100); //data init ui->btnPro->setText(JsonObject::Instance()->defaultProtocal()); ui->btnFlt->setText(JsonObject::Instance()->defaultFilter()); - loadServersInfo(); + //connection connect(ui->swt_verify, &ImageSwitch::clicked, [=]() { @@ -65,12 +65,15 @@ systemSettingForm::systemSettingForm(QWidget* parent) : dia.exec(); } }); - connect(ui->btnCancel, &QToolButton::clicked, [=]() { - loadServersInfo(); - }); - connect(ui->btnAccept, &QToolButton::clicked, [=]() { - saveServersInfo(); + + connect(ui->btn_dicom, &QToolButton::clicked, [=]() { + dicomCfgDialog dia(this); + dia.setWindowModality(Qt::WindowModal); + dia.exec(); }); + + + connect(ui->btnPro, &QPushButton::clicked, [=]() { if (!sd_protocal) { sd_protocal = new SelectDialog(this); @@ -116,84 +119,7 @@ systemSettingForm::~systemSettingForm() delete ui; } -void systemSettingForm::loadServersInfo() -{ - host h; - h = JsonObject::Instance()->getServer(JsonObject::RECON); - ui->recon_AE->setText(h.ae); - ui->recon_IP->setText(h.ip); - ui->recon_Name->setText(h.name); - ui->recon_Port->setText(h.port); - h = JsonObject::Instance()->getServer(JsonObject::PACS); - ui->pacs_AE->setText(h.ae); - ui->pacs_IP->setText(h.ip); - ui->pacs_Name->setText(h.name); - ui->pacs_Port->setText(h.port); - - - h = JsonObject::Instance()->getServer(JsonObject::DAQ); - ui->daq_AE->setText(h.ae); - ui->daq_IP->setText(h.ip); - ui->daq_Name->setText(h.name); - ui->daq_Port->setText(h.port); - - h = JsonObject::Instance()->getServer(JsonObject::WORKLIST); - ui->wl_AE->setText(h.ae); - ui->wl_IP->setText(h.ip); - ui->wl_Name->setText(h.name); - ui->wl_Port->setText(h.port); - - //localhost lhost = JsonObject::Instance()->getLocalHost(); - //local_IP->setIP(lhost.ip); - //local_Mask->setIP(lhost.mask); - //local_Gate->setIP(lhost.gateway); - - //qIfConfig(lhost); - - -} - - -void systemSettingForm::saveServersInfo() -{ - - host h; - h.ae = ui->recon_AE->text(); - h.ip = ui->recon_IP->text(); - h.name = ui->recon_Name->text(); - h.port = ui->recon_Port->text(); - JsonObject::Instance()->setServer(JsonObject::RECON, h); - - h.ae = ui->pacs_AE->text(); - h.ip = ui->pacs_IP->text(); - h.name = ui->pacs_Name->text(); - h.port = ui->pacs_Port->text(); - JsonObject::Instance()->setServer(JsonObject::PACS, h); - - h.ip = ui->wl_IP->text(); - h.ae = ui->wl_AE->text(); - h.name = ui->wl_Name->text(); - h.port = ui->wl_Port->text(); - JsonObject::Instance()->setServer(JsonObject::WORKLIST, h); - - - h.ip = ui->daq_IP->text(); - h.ae = ui->daq_AE->text(); - h.name = ui->daq_Name->text(); - h.port = ui->daq_Port->text(); - JsonObject::Instance()->setServer(JsonObject::DAQ, h); - - - //localhost lhost; - //lhost.ip = local_IP->getIP(); - //lhost.mask = local_Mask->getIP(); - //lhost.gateway = local_Gate->getIP(); - //JsonObject::Instance()->setLocalHost(lhost); - - //qIfConfig(lhost); - -} //void systemSettingForm::changeEvent(QEvent* event) //{ diff --git a/src/systemsettingform.h b/src/systemsettingform.h index 660122f..2e06b5a 100644 --- a/src/systemsettingform.h +++ b/src/systemsettingform.h @@ -27,9 +27,6 @@ private: Ui::systemSettingForm* ui; SelectDialog* sd_protocal = nullptr; SelectDialog* sd_filter = nullptr; - - void loadServersInfo(); - void saveServersInfo(); }; #endif // SYSTEMSETTINGFORM_H diff --git a/src/systemsettingform.ui b/src/systemsettingform.ui index 3ea5de6..fb28966 100644 --- a/src/systemsettingform.ui +++ b/src/systemsettingform.ui @@ -6,7 +6,7 @@ 0 0 - 619 + 515 612 @@ -20,49 +20,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - Network Setting - - - - - - - - 100 - 0 - - - - - - - - - - - Protocal - - - @@ -79,8 +36,15 @@ - - + + + + Worklist Filter + + + + + 100 @@ -92,10 +56,16 @@ - - + + + + + 100 + 0 + + - Worklist Filter + @@ -115,8 +85,12 @@ - - + + + + Protocal + + @@ -131,21 +105,43 @@ - - - - + + + + + 25 + 25 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + - + Qt::Horizontal + + QSizePolicy::Fixed + 40 @@ -154,6 +150,32 @@ + + + + + + + DICOM + + + Qt::ToolButtonTextBesideIcon + + + + + + + IP + + + Qt::ToolButtonTextBesideIcon + + + + + + @@ -166,27 +188,12 @@ 10 - - + + - + - - - - - - - - - - - - - - - @@ -194,14 +201,15 @@ - - + + - - - - - + + + + DAQ + + @@ -217,54 +225,8 @@ - - - - - - - PACS - - - - - - - - - - 3D Recon - - - - - - - - - - - 100 - 0 - - - - Worklist - - - - - - - DAQ - - - - - - - - + + @@ -273,43 +235,12 @@ - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Accept - - - - + @@ -332,6 +263,7 @@ ImageSwitch QWidget
components/imageswitch.h
+ 1 diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index dc5e130..851ffeb 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -554,6 +554,53 @@ parameters + + dicomCfgDialog + + Dialog + + + + DICOM Setting + + + + Name + + + + IP + + + + Port + + + + AE + + + + Worklist + + + + PACS + + + + 3D Recon + + + + Apply + + + + Cancel + + + networkCfgDialog @@ -564,10 +611,6 @@ parameters IP Address - - Dynamic Address - - Dev @@ -636,6 +679,30 @@ parameters Network Setting + + DHCP + + + + Name + + + + Port + + + + AE + + + + IP + + + + DICOM + + systemSettingForm @@ -643,10 +710,6 @@ parameters Form - - Network Setting - - Protocal @@ -671,18 +734,6 @@ parameters AE - - PACS - - - - 3D Recon - - - - Worklist - - DAQ @@ -692,11 +743,7 @@ parameters - Cancel - - - - Accept + DICOM diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak index dc5e130..851ffeb 100644 --- a/src/translations/en_US.ts.bak +++ b/src/translations/en_US.ts.bak @@ -554,6 +554,53 @@ parameters + + dicomCfgDialog + + Dialog + + + + DICOM Setting + + + + Name + + + + IP + + + + Port + + + + AE + + + + Worklist + + + + PACS + + + + 3D Recon + + + + Apply + + + + Cancel + + + networkCfgDialog @@ -564,10 +611,6 @@ parameters IP Address - - Dynamic Address - - Dev @@ -636,6 +679,30 @@ parameters Network Setting + + DHCP + + + + Name + + + + Port + + + + AE + + + + IP + + + + DICOM + + systemSettingForm @@ -643,10 +710,6 @@ parameters Form - - Network Setting - - Protocal @@ -671,18 +734,6 @@ parameters AE - - PACS - - - - 3D Recon - - - - Worklist - - DAQ @@ -692,11 +743,7 @@ parameters - Cancel - - - - Accept + DICOM diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm index 912f9e3..f470c62 100644 Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 2c84b41..c72ab70 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -773,84 +773,179 @@ parameters 日志时间 + + dicomCfgDialog + + + Dialog + + + + + DICOM Setting + DICOM 设置 + + + + + + Name + + + + + + + IP + + + + + + + Port + + + + + + + AE + + + + + Worklist + + + + + PACS + + + + + 3D Recon + + + + + Apply + 应用 + + + + Cancel + 取消 + + networkCfgDialog - + Network Settings 网络配置 - + Address IP配置 - + IP Address IP地址 - + Network Setting 网络配置 - Dynamic Address - 动态地址 + 动态地址 - + Dev 设备 - + Subnet Mask 子网掩码 - + Additional Address 额外地址 - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - + Routing 路由配置 - + Default IPv4 Gateway 默认网关 - + + DHCP + + + + Routing Table 路由表 - + + Name + + + + + Port + + + + + AE + + + + + IP + + + + + DICOM + + + + Result 结果 @@ -884,27 +979,30 @@ parameters systemSettingForm - + Form - Network Setting - 网络配置 + 网络配置 - + Protocal 扫描协议 - + Worklist Filter Worklist过滤器 - + ... + DICOM + + + Auto Verify 自动验证 @@ -913,54 +1011,43 @@ parameters 配置 - + + IP - + Name 姓名 - + AE - - PACS - - - - - 3D Recon - - - - - Worklist - - - - + DAQ - + Port - Cancel - 取消 + 取消 - Accept - 接受 + 接受 + + + + DICOM + diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak index 2c84b41..c72ab70 100644 --- a/src/translations/zh_CN.ts.bak +++ b/src/translations/zh_CN.ts.bak @@ -773,84 +773,179 @@ parameters 日志时间 + + dicomCfgDialog + + + Dialog + + + + + DICOM Setting + DICOM 设置 + + + + + + Name + + + + + + + IP + + + + + + + Port + + + + + + + AE + + + + + Worklist + + + + + PACS + + + + + 3D Recon + + + + + Apply + 应用 + + + + Cancel + 取消 + + networkCfgDialog - + Network Settings 网络配置 - + Address IP配置 - + IP Address IP地址 - + Network Setting 网络配置 - Dynamic Address - 动态地址 + 动态地址 - + Dev 设备 - + Subnet Mask 子网掩码 - + Additional Address 额外地址 - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - + Routing 路由配置 - + Default IPv4 Gateway 默认网关 - + + DHCP + + + + Routing Table 路由表 - + + Name + + + + + Port + + + + + AE + + + + + IP + + + + + DICOM + + + + Result 结果 @@ -884,27 +979,30 @@ parameters systemSettingForm - + Form - Network Setting - 网络配置 + 网络配置 - + Protocal 扫描协议 - + Worklist Filter Worklist过滤器 - + ... + DICOM + + + Auto Verify 自动验证 @@ -913,54 +1011,43 @@ parameters 配置 - + + IP - + Name 姓名 - + AE - - PACS - - - - - 3D Recon - - - - - Worklist - - - - + DAQ - + Port - Cancel - 取消 + 取消 - Accept - 接受 + 接受 + + + + DICOM +