diff --git a/src/forms/select/PatientDetailForm.cpp b/src/forms/select/PatientDetailForm.cpp index ec8509f..31bfbea 100644 --- a/src/forms/select/PatientDetailForm.cpp +++ b/src/forms/select/PatientDetailForm.cpp @@ -6,102 +6,113 @@ #include #include #include +#include #include #include #include "event/EventCenter.h" PatientDetailForm::PatientDetailForm(QWidget* parent) : -QWidget(parent), -mUI(new Ui::PatientDetailForm) -, mBtnEdit(new QToolButton()) -, mBtnDelete(new QToolButton()) -, mBtnPlaceWidget(new QWidget(this)) -, mLblMessage(new QLabel(this)) +QWidget(parent) +, mLblPatInfTitle(new QLabel(this)) +, mLblDOB(new QLabel(this)) +, mLblName(new QLabel(this)) +, mLblPatID(new QLabel(this)) +, mLblSex(new QLabel(this)) +, mLblAccno(new QLabel(this)) +, mLblAddDate(new QLabel(this)) { - mUI->setupUi(this); - mUI->lblPatInfPanel->setObjectName("PatInfTitle"); - mUI->lblIcon->setObjectName("PatIcon"); - mUI->lbl_DOB->setObjectName("displayDetail"); - mUI->lbl_Name->setObjectName("displayDetail"); - mUI->lblPatID->setObjectName("displayDetail"); - mUI->lbl_Sex->setObjectName("displayDetail"); - mUI->lblAccno->setObjectName("displayDetail"); - mUI->lblAddDate->setObjectName("displayDetail"); - connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this,&PatientDetailForm::reloadLanguage); - mBtnPlaceWidget->setFixedHeight(120); - mUI->verticalLayout_2->setSpacing(50); + mLblPatInfTitle->setObjectName("PatInfTitle"); + mLblDOB->setObjectName("displayDetail"); + mLblName->setObjectName("displayDetail"); + mLblPatID->setObjectName("displayDetail"); + mLblSex->setObjectName("displayDetail"); + mLblAccno->setObjectName("displayDetail"); + mLblAddDate->setObjectName("displayDetail"); - mUI->verticalLayout_3->insertWidget(5, mBtnPlaceWidget); - mUI->verticalLayout_3->insertWidget(5, mLblMessage); - mLblMessage->setVisible(false); - QHBoxLayout * layout = new QHBoxLayout(mBtnPlaceWidget); - mBtnEdit->setObjectName("btnPatEdit"); - mBtnDelete->setObjectName("btnPatDelete"); - mBtnEdit->setText(tr("Edit")); - mBtnDelete->setText(tr("Delete")); - layout->addWidget(mBtnEdit); - layout->addWidget(mBtnDelete); - connect(mBtnEdit, &QToolButton::clicked, [=](){ - emit editClicked(); - }); - connect(mBtnDelete, &QToolButton::clicked, [=](){ - emit deleteClicked(); - }); - setBtnEnable(false); + auto layout = new QVBoxLayout(this); + // mLblPatInfTitle->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + mLblPatInfTitle->setAlignment(Qt::AlignCenter); + layout->addWidget(mLblPatInfTitle); + mLblPatInfTitle->setText(tr("Patient Detail")); + addDetailLabel(layout,tr("Name")+":", mLblName); + addDetailLabel(layout,tr("Gender")+":", mLblSex); + addDetailLabel(layout,tr("Birth Date")+":", mLblDOB); + addDetailLabel(layout,tr("PatientID")+":", mLblPatID); + addDetailLabel(layout,tr("AccNo")+":", mLblAccno); + + auto widgetLayout = new QHBoxLayout; + layout->addLayout(widgetLayout); + + mLblAddDateTitle = new QLabel(tr("Add Date")+":",this); + mLblAddDateTitle->setObjectName("displayTitle"); + widgetLayout->addWidget(mLblAddDateTitle); + widgetLayout->addWidget(mLblAddDate); + + connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this,&PatientDetailForm::reloadLanguage); + layout->addSpacerItem(new QSpacerItem(2,2,QSizePolicy::Expanding, QSizePolicy::Expanding)); +} + +void PatientDetailForm::addDetailLabel(QVBoxLayout *layout, const QString& aTitleText, QLabel* aLabel) +{ + auto widgetLayout = new QHBoxLayout; + layout->addLayout(widgetLayout); + + auto lblTitle = new QLabel(aTitleText,this); + mBtnList.append(lblTitle); + lblTitle->setObjectName("displayTitle"); + widgetLayout->addWidget(lblTitle); + widgetLayout->addWidget(aLabel); } void PatientDetailForm::reloadLanguage() { - mUI->retranslateUi(this); - mUI->lbl_Sex->setText(mStore.Sex == "F" ? tr("Female") : (mStore.Sex == "M" ? tr("Male") : tr("Other"))); + mLblSex->setText(mStore.Sex == "F" ? tr("Female") : (mStore.Sex == "M" ? tr("Male") : tr("Other"))); + QList strArray = {"Name","Gender","Birth Date","PatientID","AccNo"}; + for (size_t i = 0; i < strArray.length(); i++) + { + mBtnList[i]->setText(tr(strArray[i].data())+":"); + } + mLblAddDateTitle->setText(tr("Add Date")+":"); + mLblPatInfTitle->setText(tr("Patient Detail")); + } PatientDetailForm::~PatientDetailForm() { - delete mUI; + } void PatientDetailForm::setPatientInformation(PatientInformation* information) { if (information) { - mUI->lblPatID->setText(tr("PatientID: ")+information->ID); - mUI->lbl_DOB->setText(" "+information->BirthDate); - mUI->lbl_Name->setText(" "+information->Name); - mUI->lbl_Sex->setText(" "+ (information->Sex == "F" ? tr("Female") : (information->Sex == "M" ? tr("Male") : tr("Other")))); + mLblPatID->setText(information->ID); + mLblDOB->setText(information->BirthDate); + mLblName->setText(information->Name); + mLblSex->setText((information->Sex == "F" ? tr("Female") : (information->Sex == "M" ? tr("Male") : tr("Other")))); mCurrentPatientUID = information->PatientUID; - mUI->lblAddDate->setText(tr("Add Date: ")+ QDateTime::fromString(information->AddDate, Qt::ISODate).toString("yyyy-MM-dd HH:mm:ss")); - mUI->lblAccno->setText(tr("AccNo: ")+information->AccessionNumber); + mLblAddDate->setText(QDateTime::fromString(information->AddDate, Qt::ISODate).toString("yyyy-MM-dd HH:mm:ss")); + mLblAccno->setText(information->AccessionNumber); mStore = *information; - setBtnEnable(true); - } } void PatientDetailForm::clearPatientInformation() { - mUI->lblPatID->clear(); - mUI->lbl_DOB->clear(); - mUI->lbl_Name->clear(); - mUI->lbl_Sex->clear(); - mUI->lblAddDate->clear(); - mUI->lblAccno->clear(); + mLblPatID->clear(); + mLblDOB->clear(); + mLblName->clear(); + mLblSex->clear(); + mLblAddDate->clear(); + mLblAccno->clear(); } void PatientDetailForm::confirmModeOn(int protocol) { - mBtnPlaceWidget->setVisible(false); - mLblMessage->setVisible(true); - mUI->lblPatInfPanel->setText(tr("Scan with this Patient?")); - mUI->lblAddDate->setText(tr("Protocol: ")+(protocol==0?tr("Left"):tr("Right"))); - -} - -void PatientDetailForm::setBtnEnable(bool enable) -{ - mBtnDelete->setEnabled(enable); - mBtnEdit->setEnabled(enable); + mLblPatInfTitle->setText(tr("Scan with this Patient?")); + mLblAddDate->setText((protocol==0?tr("Left"):tr("Right"))); + mLblAddDateTitle->setText(tr("Protocol")); } void PatientDetailForm::storePatientInformation() { diff --git a/src/forms/select/PatientDetailForm.h b/src/forms/select/PatientDetailForm.h index 0a6b344..8c0e7f7 100644 --- a/src/forms/select/PatientDetailForm.h +++ b/src/forms/select/PatientDetailForm.h @@ -1,26 +1,26 @@ #ifndef EDITPATIENTFORM_H #define EDITPATIENTFORM_H -namespace Ui { -class PatientDetailForm; -} + #include #include "PatientInformation.h" class QToolButton; class QLabel; +class QVBoxLayout; class PatientDetailForm : public QWidget { Q_OBJECT public: explicit PatientDetailForm(QWidget *parent = nullptr); + void addDetailLabel(QVBoxLayout *layout, const QString& aTitleText, QLabel* aLabel); ~PatientDetailForm(); - void setPatientInformation(PatientInformation * information); - PatientInformation * getPatientInformation(){ + void setPatientInformation(PatientInformation *information); + PatientInformation *getPatientInformation() + { return &mStore; } - void clearPatientInformation(); void confirmModeOn(int protocol); - void setBtnEnable(bool enable); + void clearPatientInformation(); signals: void hideBtnClicked(); void editClicked(); @@ -29,14 +29,18 @@ signals: private: void storePatientInformation(); void reloadLanguage(); - Ui::PatientDetailForm *mUI; QString mCurrentPatientUID; QString mAddDate; PatientInformation mStore; - QWidget * mBtnPlaceWidget; - QToolButton *mBtnEdit; - QToolButton *mBtnDelete; - QLabel* mLblMessage; + QLabel* mLblPatInfTitle; + QLabel* mLblDOB; + QLabel* mLblName; + QLabel* mLblPatID; + QLabel* mLblSex; + QLabel* mLblAccno; + QLabel* mLblAddDate; + QLabel* mLblAddDateTitle; + QList mBtnList; }; #endif // EDITPATIENTFORM_H diff --git a/src/forms/select/PatientDetailForm.ui b/src/forms/select/PatientDetailForm.ui deleted file mode 100644 index a7c8bbd..0000000 --- a/src/forms/select/PatientDetailForm.ui +++ /dev/null @@ -1,207 +0,0 @@ - - - PatientDetailForm - - - - 0 - 0 - 400 - 466 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Patient Information - - - Qt::AlignCenter - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - 111 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Name - - - - - - - Gender - - - - - - - Date Of Birth - - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 200 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 30 - - - 0 - - - 10 - - - - - - - - - - - - <html><head/><body><p><br/></p></body></html> - - - - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp index 002397a..e6d23b5 100644 --- a/src/forms/select/SelectFormWidget.cpp +++ b/src/forms/select/SelectFormWidget.cpp @@ -9,6 +9,8 @@ #include #include #include +#include + #include #include #include @@ -25,11 +27,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : TabFormWidget(parent) -, mBtnAccount(new QToolButton(this)) -, mBtnWorklist(new QToolButton(this)) +, mBtnEdit(new QToolButton()) +, mBtnDelete(new QToolButton()) , mBtnAdd(new QToolButton(this)) , mBtnSelect(new QToolButton(this)) -, mBtnTurnOff(new QToolButton(this)) , mPatTable(new SlideTableView(this)) , mModel(nullptr) , patientDetailForm(new PatientDetailForm(this)) @@ -41,18 +42,25 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) //init command bar auto layout = new QHBoxLayout(); ui->commandWidget->setLayout(layout); - initGeneralButtons(layout); layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); - addVerticalLine(layout); initPatEditButtons(layout); initDataModel(); //Init content widget - auto* contentLayout = new QHBoxLayout(this->ui->contentWidget); + auto contantContanerLayout = new QVBoxLayout(this->ui->contentWidget); + contantContanerLayout->setMargin(0); + auto selectTabTitle = new QLabel(tr("Patient Information Manage")); + selectTabTitle->setObjectName("selectTabTitle"); + contantContanerLayout->addWidget(selectTabTitle); + auto contentLayout = new QHBoxLayout; + contantContanerLayout->addLayout(contentLayout); contentLayout->setContentsMargins(0, 0, 0, 0); initDetailPanel(contentLayout); addVerticalLine(contentLayout); - initTableView(contentLayout); + auto gridBox = new QVBoxLayout; + contentLayout->addLayout(gridBox); + initTableView(gridBox); + gridBox->addWidget(ui->commandWidget); //select default row 0 if (mModel->rowCount() > 0) { @@ -84,56 +92,43 @@ void SelectFormWidget::prepareButtons(bool disableALL) { bool stateFlag = (mPatTable->currentIndex().row() >= 0); mBtnAdd->setEnabled(!anonymousMode && !disableALL); - mBtnWorklist->setEnabled(!anonymousMode && !disableALL); - patientDetailForm->setBtnEnable(!anonymousMode && stateFlag && !disableALL); // if (mBtnAdd)mBtnEdit->setEnabled(!anonymousMode && stateFlag && !disableALL); // if (mBtnAdd)mBtnDelete->setEnabled(!anonymousMode&& stateFlag && !disableALL); mBtnSelect->setEnabled(stateFlag && !disableALL); } -void SelectFormWidget::initGeneralButtons(QHBoxLayout *layout) { - mBtnAccount->setObjectName("btnAccount"); - mBtnAccount->setText(tr("Account")); - layout->addWidget(mBtnAccount); - mBtnTurnOff->setObjectName("btnShutDown"); - mBtnTurnOff->setText(tr("ShutDown")); - layout->addWidget(mBtnTurnOff); - // mBtn account slot - connect(mBtnAccount, &QToolButton::clicked, DialogManager::Default(),&DialogManager::requestEditSelfAccount); - connect(mBtnTurnOff, &QToolButton::clicked, []() - { - if(DialogManager::Default()->requestAlertMessage(QString(tr("Shut down now ?")), DialogButtonMode::OkAndCancel,tr("Shut Down")) == QDialog::Accepted) - { - LOG_USER_OPERATION("Shut Down") - EventCenter::Default()->triggerEvent(GUIEvents::RequestShutdown, nullptr, nullptr); - } - }); - connect(mBtnWorklist, &QToolButton::clicked, [&]() - { - DialogManager::Default()->requestGetWorkList(); - }); -} - void SelectFormWidget::initPatEditButtons(QHBoxLayout *layout) { mBtnAdd->setObjectName("btnAdd"); - mBtnWorklist->setObjectName("btnWorklist"); + mBtnEdit->setObjectName("btnPatEdit"); + mBtnDelete->setObjectName("btnPatDelete"); mBtnSelect->setObjectName("btnSelect"); + + mBtnEdit->setText(tr("Edit")); + mBtnDelete->setText(tr("Delete")); mBtnAdd->setText(tr("Add")); mBtnSelect->setText(tr("Select")); - mBtnWorklist->setText(tr("Worklist")); layout->addWidget(mBtnAdd); - layout->addWidget(mBtnWorklist); + layout->addWidget(mBtnEdit); + layout->addWidget(mBtnDelete); + addVerticalLine(layout); layout->addWidget(mBtnSelect); // btn add slot connect(mBtnAdd, &QToolButton::clicked, this, &SelectFormWidget::editPatient); + // btn edit slot + connect(mBtnEdit, &QToolButton::clicked, this, &SelectFormWidget::editPatient); + + // btn del slot + connect(mBtnDelete, &QToolButton::clicked, this, &SelectFormWidget::delPatient); + // mBtn select slot connect(mBtnSelect, &QToolButton::clicked, this, &SelectFormWidget::selectPatient); } void SelectFormWidget::editPatient() { bool addFlag = sender() == mBtnAdd; + auto index = mPatTable->currentIndex(); // accept change if (DialogManager::Default()->requestEditPatientInfo(addFlag ? nullptr:patientDetailForm->getPatientInformation(),mModel) == QDialog::Accepted) { if (addFlag){ @@ -142,7 +137,8 @@ void SelectFormWidget::editPatient() { LOG_USER_OPERATION(QString("Add Patient, ID: %1").arg(patientDetailForm->getPatientInformation()->ID)) } else{ - mPatTable->clicked(mPatTable->currentIndex()); + mPatTable->selectRow(index.row()); + mModel->selectRow(index.row()); setPatientDetail(mPatTable, mModel, patientDetailForm); LOG_USER_OPERATION(QString("Edit Patient, ID: %1").arg(patientDetailForm->getPatientInformation()->ID)) } @@ -189,21 +185,10 @@ void SelectFormWidget::selectPatient() { void SelectFormWidget::initDetailPanel(QHBoxLayout *contentLayout) {// prepare edit panel patientDetailForm->setObjectName("patientDetailWidget"); - // patientDetailForm->hide(); contentLayout->addWidget(patientDetailForm); - auto* btnShowEdit = new VerticalTextToolButton(this); - btnShowEdit->setObjectName("btnShowPanel"); - btnShowEdit->setFixedHeight(225); - btnShowEdit->setVerticalText("Patient Detail"); - btnShowEdit->hide(); - contentLayout->addWidget(btnShowEdit); - contentLayout->setAlignment(btnShowEdit, Qt::AlignTop); - - connect(patientDetailForm, &PatientDetailForm::editClicked, this, &SelectFormWidget::editPatient); - connect(patientDetailForm, &PatientDetailForm::deleteClicked, this, &SelectFormWidget::delPatient); } -void SelectFormWidget::initTableView(QHBoxLayout *contentLayout) +void SelectFormWidget::initTableView(QLayout *contentLayout) { // TableView for patient mPatTable->setAlternatingRowColors(true); @@ -212,9 +197,8 @@ void SelectFormWidget::initTableView(QHBoxLayout *contentLayout) mPatTable->setSelectionBehavior(QAbstractItemView::SelectRows); mPatTable->verticalHeader()->setDefaultSectionSize(38); mPatTable->horizontalHeader()->setStretchLastSection(true); - //data from SQLITE -// -//avoid pan comsumed by tableview! + + //avoid pan comsumed by tableview! mPatTable->viewport()->ungrabGesture(Qt::PanGesture); mPatTable->setSortingEnabled(true); // enable sortingEnabled @@ -250,7 +234,7 @@ void SelectFormWidget::initTableView(QHBoxLayout *contentLayout) mPatTable->setItemDelegateForColumn(6, patientAddDateDelegate); } -void SelectFormWidget::initDataModel() {//TODO:单独初始化预防SQL错误 +void SelectFormWidget::initDataModel() { mModel = SQLHelper::getTable("Patient"); WorkListManager::getInstance()->setTableModel(mModel); mModel->sort(mModel->record().indexOf("AddDate"), Qt::DescendingOrder); @@ -302,9 +286,10 @@ void SelectFormWidget::reloadLanguage(){ mModel->setHeaderData(6, Qt::Horizontal, tr("Add Date")); mModel->setHeaderData(7, Qt::Horizontal, tr("Comment")); - mBtnAccount->setText(tr("Account")); - //mBtnWorklist->setText(tr("Worklist")); + mBtnEdit->setText(tr("Edit")); + mBtnDelete->setText(tr("Delete")); mBtnAdd->setText(tr("Add")); + mBtnSelect->setText(tr("Select")); } void SelectFormWidget::updateDataByAnonymousMode(){ diff --git a/src/forms/select/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h index 0423bac..ac63532 100644 --- a/src/forms/select/SelectFormWidget.h +++ b/src/forms/select/SelectFormWidget.h @@ -29,19 +29,16 @@ private: void setPatientDetail(const SlideTableView *table, const QSqlTableModel *model, PatientDetailForm *edit_patient) const; - QToolButton *mBtnAccount; - QToolButton *mBtnWorklist; + QToolButton *mBtnEdit; + QToolButton *mBtnDelete; QToolButton *mBtnAdd; QToolButton *mBtnSelect; - QToolButton *mBtnTurnOff; SlideTableView *mPatTable; QSqlTableModel *mModel; PatientDetailForm *patientDetailForm; void prepareButtons(bool disableALL); - void initGeneralButtons(QHBoxLayout *layout); - void initPatEditButtons(QHBoxLayout *layout); void editPatient(); @@ -54,7 +51,7 @@ private: void initDetailPanel(QHBoxLayout *contentLayout); - void initTableView(QHBoxLayout *contentLayout); + void initTableView(QLayout *contentLayout); void reloadLanguage(); }; diff --git a/src/stylesheet/Dark2.css b/src/stylesheet/Dark2.css index 4d90387..d665a74 100644 --- a/src/stylesheet/Dark2.css +++ b/src/stylesheet/Dark2.css @@ -9,8 +9,8 @@ /* Global buttons */ QPushButton { border: 1px solid #505050; - padding-left: 50px; - padding-right: 50px; + padding-left: 30px; + padding-right: 30px; border-radius: 5px; min-height: 60px; max-height: 60px; @@ -530,8 +530,8 @@ QWidget#commandWidget QToolButton{ /*------SelectformWidget-----------------------------------------------------*/ QWidget#patientDetailWidget { - min-width: 680px; - max-width: 680px; + min-width: 480px; + max-width: 480px; /* margin-top: 5; */ } @@ -567,6 +567,12 @@ QToolButton#btnHidePanel { qproperty-icon:url(":/icons/hidearrow.png"); qproperty-iconSize:30px 30px; } +QLabel#selectTabTitle { + min-height: 50px; + max-height: 50px; + border-bottom: 1px solid #515151; + font-size: 32px; +} /* PatientDetailForm in SelectformWidget */ QWidget#editcmdWidget { @@ -576,46 +582,48 @@ QWidget#editcmdWidget { QLabel#displayTitle { - border-bottom: 1px solid grey; color: #fcfcfc; min-height: 50px; max-height: 50px; - font-size: 40px; + max-width: 180px; + font-size: 26px; font-weight: Bold; border-bottom: 1px solid #4a88c7; font-weight: normal; } QLabel#displayDetail { - border-bottom: 1px solid grey; color: #fcfcfc; min-height: 50px; max-height: 50px; - font-size: 40px; + max-width: 280px; + font-size: 26px; font-weight: Bold; - border-bottom: 1px solid #4a88c7; + border-bottom: 1px solid silver; font-weight: normal; } QLabel#PatInfTitle { - border-bottom: 1px solid grey; + /* border-bottom: 1px solid grey; */ + background: #0078d8; color: #fcfcfc; - min-height: 80px; - max-height: 80px; - font-size: 50px; - font-weight: Bold; - /* margin-top: 20px; */ - margin-bottom: 30px; + min-height: 52px; + max-height: 52px; + font-size: 26px; + border-radius: 5px; + margin-top: 5px; + margin-left: 5px; + margin-bottom: 10px; } QLabel#PatIcon { - border: 1px solid grey; + /* border: 1px solid grey; */ qproperty-pixmap:url(":/icons/patient.png"); color: #fcfcfc; - min-height: 200px; - max-height: 200px; - min-width: 200px; - max-width: 200px; + min-height: 0px; + max-height: 0px; + min-width: 0px; + max-width: 0px; font-size: 40px; font-weight: Bold; } @@ -644,14 +652,12 @@ QToolButton#btnDelete { qproperty-icon:url(":/icons/close_circle.png"); } QToolButton#btnPatEdit { - border:2px solid grey; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:120px 120px; qproperty-icon:url(":/icons/details.png"); } QToolButton#btnPatDelete { - border:2px solid grey; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:120px 120px; qproperty-icon:url(":/icons/close_circle.png"); @@ -865,7 +871,7 @@ GUIFormBaseDialog QToolButton:enabled { QPushButton#btnOK { background: #365880; - font-weight: bold + font-weight: bold; } /* GUIFormBaseDialog -> AccountFormDialog */ diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm index d860f72..912bdb4 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 6ee9f88..e4fd951 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -393,34 +393,34 @@ DeviceManager - + Patient can leave. - + Initialize Failed. - + Data is currently being transmitted, please shut down later. - + Shut down failed, please push emergency button to shutdown. - + Recon disconnected. - - + + Open pump failed. @@ -536,6 +536,7 @@ ID + ID @@ -558,6 +559,8 @@ + + Female 女 @@ -565,12 +568,15 @@ + + Male 男 + Other @@ -582,13 +588,16 @@ Comment 备注 + 备注 + F + M @@ -807,32 +816,39 @@ GetWorkListDialog + Accession Nummber + + Patient ID + Accession Number + Accession Number and Patient Id is Empty. + Unknow Error. code:001001001 + DB Error,Patient Write Failed @@ -1073,41 +1089,49 @@ LoginDialog + New password:%1 + Reset success + Shut down now ? + Shut Down + U S C T + Username 用户名 + Password 密码 + Login 登录 @@ -1127,12 +1151,29 @@ Login failed, username or password error! Remaining retries: %1 + + + + Can't connect db. Please reboot the device and retry, or call for the service help. + + + + + Login locked. Please retry after %1 minutes. + + + + + Login failed, username or password error! Remaining retries: %1 + + Anonymous Mode active! + System mode Notice @@ -1165,25 +1206,25 @@ - - + + Select 选择 - - + + Scan 扫描 - - + + Recon 重建 - + Shut down failed, please push emergency button to shutdown. @@ -1200,8 +1241,8 @@ 管理 - - + + Settings 设置 @@ -1422,108 +1463,101 @@ PatientDetailForm - - Form - - - - Patient Information - 患者信息 - - - - <html><head/><body><p><br/></p></body></html> - - - - - 111 - + 患者信息 ... DICOM - + Name 姓名 - Date Of Birth - 出生日期 + 出生日期 Comment 备注 - + Gender 性别 - Edit - 编辑 + 编辑 - Delete - 删除 + 删除 - - + + Female 女 - - + + Male 男 - - + + Other - - PatientID: + + + Patient Detail - - Add Date: + + Birth Date + 出生日期 + + + + PatientID - - AccNo: + + AccNo - + + + Add Date + 添加日期 + + + Scan with this Patient? - - Protocol: - + + Protocol + 扫描协议 - + Left - + Right @@ -1812,30 +1846,42 @@ ScanFormWidget + + Protocol 扫描协议 + + LEFT 左侧 + + RIGHT 右侧 + + Empty Scan 空扫 + + + + @@ -1844,16 +1890,19 @@ 排水 + Please make sure the holder is only contain water! + Confirm Scan + No refresh data exists, please do Refresh operation first. @@ -1868,6 +1917,19 @@ Confirm Drainage + + + + + + Make sure to open the drain valve ? + + + + + Confirm Drainage + + @@ -1880,30 +1942,42 @@ 空扫 + + Preview 预扫 + + Stop 停止 + + Scan 扫描 + + Preview Parameters 预览参数 + + + + @@ -1915,6 +1989,8 @@ parameters XXX + + Scan Parameters @@ -2008,109 +2084,101 @@ parameters SelectFormWidget - - Account - 账户 + 账户 - Worklist - 新增(拉取) + 新增(拉取) - - + + Add - 新增(录入) + 新增 + + Edit 编辑 - Delete - 删除 + + Patient Information Manage + - + + + Delete + 删除 + + + + Select 选择 - - ShutDown - - - - - Shut down now ? - - - - - Shut Down - - - - + Can't delete selected Patient ! - - + + Alert - + Delete Patient "%1" ? - + Confirm - + Can't delete selected Patient , db submit error! - - + + AccessionNumber - - + + Name 姓名 - - + + Birth Date 出生日期 - - + + Gender 性别 - - + + Add Date 添加日期 - - + + Comment 备注 @@ -2314,12 +2382,12 @@ parameters TopBarWidget - + 浙江衡玖医疗科技 - + °C @@ -2327,6 +2395,8 @@ parameters UserOperationLogForm + + Log Date: @@ -2334,41 +2404,31 @@ parameters - WorklistSettingsDialog + WarningMessageWidget - - Worklist Settings - Worklist通讯设置 + + System is working properly. + - - AE can't be empty - AE不能为空 + + No message. + - - Server AE can't be empty - 服务器AE不能为空 + + System Status + - - Server Ip can't be empty - 服务器地址不能为空 + + System Notifications + - - Server Port can't be empty - 服务器端口不能为空 - - - - Ip Address is not valid - 服务器地址不符合格式规范 - - - - Port is not valid - 服务器端口格式必须为小于65535的数字 + + Clear +