diff --git a/src/dialogs/AlertDialog.cpp b/src/dialogs/AlertDialog.cpp
index 4794ac0..5b74c8d 100644
--- a/src/dialogs/AlertDialog.cpp
+++ b/src/dialogs/AlertDialog.cpp
@@ -26,6 +26,10 @@ AlertDialog::AlertDialog(QWidget *parent, Qt::WindowFlags f)
void AlertDialog::setAlertMessage(const QString &msg) {
mLblMsg->setText(msg);
+ if (msg.length()>28)
+ {
+ mLblMsg->setWordWrap(true);
+ }
}
void AlertDialog::setTitle(const QString &msg) {
diff --git a/src/forms/scan/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp
index f393f69..89a0d01 100644
--- a/src/forms/scan/ScanFormWidget.cpp
+++ b/src/forms/scan/ScanFormWidget.cpp
@@ -37,7 +37,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent)
, mLblProtocol(new QLabel(this))
, mBtnLeft(new QToolButton(this))
, mBtnRight(new QToolButton(this))
-, mBtnRefresh(new QToolButton(this))
+, mBtnEScan(new QToolButton(this))
, mBtnPreview(new QToolButton(this))
, mBtnStop(new QToolButton(this))
, mBtnScan(new QToolButton(this))
@@ -123,31 +123,33 @@ void ScanFormWidget::initScanContent() {
}
void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
- mBtnRefresh->setObjectName("btnRefresh");
+ mBtnEScan->setObjectName("btnRefresh");
mBtnPreview->setObjectName("btnPreview");
mBtnStop->setObjectName("btnStop");
mBtnScan->setObjectName("btnScan");
mBtnDrainage->setObjectName("btnDrainage");
mBtnDrainage->setCheckable(true);
- mBtnRefresh->setText(tr("Empty Scan"));
+ mBtnEScan->setText(tr("Empty Scan"));
mBtnPreview->setText(tr("Preview"));
mBtnStop->setText(tr("Stop"));
mBtnScan->setText(tr("Scan"));
mBtnDrainage->setText(tr("Drainage"));
mBtnScan->setEnabled(false);
- mBtnRefresh->setEnabled(false);
+ mBtnEScan->setEnabled(false);
mBtnPreview->setEnabled(false);
mBtnStop->setEnabled(false);
- layout->addWidget(mBtnRefresh);
+ layout->addWidget(mBtnEScan);
layout->addWidget(mBtnPreview);
layout->addWidget(mBtnStop);
layout->addWidget(mBtnScan);
layout->addWidget(mBtnDrainage);
- connect(mBtnRefresh, &QToolButton::clicked, [=]() {
+ connect(mBtnEScan, &QToolButton::clicked, [=]() {
+ int result = DialogManager::Default()->requestAlertMessage(tr("Please make sure the holder is only contain water!"),DialogButtonMode::OkAndCancel,tr("Confirm Scan"));
+ if (result != QDialog::Accepted)return;
QString patientInf(mPatInf->getCurrentPatientJsonString(true));
LOG_USER_OPERATION("Start Empty Scan")
EventCenter::Default()->triggerEvent(RequestEmptyScan, nullptr, (QObject*)(&patientInf));
@@ -155,6 +157,7 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
connect(mBtnPreview, &QToolButton::clicked, [=]() {
LOG_USER_OPERATION(QString("Start Preview, ID: %1").arg(mPatInf->getPatientID()))
EventCenter::Default()->triggerEvent(RequestPreviewScan, nullptr, nullptr);
+
});
connect(DeviceManager::Default(), &DeviceManager::startPreviewScanResult, [this](bool aIsSucessful)
{
@@ -228,12 +231,15 @@ void ScanFormWidget::setPreviewing(bool val) {
mBtnPreview->setCheckable(val);
mBtnPreview->setChecked(val);
mBtnPreview->setEnabled(!val);
- mBtnRefresh->setEnabled(!val);
+ mBtnEScan->setEnabled(!val);
mBtnScan->setEnabled(!val);
+ mBtnDrainage->setEnabled(!val);
+
}
void ScanFormWidget::renderLoading() {
setPreviewing(true);
+
uchar c_data[PREVIEW_ROW][PREVIEW_COL];
for (auto data_ptr : c_data) {
memset(data_ptr, 0, PREVIEW_COL);
@@ -298,13 +304,13 @@ void ScanFormWidget::initEvents() {//Events-------------------------------------
if (data)
{
mBtnScan->setEnabled(true);
- mBtnRefresh->setEnabled(true);
+ mBtnEScan->setEnabled(true);
mBtnPreview->setEnabled(true);
mBtnStop->setEnabled(true);
}
else{
mBtnScan->setEnabled(false);
- mBtnRefresh->setEnabled(false);
+ mBtnEScan->setEnabled(false);
mBtnPreview->setEnabled(false);
mBtnStop->setEnabled(false);
}
@@ -324,7 +330,7 @@ void ScanFormWidget::initEvents() {//Events-------------------------------------
void ScanFormWidget::reloadLanguage(){
mBtnLeft->setText(tr("LEFT"));
mBtnRight->setText(tr("RIGHT"));
- mBtnRefresh->setText(tr("Empty Scan"));
+ mBtnEScan->setText(tr("Empty Scan"));
mBtnPreview->setText(tr("Preview"));
mBtnStop->setText(tr("Stop"));
mBtnScan->setText(tr("Scan"));
diff --git a/src/forms/scan/ScanFormWidget.h b/src/forms/scan/ScanFormWidget.h
index ba86e60..bbdccd9 100644
--- a/src/forms/scan/ScanFormWidget.h
+++ b/src/forms/scan/ScanFormWidget.h
@@ -24,7 +24,7 @@ private:
QLabel* mLblProtocol;
QToolButton* mBtnLeft;
QToolButton* mBtnRight;
- QToolButton* mBtnRefresh;
+ QToolButton* mBtnEScan;
QToolButton* mBtnPreview;
QToolButton* mBtnStop;
QToolButton* mBtnScan;
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index baf1f76..de7e156 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -1184,6 +1184,14 @@ parameters
Drainaging
+
+ Please make sure the holder is only contain water!
+
+
+
+ Confirm Scan
+
+
ScanSearchCriteriaForm
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index b63b52e..9ad5f74 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -399,22 +399,22 @@
-
+
Data is currently being transmitted, please shut down later.
-
+
Shut down failed, please push emergency button to shutdown.
-
+
Recon disconnected.
-
+
Open pump failed.
@@ -1106,7 +1106,7 @@
-
+
IP Address
IP地址
@@ -1199,28 +1199,28 @@
结果
-
+
Netmask
子网掩码
-
+
Destination
目标地址
-
+
Gateway
网关
-
+
Apply
应用
-
+
Cancel
取消
@@ -1581,45 +1581,55 @@
ScanFormWidget
-
+
Protocol
扫描协议
-
+
LEFT
左侧
-
+
RIGHT
右侧
-
+
Empty Scan
空扫
-
-
-
+
+
+
Drainage
排水
-
+
+ Please make sure the holder is only contain water!
+
+
+
+
+ Confirm Scan
+
+
+
+
No refresh data exists, please do Refresh operation first.
-
-
-
+
+
+
Drainaging
排水中
@@ -1629,33 +1639,33 @@
-
+
Preview
预扫
-
+
Stop
停止
-
+
Scan
扫描
-
+
Preview Parameters
预览参数
-
-
+
+
some settings
parameters
@@ -1664,7 +1674,7 @@ parameters
-
+
Scan Parameters
扫描参数
@@ -1756,24 +1766,24 @@ parameters
SelectFormWidget
-
-
+
+
Account
账户
-
+
Worklist
新增(拉取)
-
-
+
+
Add
新增(录入)
-
+
Edit
编辑
@@ -1782,84 +1792,84 @@ parameters
删除
-
+
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
备注
@@ -1953,22 +1963,22 @@ parameters
-
+
used: %1G
-
+
Get disk used size fail!
磁盘使用空间获取失败！
-
+
total: %1G
-
+
Get disk total size fail!
磁盘总空间获取失败！