diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8991d1a..83fbab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ set(PROJECT_NAME GUI)
project(${PROJECT_NAME})
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(DCMTK_DIR "D:/Libs/binary/DCMTK/cmake")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread")
# GUI Version
diff --git a/src/forms/scan/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp
index 90cd207..db5ce32 100644
--- a/src/forms/scan/ScanFormWidget.cpp
+++ b/src/forms/scan/ScanFormWidget.cpp
@@ -39,6 +39,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent)
, mBtnPreview(new QToolButton(this))
, mBtnStop(new QToolButton(this))
, mBtnScan(new QToolButton(this))
+, mBtnDrainage(new QToolButton(this))
, mViewer(new QLabel(this))
, mLblPreview(new QLabel(this))
, mLblE(new QLabel(this))
@@ -124,22 +125,26 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
mBtnPreview->setObjectName("btnPreview");
mBtnStop->setObjectName("btnStop");
mBtnScan->setObjectName("btnScan");
+ mBtnDrainage->setObjectName("btnDrainage");
+ mBtnDrainage->setCheckable(true);
mBtnRefresh->setText(tr("Refresh"));
mBtnPreview->setText(tr("Preview"));
mBtnStop->setText(tr("Stop"));
mBtnScan->setText(tr("Scan"));
+ mBtnDrainage->setText(tr("Drainage"));
mBtnScan->setEnabled(false);
mBtnRefresh->setEnabled(false);
mBtnPreview->setEnabled(false);
mBtnStop->setEnabled(false);
-
layout->addWidget(mBtnRefresh);
layout->addWidget(mBtnPreview);
layout->addWidget(mBtnStop);
layout->addWidget(mBtnScan);
+ layout->addWidget(mBtnDrainage);
+
connect(mBtnRefresh, &QToolButton::clicked, [=]() {
QString patientInf(mPatInf->getCurrentPatientJsonString(true));
LOG_USER_OPERATION(StartRefresh)
@@ -163,6 +168,17 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
LOG_USER_OPERATION(Stop)
EventCenter::Default()->triggerEvent(RequestStop, nullptr, nullptr);
});
+ connect(mBtnDrainage, &QToolButton::toggled, [=](bool aSatus) {
+ //Drainage
+ if(aSatus == true)
+ {
+ mBtnDrainage->setText(tr("Drainaging"));
+ }
+ else
+ {
+ mBtnDrainage->setText(tr("Drainage"));
+ }
+ });
}
void ScanFormWidget::protocolChanged(int type) {
@@ -279,6 +295,7 @@ void ScanFormWidget::reloadLanguage(){
mLblPreview->setText(tr("Scan Parameters"));
mLblE->setText(tr("some settings\n\nparameters\n"));
mLblE2->setText(tr("some settings\n\nparameters\n"));
+ mBtnDrainage->isChecked() ? mBtnDrainage->setText(tr("Drainaging")) : mBtnDrainage->setText(tr("Drainage"));
}
diff --git a/src/forms/scan/ScanFormWidget.h b/src/forms/scan/ScanFormWidget.h
index 184ddc7..6fbd249 100644
--- a/src/forms/scan/ScanFormWidget.h
+++ b/src/forms/scan/ScanFormWidget.h
@@ -28,6 +28,7 @@ private:
QToolButton* mBtnPreview;
QToolButton* mBtnStop;
QToolButton* mBtnScan;
+ QToolButton* mBtnDrainage;
QLabel* mViewer;
QLabel* mLblPreview;
QLabel* mLblE;
diff --git a/src/icons/drainage.png b/src/icons/drainage.png
new file mode 100644
index 0000000..19ec3e3
Binary files /dev/null and b/src/icons/drainage.png differ
diff --git a/src/res.qrc b/src/res.qrc
index 3c6c4b6..f16a2ae 100644
--- a/src/res.qrc
+++ b/src/res.qrc
@@ -52,5 +52,6 @@
icons/logout.png
icons/arrow-down.png
icons/arrow-up.png
+ icons/drainage.png
diff --git a/src/stylesheet/Dark2.css b/src/stylesheet/Dark2.css
index 154c2c6..fbe3d3e 100644
--- a/src/stylesheet/Dark2.css
+++ b/src/stylesheet/Dark2.css
@@ -544,6 +544,10 @@ QToolButton#btnScan {
qproperty-icon:url(":/icons/scan.png");
}
+QToolButton#btnDrainage {
+ qproperty-icon:url(":/icons/drainage.png");
+}
+
/*------AdminSettingForm---------------------------------------------------*/
QWidget#settingContentWidget {
border-top: 1px solid #505050;
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index 4d2f7dd..98dd574 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -440,6 +440,14 @@
Settings
+
+ Drainage
+
+
+
+ Drainaging
+
+
PatientInformationForm
diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak
index 4d2f7dd..98dd574 100644
--- a/src/translations/en_US.ts.bak
+++ b/src/translations/en_US.ts.bak
@@ -440,6 +440,14 @@
Settings
+
+ Drainage
+
+
+
+ Drainaging
+
+
PatientInformationForm
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index c7046c0..a7b61f5 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 0f17527..abcdb06 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -622,6 +622,14 @@
Settings
设置
+
+ Drainage
+ 排水
+
+
+ Drainaging
+ 排水中
+
PatientInformationForm
diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak
index 0f17527..abcdb06 100644
--- a/src/translations/zh_CN.ts.bak
+++ b/src/translations/zh_CN.ts.bak
@@ -622,6 +622,14 @@
Settings
设置
+
+ Drainage
+ 排水
+
+
+ Drainaging
+ 排水中
+
PatientInformationForm