From 84d72bbd83a06ff57fc335b85e7392709d03aa60 Mon Sep 17 00:00:00 2001 From: xueyan hu <576627988@qq.com> Date: Thu, 30 Dec 2021 13:33:16 +0800 Subject: [PATCH] translation improvement 6 --- src/ScanFormWidget.cpp | 2 + src/patientinformationform.cpp | 96 +++++++++++++++++---------------- src/translations/en_US.ts | 8 +++ src/translations/en_US.ts.bak | 4 ++ src/translations/zh_CN.qm | Bin 10018 -> 10143 bytes src/translations/zh_CN.ts | 18 +++++-- src/translations/zh_CN.ts.bak | 18 +++++-- 7 files changed, 95 insertions(+), 51 deletions(-) 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 e35ce1460bf4b3f64c94373ad911c8e7bde35218..5a66488d867fce3e32f74b660b7c6505ee433d97 100644 GIT binary patch delta 906 zcmXAoSx8h-7{~u}=bjnwjCWib9cOW_w@6x*GR2|PLd_Y&#uAejBg&+x#ER;nq{LDx zv!-L2kZo8XYF36tWl%|I3%!&r_F!4Qv?tb6(g)|^^5g9P^ZU-dwDf%Ngx#3{U?*U! z0_0-A^-<7sJT%*}{|PmQ0WD2XzYVbYfSL@hT|1Kv*H zc{bqu38|dMBCZH}cR{W{0L0&bd{+ic*97A}3rgO%pr3C8sZdKb%GH6Eq z0m}z=FlT@)&S3Q&^XSSY?CeacS+qmYS;19fP`_n5nVLhDY7z95nTvB}y66sb{fj1Y zKgO$!4(EMyd;JJS)y-WMMBAXCR?0h#TA)|SfBTM}Qh~B*B$H%*Rko}Nr;~@3Ev2(a z)>>ujH3ucARR*%hY42v`*}@7+GN4RoG~a&8vZ|bP#n^d_tWB@Aly$rU;#`&s=~Sw? zpw)b58R;ppDp}X5gkEdzb_zS delta 863 zcmXAnYegz@pGZ6cQmb(IR6~ z_LgR7H#7)mic1>h7t=y3>5EyWQesFSOro2S6dn41`n~55&w0=DoO9E4C;yV(6bzsW z2&x6dBEVe3X^C!GC)FLM;saot;B>eEmJDd)frKF9ejuxh-cE2zgPfK;Aom&RGJuJ6 z!1NHp(Pcn)m(!+!=sp8jb09tz0snqZqleR00dcAsXnA3BwD3JwQ2XQvkkpF>vbDCrI&yV^S z7G;X$w^HeT)kbT1q`Y3Hr&9u_(#LXQ6fWBB=zvBm>@Tsq+rPGgV)b|JIT>Z9dw$;y2t0uWwbZ&0iNo@mM+6xn8 zT{p{V>(q{pZKW}Wv{R!WsmF?Tv5=^0(|#_e2px25ELvyyr2FYVOrDF5)7vla7WQ86 V-DR#|-mmsJrQ8u=l9Shz`~&x$)x7`! 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 - 扫描协议 + 默认扫描协议