feat: change some display text, cause by foo

src/components/AccountRoleComboDelegate.cpp

@@ -1,17 +1,36 @@
 #include "AccountRoleComboDelegate.h"
-
 #include <QPainter>
 
-#include "db/SQLHelper.h"
+namespace
+{
+    enum ROLE_STRING { ADMIN = 0,  DOCTOR};
+}
+
 AccountRoleComboDelegate::AccountRoleComboDelegate(QWidget *parent):QItemDelegate(parent) {
-    SQLHelper::QueryMap("select RoleID,RoleName from Role", mRoleMap);
+    initRoleString();
 }
 
 //相较于直接在paint里面操作，这是一个更好的选择，可以直接改变Display，而不影响前后景的绘制。
 void AccountRoleComboDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect,
                                            const QString &text) const {
     //绘制文本
-    painter->drawText(option.rect, Qt::TextWordWrap | Qt::AlignCenter , mRoleMap[text].toString());
+    QString roleString;
+    switch (mRoleMap[text].toInt())
+    {
+        case ADMIN: roleString = tr("admin");
+        break;
+        case DOCTOR: roleString = tr("doctor");
+        break;
+        default: roleString = "unknow";
+        break;
+    }
+    painter->drawText(option.rect, Qt::TextWordWrap | Qt::AlignCenter , roleString);
+}
+
+void AccountRoleComboDelegate::initRoleString()
+{
+    mRoleMap.insert("0001", ADMIN);
+    mRoleMap.insert("0002", DOCTOR);
 }
 
 

src/components/AccountRoleComboDelegate.h

@@ -12,6 +12,8 @@ public:
 protected:
     void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option,
                              const QRect &rect, const QString &text) const override ;
+private:
+    void initRoleString();
 
 private:
     QMap<QString,QVariant> mRoleMap ;

src/device/DeviceManager.cpp

@@ -409,7 +409,7 @@ void DeviceManager::processScanProgress(const QString& aProgress)
         }
         case 3:
         {
-            QVariant var( tr("Data quality assessment in progress\nprogress:99%"));
+            QVariant var(tr("Patient can leave.\nprogress:%1%").arg(msg));
             TRIGGER_EVENT(InvokeOperationProgress, nullptr, (QObject *) &var);
             break;
         }

src/dialogs/AccountFormDialog.cpp

@@ -15,7 +15,7 @@
 #include "components/ULineEdit.h"
 #include "DialogManager.h"
 
-AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::WindowFlags f)
+AccountFormDialog::AccountFormDialog(const QString& aTitle, QWidget* parent, AccountEditMode mode, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
     , mUserNameChanged(false)
     , mCommentChanged(false)
@@ -32,7 +32,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
 {
     auto layout = new QVBoxLayout(mFormWidget);
     layout->setSpacing(10);
-    addTitleLabel(layout);
+    addTitleLabel(aTitle, layout);
     initUserCodeUI(layout);
     initUserNameUI(layout);
     if (mMode == New) addNewModeUI(layout);
@@ -141,11 +141,11 @@ void AccountFormDialog::initUserCodeUI(QVBoxLayout* layout)
     addEndLine(layout);
 }
 
-void AccountFormDialog::addTitleLabel(QVBoxLayout* layout)
+void AccountFormDialog::addTitleLabel(const QString& aTitle, QVBoxLayout* layout)
 {
     auto lblTitle = new QLabel(this);
     lblTitle->setAlignment(Qt::AlignCenter);
-    lblTitle->setText(tr("Account"));
+    lblTitle->setText(aTitle);
     lblTitle->setObjectName("title");
     layout->addWidget(lblTitle);
 }

src/dialogs/AccountFormDialog.h

@@ -14,7 +14,7 @@ enum AccountEditMode {
 class AccountFormDialog :public  GUIFormBaseDialog {
     Q_OBJECT
 public:
-    explicit AccountFormDialog(QWidget* parent = nullptr, AccountEditMode mode = Self, Qt::WindowFlags f = Qt::WindowFlags());
+    explicit AccountFormDialog(const QString& aTitle, QWidget* parent = nullptr, AccountEditMode mode = Self, Qt::WindowFlags f = Qt::WindowFlags());
     ~AccountFormDialog() override = default;
     void setAccountInformation(const QMap<QString, QVariant>& values);
     void setReferenceModel(QSqlTableModel* model)
@@ -29,7 +29,7 @@ private:
     void addEndLine(QVBoxLayout* layout);
     void addNewModeUI(QVBoxLayout* layout);
     void addSelfModeUI(QHBoxLayout* layout);
-    void addTitleLabel(QVBoxLayout* layout);
+    void addTitleLabel(const QString& aTitle, QVBoxLayout* layout);
     void initUserCodeUI(QVBoxLayout* layout);
     void initUserNameUI(QVBoxLayout* layout);
     void addCommentLabel(QVBoxLayout* layout);

src/dialogs/DialogManager.cpp

@@ -154,7 +154,7 @@ DialogResult DialogManager::requestResetAdminPwd()
 }
 
 int DialogManager::requestAddAccount(QSqlTableModel* model) {
-    AccountFormDialog dialog(mTopWidget, New);
+    AccountFormDialog dialog(tr("Add Account"), mTopWidget, New);
     setTopWidget(&dialog);
     dialog.setWindowModality(Qt::WindowModal);
     dialog.setReferenceModel(model);
@@ -164,7 +164,7 @@ int DialogManager::requestAddAccount(QSqlTableModel* model) {
 }
 
 int DialogManager::requestEditSelfAccount() {
-    AccountFormDialog dialog(mTopWidget, Self);
+    AccountFormDialog dialog(tr("Edit Account"), mTopWidget, Self);
     setTopWidget(&dialog);
     dialog.setWindowModality(Qt::WindowModal);
     int ret =  dialog.exec();
@@ -173,7 +173,7 @@ int DialogManager::requestEditSelfAccount() {
 }
 
 int DialogManager::requestEditAdminAccount(const QMap<QString, QVariant>& values) {
-    AccountFormDialog dialog(mTopWidget, Admin);
+    AccountFormDialog dialog(tr("Edit Account"), mTopWidget, Admin);
     setTopWidget(&dialog);
     dialog.setAccountInformation(values);
     dialog.setWindowModality(Qt::WindowModal);
@@ -193,7 +193,8 @@ void DialogManager::requestChangePassword() {
 
 int DialogManager::requestEditPatientInfo(PatientInformation* aPatientFrom, QSqlTableModel* aModel)
 {
-    EditPatientDialog dialog(mTopWidget);
+    QString title = aPatientFrom == nullptr ? tr("Add Patient") : tr("Edit Patient");
+    EditPatientDialog dialog(title, mTopWidget);
     setTopWidget(&dialog);
     dialog.setWindowModality(Qt::WindowModal);
     dialog.setPatientInformation(aPatientFrom);

src/dialogs/EditPatientDialog.cpp

@@ -33,14 +33,14 @@ namespace
     }
 }
 
-EditPatientDialog::EditPatientDialog(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f)
+EditPatientDialog::EditPatientDialog(const QString& aTitle, QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f)
 {
     QVBoxLayout* layout = new QVBoxLayout(mFormWidget);
     layout->setSpacing(10);
     // add title
     QLabel* lbl_title = new QLabel(this);
     lbl_title->setAlignment(Qt::AlignCenter);
-    lbl_title->setText(tr("Edit Patient"));
+    lbl_title->setText(aTitle);
     lbl_title->setObjectName("title");
     layout->addWidget(lbl_title);
 

src/dialogs/EditPatientDialog.h

@@ -12,7 +12,7 @@ class QSqlTableModel;
 class EditPatientDialog :public  GUIFormBaseDialog {
     Q_OBJECT
 public:
-    explicit EditPatientDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+    explicit EditPatientDialog(const QString& aTitle, QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     ~EditPatientDialog();
 
     void setModel(QSqlTableModel* m)

src/translations/en_US.ts

@@ -77,10 +77,6 @@
 </context>
 <context>
     <name>AccountFormDialog</name>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -174,6 +170,17 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AccountRoleComboDelegate</name>
+    <message>
+        <source>admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>doctor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AccountTableForm</name>
     <message>
@@ -350,11 +357,6 @@
 progress:%1%</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Data quality assessment in progress
-progress:99%</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Recon error, can&apos;t start scan process</source>
         <translation type="unfinished"></translation>
@@ -427,6 +429,22 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <source>The right emergency button has been pressed. Please reset right the emergency button before operating the device</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Patient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Patient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DicomCfgDialog</name>
@@ -504,10 +522,6 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
 </context>
 <context>
     <name>EditPatientDialog</name>
-    <message>
-        <source>Edit Patient</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>

src/translations/zh_CN.ts

@@ -105,9 +105,8 @@
 <context>
     <name>AccountFormDialog</name>
     <message>
-        <location filename="../dialogs/AccountFormDialog.cpp" line="148"/>
         <source>Account</source>
-        <translation>账户</translation>
+        <translation type="vanished">账户</translation>
     </message>
     <message>
         <location filename="../dialogs/AccountFormDialog.cpp" line="135"/>
@@ -246,6 +245,19 @@
         <translation>提交至数据库失败！</translation>
     </message>
 </context>
+<context>
+    <name>AccountRoleComboDelegate</name>
+    <message>
+        <location filename="../components/AccountRoleComboDelegate.cpp" line="20"/>
+        <source>admin</source>
+        <translation type="unfinished">管理员</translation>
+    </message>
+    <message>
+        <location filename="../components/AccountRoleComboDelegate.cpp" line="22"/>
+        <source>doctor</source>
+        <translation type="unfinished">医生</translation>
+    </message>
+</context>
 <context>
     <name>AccountTableForm</name>
     <message>
@@ -483,16 +495,16 @@
     </message>
     <message>
         <location filename="../device/DeviceManager.cpp" line="405"/>
+        <location filename="../device/DeviceManager.cpp" line="412"/>
         <source>Patient can leave.
 progress:%1%</source>
         <translation type="unfinished">检查对象可以起身
 进度:%1%</translation>
     </message>
     <message>
-        <location filename="../device/DeviceManager.cpp" line="412"/>
         <source>Data quality assessment in progress
 progress:99%</source>
-        <translation type="unfinished">数据质量判断中
+        <translation type="obsolete">数据质量判断中
 进度:99%</translation>
     </message>
     <message>
@@ -627,12 +639,33 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <translation type="obsolete">过去7天</translation>
     </message>
     <message>
-        <location filename="../dialogs/DialogManager.cpp" line="681"/>
+        <location filename="../dialogs/DialogManager.cpp" line="157"/>
+        <source>Add Account</source>
+        <translation type="unfinished">新增账户</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/DialogManager.cpp" line="167"/>
+        <location filename="../dialogs/DialogManager.cpp" line="176"/>
+        <source>Edit Account</source>
+        <translation type="unfinished">编辑账户</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/DialogManager.cpp" line="196"/>
+        <source>Add Patient</source>
+        <translation type="unfinished">新增检查对象</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/DialogManager.cpp" line="196"/>
+        <source>Edit Patient</source>
+        <translation type="unfinished">编辑检查对象</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/DialogManager.cpp" line="682"/>
         <source>The left emergency button has been pressed. Please reset left the emergency button before operating the device</source>
         <translation type="unfinished">检查对象左侧急停按钮被按下，请将左侧急停按钮复位后，再进行设备操作</translation>
     </message>
     <message>
-        <location filename="../dialogs/DialogManager.cpp" line="690"/>
+        <location filename="../dialogs/DialogManager.cpp" line="691"/>
         <source>The right emergency button has been pressed. Please reset right the emergency button before operating the device</source>
         <translation type="unfinished">检查对象右侧急停按钮被按下，请将右侧急停按钮复位后，再进行设备操作</translation>
     </message>
@@ -741,14 +774,13 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
 <context>
     <name>EditPatientDialog</name>
     <message>
-        <location filename="../dialogs/EditPatientDialog.cpp" line="43"/>
         <source>Edit Patient</source>
-        <translation type="unfinished">编辑检查对象</translation>
+        <translation type="obsolete">编辑检查对象</translation>
     </message>
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="49"/>
         <source>ID </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">患者编码</translation>
     </message>
     <message>
         <source>Accession Number</source>
@@ -757,12 +789,12 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="61"/>
         <source>Name</source>
-        <translation type="unfinished">姓名</translation>
+        <translation type="unfinished">患者姓名</translation>
     </message>
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="73"/>
         <source>Gender</source>
-        <translation type="unfinished">性别</translation>
+        <translation type="unfinished">患者性别</translation>
     </message>
     <message>
         <location filename="../dialogs/EditPatientDialog.cpp" line="76"/>
@@ -1568,47 +1600,47 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <translation></translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="198"/>
+        <location filename="../windows/MainWindow.cpp" line="197"/>
-        <location filename="../windows/MainWindow.cpp" line="209"/>
+        <location filename="../windows/MainWindow.cpp" line="208"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="200"/>
+        <location filename="../windows/MainWindow.cpp" line="199"/>
-        <location filename="../windows/MainWindow.cpp" line="208"/>
+        <location filename="../windows/MainWindow.cpp" line="207"/>
         <source>Scan</source>
         <translation>扫描</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="196"/>
+        <location filename="../windows/MainWindow.cpp" line="195"/>
-        <location filename="../windows/MainWindow.cpp" line="210"/>
+        <location filename="../windows/MainWindow.cpp" line="209"/>
         <source>Recon</source>
         <translation>重建</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="175"/>
+        <location filename="../windows/MainWindow.cpp" line="174"/>
         <source>Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally.</source>
         <translation type="unfinished">请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="175"/>
+        <location filename="../windows/MainWindow.cpp" line="174"/>
-        <location filename="../windows/MainWindow.cpp" line="184"/>
+        <location filename="../windows/MainWindow.cpp" line="183"/>
-        <location filename="../windows/MainWindow.cpp" line="391"/>
+        <location filename="../windows/MainWindow.cpp" line="390"/>
         <source>Warning</source>
         <translation type="unfinished">警告</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="184"/>
+        <location filename="../windows/MainWindow.cpp" line="183"/>
         <source>There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time.</source>
         <translation type="unfinished">距离下次空水扫查还有%1天，请用户及时进行空水扫查。</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="222"/>
+        <location filename="../windows/MainWindow.cpp" line="221"/>
         <source>Shut down failed, please push emergency button to shutdown.</source>
         <translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="391"/>
+        <location filename="../windows/MainWindow.cpp" line="390"/>
         <source>Due to empty scan data corruption on the server, needs to be execute the empty scan. No other operations can be conducted until the scan is complete.</source>
         <translation type="unfinished">服务器端空水数据损坏，需要进行空水扫查，空水扫查结束前无法进行其他操作。</translation>
     </message>
@@ -1625,8 +1657,8 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <translation type="vanished">管理</translation>
     </message>
     <message>
-        <location filename="../windows/MainWindow.cpp" line="194"/>
+        <location filename="../windows/MainWindow.cpp" line="193"/>
-        <location filename="../windows/MainWindow.cpp" line="211"/>
+        <location filename="../windows/MainWindow.cpp" line="210"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
@@ -1900,7 +1932,7 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <location filename="../forms/select/PatientDetailForm.cpp" line="64"/>
         <location filename="../forms/select/PatientDetailForm.cpp" line="114"/>
         <source>Name</source>
-        <translation>姓名</translation>
+        <translation>患者姓名</translation>
     </message>
     <message>
         <source>Date Of Birth</source>
@@ -1914,7 +1946,7 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <location filename="../forms/select/PatientDetailForm.cpp" line="66"/>
         <location filename="../forms/select/PatientDetailForm.cpp" line="116"/>
         <source>Gender</source>
-        <translation>性别</translation>
+        <translation>患者性别</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -1952,7 +1984,7 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
         <location filename="../forms/select/PatientDetailForm.cpp" line="65"/>
         <location filename="../forms/select/PatientDetailForm.cpp" line="115"/>
         <source>PatientID</source>
-        <translation type="unfinished">检查对象ID</translation>
+        <translation type="unfinished">患者编码</translation>
     </message>
     <message>
         <location filename="../forms/select/PatientDetailForm.cpp" line="67"/>
@@ -2800,7 +2832,7 @@ parameters
     <message>
         <location filename="../forms/select/SelectFormWidget.cpp" line="344"/>
         <source>ID</source>
-        <translation type="unfinished">检查对象ID</translation>
+        <translation type="unfinished">患者编码</translation>
     </message>
     <message>
         <source>AccessionNumber</source>
@@ -2810,7 +2842,7 @@ parameters
         <location filename="../forms/select/SelectFormWidget.cpp" line="345"/>
         <location filename="../forms/select/SelectFormWidget.cpp" line="382"/>
         <source>Name</source>
-        <translation>姓名</translation>
+        <translation>患者姓名</translation>
     </message>
     <message>
         <location filename="../forms/select/SelectFormWidget.cpp" line="346"/>
@@ -2822,7 +2854,7 @@ parameters
         <location filename="../forms/select/SelectFormWidget.cpp" line="347"/>
         <location filename="../forms/select/SelectFormWidget.cpp" line="384"/>
         <source>Gender</source>
-        <translation>性别</translation>
+        <translation>患者性别</translation>
     </message>
     <message>
         <location filename="../forms/select/SelectFormWidget.cpp" line="348"/>
@@ -2946,7 +2978,7 @@ parameters
     <message>
         <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_StartScanProcessDialog.h" line="368"/>
         <source>Protocol Settings</source>
-        <translation type="unfinished">当前流程设置</translation>
+        <translation type="unfinished">检查协议设置</translation>
     </message>
     <message>
         <location filename="../../../build-GUI-Desktop_Qt_5_12_0_GCC_64bit-Default/ui_StartScanProcessDialog.h" line="370"/>
@@ -3346,13 +3378,13 @@ parameters
         <location filename="../forms/select/WorklistTableModel.cpp" line="8"/>
         <location filename="../forms/select/WorklistTableModel.cpp" line="131"/>
         <source>ID</source>
-        <translation type="unfinished">检查对象ID</translation>
+        <translation type="unfinished">患者编码</translation>
     </message>
     <message>
         <location filename="../forms/select/WorklistTableModel.cpp" line="8"/>
         <location filename="../forms/select/WorklistTableModel.cpp" line="131"/>
         <source>Name</source>
-        <translation type="unfinished">姓名</translation>
+        <translation type="unfinished">患者姓名</translation>
     </message>
     <message>
         <location filename="../forms/select/WorklistTableModel.cpp" line="8"/>
@@ -3364,7 +3396,7 @@ parameters
         <location filename="../forms/select/WorklistTableModel.cpp" line="8"/>
         <location filename="../forms/select/WorklistTableModel.cpp" line="131"/>
         <source>Gender</source>
-        <translation type="unfinished">性别</translation>
+        <translation type="unfinished">患者编码性别</translation>
     </message>
     <message>
         <location filename="../forms/select/WorklistTableModel.cpp" line="8"/>