diff --git a/src/ScanFormWidget.cpp b/src/ScanFormWidget.cpp
index ad625bf..e5e4824 100644
--- a/src/ScanFormWidget.cpp
+++ b/src/ScanFormWidget.cpp
@@ -248,6 +248,8 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
lbl_Protocol->setText(tr("Protocol"));
lblPreview->setText(tr("Preview Parameters"));
lblParams->setText(tr("Scan Parameters"));
+ lbl_e->setText(tr("some settings\n\nparameters\n"));
+ lbl_e2->setText(tr("some settings\n\nparameters\n"));
});
diff --git a/src/patientinformationform.cpp b/src/patientinformationform.cpp
index 3efea0a..b094f26 100644
--- a/src/patientinformationform.cpp
+++ b/src/patientinformationform.cpp
@@ -1,62 +1,68 @@
#include "patientinformationform.h"
#include "ui_patientinformationform.h"
#include "json/cJSON.h"
-PatientInformationForm::PatientInformationForm(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::PatientInformationForm)
+#include "event/EventCenter.h"
+
+PatientInformationForm::PatientInformationForm(QWidget* parent) :
+ QWidget(parent),
+ ui(new Ui::PatientInformationForm)
{
- ui->setupUi(this);
- ui->lbl_ID->setText("");
- ui->lbl_Date->setText("");
- ui->lbl_Name->setText("");
- ui->lbl_Sex->setText("");
- ui->lbl_Acc->setText("");
+ ui->setupUi(this);
+ //ui->lbl_ID->setText(tr(""));
+ //ui->lbl_Date->setText(tr(""));
+ //ui->lbl_Name->setText(tr(""));
+ //ui->lbl_Sex->setText(tr(""));
+ //ui->lbl_Acc->setText(tr(""));
+
+ connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+ ui->retranslateUi(this);
+ });
}
PatientInformationForm::~PatientInformationForm()
{
- delete ui;
- delete inf;
- delete jsonstr;
+ delete ui;
+ delete inf;
+ delete jsonstr;
}
void PatientInformationForm::setPatientInformation(PatientInformation* information) {
- ui->lbl_ID->setText(information->ID);
- ui->lbl_Date->setText(information->BirthDate);
- ui->lbl_Name->setText(information->Name);
- ui->lbl_Sex->setText(information->Sex);
- inf = information;
+ ui->lbl_ID->setText(information->ID);
+ ui->lbl_Date->setText(information->BirthDate);
+ ui->lbl_Name->setText(information->Name);
+ ui->lbl_Sex->setText(information->Sex);
+ inf = information;
}
void PatientInformationForm::setProtocol(int type) {
- currentProtocol = type;
- switch(type)
- {
- case 0:
- ui->lbl_Protocol->setText("LEFT ONLY");
- break;
- case 1:
- default:
- ui->lbl_Protocol->setText("RIGHT ONLY");
- break;
- }
+ currentProtocol = type;
+ switch (type)
+ {
+ case 0:
+ ui->lbl_Protocol->setText(tr("LEFT ONLY"));
+ break;
+ case 1:
+ default:
+ ui->lbl_Protocol->setText(tr("RIGHT ONLY"));
+ break;
+ }
}
-const char *PatientInformationForm::getCurrentPatientJsonString(bool empty) {
- cJSON* root=cJSON_CreateObject();
- cJSON_AddItemToObject(root, "PatientName",cJSON_CreateString(ui->lbl_Name->text().replace(' ','_').toStdString().data()));
- cJSON_AddItemToObject(root, "PatientID",cJSON_CreateString(ui->lbl_ID->text().replace(' ','_').toStdString().data()));
- cJSON_AddItemToObject(root, "PatientSex",cJSON_CreateString(ui->lbl_Sex->text().toStdString().data()));
- cJSON_AddItemToObject(root, "PatientBirthDate",
- cJSON_CreateString(ui->lbl_Date->text().replace("/","").replace("-","").replace(' ','.').toStdString().data()));
- cJSON_AddItemToObject(root, "Laterality",cJSON_CreateString(currentProtocol?"R":"L"));
- cJSON_AddItemToObject(root, "IsEmptyData",cJSON_CreateNumber(empty?1:0));
- cJSON_AddItemToObject(root, "OperatorName",cJSON_CreateString("Bob"));
- cJSON_AddItemToObject(root, "ReferringPhysicianName",cJSON_CreateString("XX"));
- cJSON_AddItemToObject(root, "InstitutionName",cJSON_CreateString("EQ9"));
- cJSON_AddItemToObject(root, "InstitutionAddress",cJSON_CreateString("HZ"));
- delete jsonstr;
- jsonstr = cJSON_Print(root);
- cJSON_Delete(root);
- return jsonstr;
+const char* PatientInformationForm::getCurrentPatientJsonString(bool empty) {
+ cJSON* root = cJSON_CreateObject();
+ cJSON_AddItemToObject(root, "PatientName", cJSON_CreateString(ui->lbl_Name->text().replace(' ', '_').toStdString().data()));
+ cJSON_AddItemToObject(root, "PatientID", cJSON_CreateString(ui->lbl_ID->text().replace(' ', '_').toStdString().data()));
+ cJSON_AddItemToObject(root, "PatientSex", cJSON_CreateString(ui->lbl_Sex->text().toStdString().data()));
+ cJSON_AddItemToObject(root, "PatientBirthDate",
+ cJSON_CreateString(ui->lbl_Date->text().replace("/", "").replace("-", "").replace(' ', '.').toStdString().data()));
+ cJSON_AddItemToObject(root, "Laterality", cJSON_CreateString(currentProtocol ? "R" : "L"));
+ cJSON_AddItemToObject(root, "IsEmptyData", cJSON_CreateNumber(empty ? 1 : 0));
+ cJSON_AddItemToObject(root, "OperatorName", cJSON_CreateString("Bob"));
+ cJSON_AddItemToObject(root, "ReferringPhysicianName", cJSON_CreateString("XX"));
+ cJSON_AddItemToObject(root, "InstitutionName", cJSON_CreateString("EQ9"));
+ cJSON_AddItemToObject(root, "InstitutionAddress", cJSON_CreateString("HZ"));
+ delete jsonstr;
+ jsonstr = cJSON_Print(root);
+ cJSON_Delete(root);
+ return jsonstr;
}
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index cf6dde5..a712ca6 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -424,6 +424,10 @@
LEFT ONLY
+
+ RIGHT ONLY
+
+
RollingMessageWidget
@@ -600,6 +604,10 @@ parameters
DICOM Settings
+
+ ...
+
+
networkCfgDialog
diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak
index 41e34d5..a712ca6 100644
--- a/src/translations/en_US.ts.bak
+++ b/src/translations/en_US.ts.bak
@@ -424,6 +424,10 @@
LEFT ONLY
+
+ RIGHT ONLY
+
+
RollingMessageWidget
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index e35ce14..5a66488 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 8e33ed0..b7fda39 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -588,12 +588,22 @@
+
LEFT ONLY
左侧
+ Name
+ 姓名
+
+
+ Gender
+ 性别
+
+
+
RIGHT ONLY
- 右侧
+ 右侧
@@ -662,6 +672,8 @@
+
+
some settings
parameters
@@ -827,7 +839,7 @@ parameters
...
- DICOM
+ DICOM
@@ -1001,7 +1013,7 @@ parameters
Protocal
- 扫描协议
+ 默认扫描协议
diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak
index 8e33ed0..b7fda39 100644
--- a/src/translations/zh_CN.ts.bak
+++ b/src/translations/zh_CN.ts.bak
@@ -588,12 +588,22 @@
+
LEFT ONLY
左侧
+ Name
+ 姓名
+
+
+ Gender
+ 性别
+
+
+
RIGHT ONLY
- 右侧
+ 右侧
@@ -662,6 +672,8 @@
+
+
some settings
parameters
@@ -827,7 +839,7 @@ parameters
...
- DICOM
+ DICOM
@@ -1001,7 +1013,7 @@ parameters
Protocal
- 扫描协议
+ 默认扫描协议