From 1a1df72892896438ed3b28e67dc20cb877cd73fc Mon Sep 17 00:00:00 2001 From: sunwen Date: Fri, 30 May 2025 14:22:46 +0800 Subject: [PATCH] feat: change some display text, cause by foo --- src/components/AccountRoleComboDelegate.cpp | 27 ++++- src/components/AccountRoleComboDelegate.h | 2 + src/device/DeviceManager.cpp | 2 +- src/dialogs/AccountFormDialog.cpp | 8 +- src/dialogs/AccountFormDialog.h | 4 +- src/dialogs/DialogManager.cpp | 9 +- src/dialogs/EditPatientDialog.cpp | 4 +- src/dialogs/EditPatientDialog.h | 2 +- src/translations/en_US.ts | 40 +++++--- src/translations/zh_CN.ts | 104 +++++++++++++------- 10 files changed, 135 insertions(+), 67 deletions(-) diff --git a/src/components/AccountRoleComboDelegate.cpp b/src/components/AccountRoleComboDelegate.cpp index be2d60e..14345ed 100644 --- a/src/components/AccountRoleComboDelegate.cpp +++ b/src/components/AccountRoleComboDelegate.cpp @@ -1,17 +1,36 @@ #include "AccountRoleComboDelegate.h" - #include -#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); } diff --git a/src/components/AccountRoleComboDelegate.h b/src/components/AccountRoleComboDelegate.h index cd9f647..c76e703 100644 --- a/src/components/AccountRoleComboDelegate.h +++ b/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 mRoleMap ; diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 4c9c667..81f7125 100644 --- a/src/device/DeviceManager.cpp +++ b/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; } diff --git a/src/dialogs/AccountFormDialog.cpp b/src/dialogs/AccountFormDialog.cpp index b8671e8..0cfd705 100644 --- a/src/dialogs/AccountFormDialog.cpp +++ b/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); } diff --git a/src/dialogs/AccountFormDialog.h b/src/dialogs/AccountFormDialog.h index 69cfdd0..44313af 100644 --- a/src/dialogs/AccountFormDialog.h +++ b/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& 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); diff --git a/src/dialogs/DialogManager.cpp b/src/dialogs/DialogManager.cpp index 8885648..4e87c05 100644 --- a/src/dialogs/DialogManager.cpp +++ b/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& 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); diff --git a/src/dialogs/EditPatientDialog.cpp b/src/dialogs/EditPatientDialog.cpp index f6c264f..5fa7513 100644 --- a/src/dialogs/EditPatientDialog.cpp +++ b/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); diff --git a/src/dialogs/EditPatientDialog.h b/src/dialogs/EditPatientDialog.h index 7370146..d9b34e9 100644 --- a/src/dialogs/EditPatientDialog.h +++ b/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) diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index 2393a73..fe0bcdc 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -77,10 +77,6 @@ AccountFormDialog - - Account - - Name @@ -174,6 +170,17 @@ + + AccountRoleComboDelegate + + admin + + + + doctor + + + AccountTableForm @@ -350,11 +357,6 @@ progress:%1% - - Data quality assessment in progress -progress:99% - - Recon error, can't start scan process @@ -427,6 +429,22 @@ After lying down, click the confirm buttonto start scanning on the next side.The right emergency button has been pressed. Please reset right the emergency button before operating the device + + Add Account + + + + Edit Account + + + + Add Patient + + + + Edit Patient + + DicomCfgDialog @@ -504,10 +522,6 @@ After lying down, click the confirm buttonto start scanning on the next side. EditPatientDialog - - Edit Patient - - Name diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 2699482..0ea9b9c 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -105,9 +105,8 @@ AccountFormDialog - Account - 账户 + 账户 @@ -246,6 +245,19 @@ 提交至数据库失败！ + + AccountRoleComboDelegate + + + admin + 管理员 + + + + doctor + 医生 + + AccountTableForm @@ -483,16 +495,16 @@ + Patient can leave. progress:%1% 检查对象可以起身 进度:%1% - Data quality assessment in progress progress:99% - 数据质量判断中 + 数据质量判断中 进度:99% @@ -627,12 +639,33 @@ After lying down, click the confirm buttonto start scanning on the next side.过去7天 - + + Add Account + 新增账户 + + + + + Edit Account + 编辑账户 + + + + Add Patient + 新增检查对象 + + + + Edit Patient + 编辑检查对象 + + + The left emergency button has been pressed. Please reset left the emergency button before operating the device 检查对象左侧急停按钮被按下，请将左侧急停按钮复位后，再进行设备操作 - + The right emergency button has been pressed. Please reset right the emergency button before operating the device 检查对象右侧急停按钮被按下，请将右侧急停按钮复位后，再进行设备操作 @@ -741,14 +774,13 @@ After lying down, click the confirm buttonto start scanning on the next side. EditPatientDialog - Edit Patient - 编辑检查对象 + 编辑检查对象 ID - + 患者编码 Accession Number @@ -757,12 +789,12 @@ After lying down, click the confirm buttonto start scanning on the next side. Name - 姓名 + 患者姓名 Gender - 性别 + 患者性别 @@ -1568,47 +1600,47 @@ After lying down, click the confirm buttonto start scanning on the next side. - - + + Select 选择 - - + + Scan 扫描 - - + + Recon 重建 - + Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally. 请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。 - - - + + + Warning 警告 - + There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time. 距离下次空水扫查还有%1天，请用户及时进行空水扫查。 - + Shut down failed, please push emergency button to shutdown. 关机失败，请按紧急按钮进行关机。 - + 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. 服务器端空水数据损坏，需要进行空水扫查，空水扫查结束前无法进行其他操作。 @@ -1625,8 +1657,8 @@ After lying down, click the confirm buttonto start scanning on the next side.管理 - - + + Settings 设置 @@ -1900,7 +1932,7 @@ After lying down, click the confirm buttonto start scanning on the next side. Name - 姓名 + 患者姓名 Date Of Birth @@ -1914,7 +1946,7 @@ After lying down, click the confirm buttonto start scanning on the next side. Gender - 性别 + 患者性别 Edit @@ -1952,7 +1984,7 @@ After lying down, click the confirm buttonto start scanning on the next side. PatientID - 检查对象ID + 患者编码 @@ -2800,7 +2832,7 @@ parameters ID - 检查对象ID + 患者编码 AccessionNumber @@ -2810,7 +2842,7 @@ parameters Name - 姓名 + 患者姓名 @@ -2822,7 +2854,7 @@ parameters Gender - 性别 + 患者性别 @@ -2946,7 +2978,7 @@ parameters Protocol Settings - 当前流程设置 + 检查协议设置 @@ -3346,13 +3378,13 @@ parameters ID - 检查对象ID + 患者编码 Name - 姓名 + 患者姓名 @@ -3364,7 +3396,7 @@ parameters Gender - 性别 + 患者编码性别