V0.6.9

Comments for cmake
Fix patient tableView selection bugs.
2022-03-15 16:29:34 +08:00 · 2022-03-15 16:23:14 +08:00 · 2022-03-15 16:22:58 +08:00 · 2022-03-15 16:22:07 +08:00 · 2022-03-15 13:07:59 +08:00 · 2022-03-15 13:06:50 +08:00
28 changed files with 476 additions and 262 deletions
--- a/AppVersion.h.in
+++ b/AppVersion.h.in
@@ -0,0 +1,10 @@
+//
+// Created by Krad on 2022/3/8.
+//
+
+#ifndef GUI_VERSION_H
+#define GUI_VERSION_H
+#define GUI_VERSION_MAJOR @GUI_VERSION_MAJOR@
+#define GUI_VERSION_MINOR @GUI_VERSION_MINOR@
+#define GUI_VERSION_BUILD @GUI_VERSION_BUILD@
+#endif //GUI_VERSION_H
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,23 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread")

+# GUI Version
+set(GUI_VERSION_MAJOR 0)
+set(GUI_VERSION_MINOR 6)
+set(GUI_VERSION_BUILD 8)
+# use AppVersion.h as a configure file
+configure_file(
+        "AppVersion.h.in"
+        "AppVersion.h"
+)
+
 file(GLOB_RECURSE  project_headers ./src/*.h)
 file(GLOB_RECURSE  project_cpps ./src/*.cpp)
 file(GLOB_RECURSE  project_cxx ./src/*.cxx)
 file(GLOB_RECURSE  project_cc ./src/*.cc)

-if(UNIX)
-set(USE_SHIMLIB ON)
-else()
-set(USE_SHIMLIB OFF)
+if(NOT UNIX)
+        set(USE_SHIMLIB OFF)
 endif()
 if(UNIX AND USE_SHIMLIB)
        file(GLOB_RECURSE  project_c ./src/json/*.c)
--- a/cfgs/usct-product
+++ b/cfgs/usct-product
@@ -0,0 +1,74 @@
+{
+	"login":	{
+		"defaultUser":	"usct"
+	},
+	"general":	{
+		"defaultlanguage":	"en_US",
+		"language":	"zh_CN;en_US",
+		"institutionName":	"",
+		"institutionAddr":	"",
+		"lockscreen":	"30"
+	},
+	"protocol":	{
+		"default":	"RSTAND",
+		"lists":	"LSTAND;RSTAND;LONE;RONE"
+	},
+	"storagepolicy":	{
+		"mininum":	"85"
+	},
+	"lastlogin":	{
+		"password":	"",
+		"remember":	"false",
+		"usercode":	""
+	},
+	"worklist":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"pacs":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"recon":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"address":	{
+		"device":	"eth0",
+		"dhcp":	"true",
+		"ip":	"",
+		"mask":	"",
+		"ae":	"",
+		"name":	"",
+		"port":	"",
+		"additional":	[{
+				"ip":	"",
+				"netmask":	""
+			}, {
+				"ip":	"",
+				"netmask":	""
+			}]
+	},
+	"routing":	{
+		"defaultgateway":	"",
+		"routingtable":	[{
+				"destination":	"",
+				"gateway":	"",
+				"netmask":	""
+			}, {
+				"destination":	"",
+				"gateway":	"",
+				"netmask":	""
+			}]
+	},
+	"worklistfilter":	{
+		"default":	"Today",
+		"lists":	"Today;Recent3Days;ThisWeek;ThisMonth"
+	}
+}
--- a/docs/v0.6.8.txt
+++ b/docs/v0.6.8.txt
@@ -0,0 +1,3 @@
+第一个release版本。
+基本流程已完备，提交系统测试。
+2022年3月8日
--- a/docs/v0.6.9.txt
+++ b/docs/v0.6.9.txt
@@ -0,0 +1,8 @@
+v0.6.9
+通过新的当前行判定逻辑，修复了Select Tab页中，Patient 表格排序、选择导致的一系列问题。
+包括：
+1. Edit Panel 没有跟随选中更新。
+2. Patient 全部删除之后存在当前选中错误。
+3. 编辑、删除等按钮可用状态不对的错误。
+4. 修复了日期输入框在虚拟键盘下，回车无法退出输入模式的错误。
+2022年3月15日
--- a/src/AccountFormDialog.cpp
+++ b/src/AccountFormDialog.cpp
@@ -131,13 +131,16 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
        layout->addWidget(lbl_endline9);
        if (m_mode == Self) {
            connect(btn_Pwd, &QPushButton::clicked, [=]() {
-                ChangePasswordFormDialog dia(this->parentWidget());
+                ChangePasswordFormDialog dia(this);
+                dia.setGeometry(this->geometry());
                dia.setWindowModality(Qt::WindowModal);
                dia.exec();
+
            });
        } else {
            connect(btn_Pwd, &QAbstractButton::clicked, [=]() {
                AlertDialog dialog(this);
+                dialog.setGeometry(this->geometry());
                dialog.setButtonMode(OkAndCancel);
                dialog.setWindowModality(Qt::WindowModal);
                dialog.setAlertMessage(tr("Reset password to \"123456\" ?"));
--- a/src/AccountTableForm.cpp
+++ b/src/AccountTableForm.cpp
@@ -50,8 +50,9 @@ AccountTableForm::AccountTableForm(QWidget* parent) {
 	table->setColumnWidth(4, 150);

 	QWidget* cmdPanel = new QWidget(this);
-	cmdPanel->setObjectName("commandWidget");
+	cmdPanel->setObjectName("commandWidgetnoBBorder");
 	QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel);
+
 	cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
 	QWidget* spacerLine = new QWidget(this);
 	spacerLine->setFixedWidth(2);
--- a/src/AdminSettingForm.cpp
+++ b/src/AdminSettingForm.cpp
@@ -23,8 +23,9 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm

 	QHBoxLayout* layout = new QHBoxLayout(this);
 	layout->setMargin(0);
-	layout->setContentsMargins(0, 8, 0, 8);
+	layout->setContentsMargins(0, 8, 0, 1);
 	this->ui->contentWidget->setLayout(layout);
+	this->ui->contentWidget->setObjectName("contentWidgetWithBBorder");
 	QListWidget* widget = new QListWidget(this);
 	widget->setFixedWidth(250);
 	QStringList menus;
@@ -41,6 +42,7 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	QWidget* spacerLine2 = new QWidget(this);
 	spacerLine2->setFixedWidth(2);
 	spacerLine2->setObjectName("verSpaceLine");
+	spacerLine2->setStyleSheet("margin-bottom:8px");
 	layout->addWidget(spacerLine2);
 	layout->addWidget(stackedWidget);
 	this->ui->commandWidget->hide();
--- a/src/AlertDialog.cpp
+++ b/src/AlertDialog.cpp
@@ -12,7 +12,7 @@ AlertDialog::AlertDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog
    QVBoxLayout* layout = new QVBoxLayout(formWidget);
    layout->setSpacing(10);
    // add title
-    QLabel* lbl_title = new QLabel(this);
+    lbl_title = new QLabel(this);
    lbl_title->setAlignment(Qt::AlignCenter);
    lbl_title->setText(tr("Warning"));
    lbl_title->setObjectName("title");
@@ -28,3 +28,7 @@ AlertDialog::~AlertDialog() {
 void AlertDialog::setAlertMessage(const QString &msg) {
    this->lbl_msg->setText(msg);
 }
+
+void AlertDialog::setTitle(const QString &msg) {
+    lbl_title->setText(msg);
+}
--- a/src/AlertDialog.h
+++ b/src/AlertDialog.h
@@ -12,11 +12,13 @@ public:
    explicit AlertDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
    ~AlertDialog();
    void setAlertMessage(const QString& msg);
+    void setTitle(const QString& msg);
 protected:
    bool updateReferenceData() override{return true;}

 private:
    QLabel* lbl_msg;
+    QLabel* lbl_title;
 };


--- a/src/InputObject.cpp
+++ b/src/InputObject.cpp
@@ -7,7 +7,7 @@
 #include <QComboBox>
 #include <QDateEdit>
 #include <QtVirtualKeyboard>
-
+#include <QKeyEvent>
 #include <QLineEdit>
 #include <QAbstractSpinBox>

@@ -91,6 +91,14 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event)

 		//qDebug() << "touchScreen()";
 	}
+	if (event->type() == QEvent::KeyPress) {
+		QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+		if (keyEvent->key() == Qt::Key_Return && curDateEdit)
+		{
+			this->HidePanel();
+			this->hide();
+		}
+	}
 	//mouse button release means setfocus is useless
 	if (event->type() == QEvent::MouseButtonRelease)
 	{
--- a/src/SelectFormWidget.cpp
+++ b/src/SelectFormWidget.cpp
@@ -19,6 +19,9 @@
 #include "log/UserOperationLog.h"
 #include <QSortFilterProxyModel>
 #include "src/components/VerticalTextToolButton.h"
+#include "AlertDialog.h"
+
+#include <QScroller>

 #define ADD_CENTER_ITEM(row,col,text)\
    item = new QTableWidgetItem(text);\
@@ -61,10 +64,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :

 	//Init content widget
 	QHBoxLayout* contentLayout = new QHBoxLayout();
-    contentLayout->setContentsMargins(5,5,0,5);
+	contentLayout->setContentsMargins(5, 5, 0, 5);
 	this->ui->contentWidget->setLayout(contentLayout);
 	// TableView for patient
-	QTableView* table = new SlideableTableView(this);
+    SlideableTableView* table = new SlideableTableView(this);
 	table->setAlternatingRowColors(true);
 	table->setSelectionMode(QAbstractItemView::SingleSelection);
 	table->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -72,7 +75,9 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	table->verticalHeader()->setDefaultSectionSize(38);
 	table->horizontalHeader()->setStretchLastSection(true);
 	//data from SQLITE
-
+	// 
+	//avoid pan comsumed by tableview!
+	table->viewport()->ungrabGesture(Qt::PanGesture);

 	auto model = SQLHelper::getTable("Patient");
 	model->setFilter("Flag=0");
@@ -84,10 +89,6 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	model->setHeaderData(4, Qt::Horizontal, tr("Gender"));
 	model->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
 	model->setHeaderData(6, Qt::Horizontal, tr("Comment"));
-
-
-	QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(model); // create proxy
-	proxyModel->setSourceModel(model);
 	table->setSortingEnabled(true); // enable sortingEnabled

 	table->setModel((QAbstractItemModel*)model);
@@ -95,90 +96,106 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	table->hideColumn(7);
 	table->show();

-	//  table->setSortingEnabled(true);
 	table->setColumnWidth(1, 250);
 	table->setColumnWidth(2, 250);
-	table->setColumnWidth(3, 120);
-	table->setColumnWidth(4, 80);
+	table->setColumnWidth(3, 160);
+	table->setColumnWidth(4, 120);
 	table->setColumnWidth(5, 250);
-	//    table->sortByColumn(5);
-	//    table->setSortingEnabled(true);
 	contentLayout->addWidget(table);
 	QWidget* spacerLine2 = new QWidget(this);
 	spacerLine2->setFixedWidth(2);
 	spacerLine2->setObjectName("verSpaceLine");
 	contentLayout->addWidget(spacerLine2);
-	//edit panel
-	EditPatientForm* edit_patient = new EditPatientForm(this);
+	// prepare edit panel
+    EditPatientForm* edit_patient = new EditPatientForm(this);
 	edit_patient->setObjectName("edit_patient");
-    edit_patient->hide();
+	edit_patient->hide();
 	contentLayout->addWidget(edit_patient);
+	auto* btnShowEdit = new VerticalTextToolButton(this);
+	btnShowEdit->setObjectName("showeditBtn");
+	btnShowEdit->setIcon(QIcon(":/icons/edit.png"));
+	btnShowEdit->setIconSize(QSize(30, 30));
+	btnShowEdit->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+	btnShowEdit->setFixedHeight(225);
+	btnShowEdit->setVerticalText("Patient Detail");
+	contentLayout->addWidget(btnShowEdit);
+	contentLayout->setAlignment(btnShowEdit, Qt::AlignmentFlag::AlignTop);

-    auto *btnShowEdit = new VerticalTextToolButton(this);
-    btnShowEdit->setObjectName("showeditBtn");
-    btnShowEdit->setIcon(QIcon(":/icons/edit.png"));
-    btnShowEdit->setIconSize(QSize(30, 30));
-    btnShowEdit->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    btnShowEdit->setFixedHeight(225);
-//    btnShowEdit->setVerticalText("E\nd\ni\nt\nP\na\nn\ne\nl");
-    btnShowEdit->setVerticalText("Patient Detail");
-    contentLayout->addWidget(btnShowEdit);
-    contentLayout->setAlignment(btnShowEdit, Qt::AlignmentFlag::AlignTop);
-    connect(btnShowEdit,&QToolButton::clicked,[=](){
-        edit_patient->show();
-        btnShowEdit->hide();
-    });
-    connect(edit_patient, &EditPatientForm::hideBtnClicked, [=](){
-        edit_patient->hide();
-        btnShowEdit->show();
-    });
+	// btn show slot
+	connect(btnShowEdit, &QToolButton::clicked, [=]() {
+		edit_patient->show();
+		btnShowEdit->hide();
+		});
+	//btn hide slot
+	connect(edit_patient, &EditPatientForm::hideBtnClicked, [=]() {
+		edit_patient->hide();
+		btnShowEdit->show();
+		});

-    //select default row 0
+	//select default row 0
 	if (model->rowCount() > 0)
 	{
 		table->selectRow(0);
-		currentRow = 0;
 		PatientInformation pat;
 #define ADD_PATIENT_PROPERTY(val)\
-        pat. val = model->data(model->index(currentRow,PatientInformationEnum:: val)).toString();
+        pat. val = model->data(model->index(table->currentIndex().row(),PatientInformationEnum:: val)).toString();
 		EDIT_PATIENT()
 #undef ADD_PATIENT_PROPERTY
-        edit_patient->setPatientInformation(&pat);
+			edit_patient->setPatientInformation(&pat);
 	}
 	//events----------------------------------------------------------------------
+	//prepare button state
+    auto prepareButtons = [=](bool disableALL){
+        bool state_flag = (table->currentIndex().row()>=0);
+        btnSelect->setEnabled(state_flag && !disableALL);
+        btnDelete->setEnabled(state_flag && !disableALL);
+        btnEdit->setEnabled(state_flag && !disableALL);
+        btnAdd->setEnabled(!disableALL);
+    };
 	//table current row selection changing event
-	connect(table, &QTableView::clicked, [=](const QModelIndex& modelIndex) {
-		if (currentRow != modelIndex.row())
-		{
-			currentRow = modelIndex.row();
+	connect(table, &SlideableTableView::currentRowChanged, [=](int row) {
 			PatientInformation pat;
 #define ADD_PATIENT_PROPERTY(val)\
-            pat. val = model->data(model->index(modelIndex.row(),PatientInformationEnum:: val)).toString();
+            pat. val = model->data(model->index(row,PatientInformationEnum:: val)).toString();
 			EDIT_PATIENT()
 #undef ADD_PATIENT_PROPERTY
 				edit_patient->setPatientInformation(&pat);
-		}
-		});
+        prepareButtons(false);
+	});

+	// after sort by column
+	connect(table->horizontalHeader(),&QHeaderView::sectionClicked,[=](int index){
+        edit_patient->clearPatientInformation();
+        prepareButtons(false);
+	});
+
+	// btn add slot
 	connect(btnAdd, &QToolButton::clicked, [=]() {
-        edit_patient->show();
-        btnShowEdit->hide();
+		edit_patient->show();
+		btnShowEdit->hide();
 		edit_patient->clearPatientInformation();
 		edit_patient->setEditEnable(true);
 		btnSelect->setEnabled(false);
 		});
+
+    // btn edit slot
 	connect(btnEdit, &QToolButton::clicked, [=]() {
-        edit_patient->show();
-        btnShowEdit->hide();
+		edit_patient->show();
+		btnShowEdit->hide();
 		table->clicked(table->currentIndex());
 		edit_patient->setEditEnable(true);
 		btnSelect->setEnabled(false);
 		});
+
+    // btn add slot
 	connect(edit_patient, &EditPatientForm::editCancel, [=]() {
+        if (table->currentIndex().row()<0) return;
 		btnSelect->setEnabled(true);
-		});
+	});
+
+    // btn add slot
 	connect(edit_patient, &EditPatientForm::editAccept, [=](PatientInformation* inf, bool& result) {
-		int selectedRow = currentRow;
+		int selectedRow = table->currentIndex().row();
 		bool isAdd = inf->PatientUID.isEmpty();
 		if (isAdd) {
 			int ref_rowid = queryValue(model, 1, inf->ID);
@@ -221,61 +238,77 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 		btnSelect->setEnabled(true);
 		});

+    // btn delete slot
 	connect(btnDelete, &QToolButton::clicked, [=]() {
-		if (currentRow < 0)return;
-		model->setData(model->index(currentRow, PatientInformationEnum::Flag), 9);
-		//        model->removeRow(currentRow);
-		if (model->submitAll())
-		{
-			model->select();
-			if (model->rowCount() > 0)
-			{
-				table->selectRow(0);
-				model->selectRow(0);
-				PatientInformation pat;
+        if (table->currentIndex().row()<0) return;
+        AlertDialog dialog(this);
+        dialog.setWindowModality(Qt::WindowModal);
+        QString pUid = model->index(table->currentIndex().row(), PatientInformationEnum::PatientUID).data().toString();
+        // patient has been selected as the scan patient!
+        if (selectedPatientUID == pUid){
+            dialog.setButtonMode(OkOnly);
+            dialog.setTitle(tr("Alert"));
+            dialog.setAlertMessage(QString(tr("Can't delete selected Patient !")));
+            dialog.exec();
+            return;
+        }
+        // not the selected one, confirm!
+        dialog.setButtonMode(OkAndCancel);
+        dialog.setTitle("Confirm");
+        QString pat_name = model->index(table->currentIndex().row(), PatientInformationEnum::Name).data().toString();
+        dialog.setAlertMessage(QString(tr("Delete Patient \"%1\" ?")).arg(pat_name));
+        if (dialog.exec() != QDialog::Accepted) return;
+        // need delete clear edit panel detail
+        edit_patient->setEditEnable(false);
+        edit_patient->clearPatientInformation();
+        model->setData(model->index(table->currentIndex().row(), PatientInformationEnum::Flag), 9);
+
+        if (model->submitAll()) {
+            model->select();
+            if (model->rowCount() > 0) {
+                table->selectRow(0);
+                model->selectRow(0);
+                PatientInformation pat;
 #define ADD_PATIENT_PROPERTY(val)\
                pat. val = model->data(model->index(0,PatientInformationEnum:: val)).toString();
-				EDIT_PATIENT()
+                EDIT_PATIENT()
 #undef ADD_PATIENT_PROPERTY
-					edit_patient->setPatientInformation(&pat);
-				LOG_USER_OPERATION(DeletePatient);
-			}
-			else {
-				currentRow = -1;
-                edit_patient->editCancel();
-                edit_patient->clearPatientInformation();
-			}
-		}
-		else {
-			//TODO:error handle
-		}
+                edit_patient->setPatientInformation(&pat);
+                LOG_USER_OPERATION(DeletePatient);
+            }
+        } else {
+            //TODO:error handle
+        }
+        prepareButtons(false);

+    });

-		});
-
+    // btn select slot
 	connect(btnSelect, &QToolButton::clicked, [=]() {
-		if (currentRow < 0)return;
+
 		EventCenter::Default()->triggerEvent(GUIEvents::PatientSelected, nullptr, edit_patient->getPatientInformation()->Copy());
+        selectedPatientUID = edit_patient->getPatientInformation()->PatientUID;
 		LOG_USER_OPERATION(SelectPatient);
 		});

+    // btn account slot
 	connect(btnAccount, &QToolButton::clicked, [=]() {
 		AccountFormDialog dia(this);
 		dia.setWindowModality(Qt::WindowModal);
 		dia.exec();
 		});
+
+    // event ResponsePreview slot
 	connect(EventCenter::Default(), &EventCenter::ResponsePreview, [=](QObject* sender, QObject* data) {
-		btnSelect->setEnabled(false);
-		btnDelete->setEnabled(false);
-		btnEdit->setEnabled(false);
-		btnAdd->setEnabled(false);
+        prepareButtons(true);
 		});
+
+    // event ResponseStop slot
 	connect(EventCenter::Default(), &EventCenter::ResponseStop, [=](QObject* sender, QObject* data) {
-		btnSelect->setEnabled(true);
-		btnDelete->setEnabled(true);
-		btnEdit->setEnabled(true);
-		btnAdd->setEnabled(true);
-		});
+        prepareButtons(false);
+	});
+
+    // event ReloadLanguage slot;
 	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {

 		model->setHeaderData(1, Qt::Horizontal, "ID");
@@ -293,9 +326,14 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 		btnSelect->setText(tr("Select"));
 		});

+	//first prepare buttons!
+    prepareButtons(false);
 }


 SelectFormWidget::~SelectFormWidget()
 {
+
 }
+
+
--- a/src/SelectFormWidget.h
+++ b/src/SelectFormWidget.h
@@ -6,6 +6,7 @@
 #define GUI_SELECTFORMWIDGET_H

 #include "tabformwidget.h"
+class EditPatientForm;
 class SelectFormWidget: public TabFormWidget {
    Q_OBJECT
 public:
@@ -13,8 +14,7 @@ public:
    ~SelectFormWidget();

 private:
-    int currentRow = -1;
-
+    QString selectedPatientUID;
 };


--- a/src/aboutwidget.cpp
+++ b/src/aboutwidget.cpp
@@ -7,6 +7,7 @@
 #include <QStringList>
 #include "json/cmdhelper.h"
 #include <QThread>
+#include "AppVersion.h"

 AboutWidget::AboutWidget(QWidget* parent)
 	: QWidget(parent)
@@ -70,7 +71,7 @@ void AboutWidget::initUi()
 	pMainLayout->addSpacing(subContentSpacing);

 	pGuiVer = new QLabel(this);
-	pGuiVer->setText(tr("GUI Software V1.3"));
+	pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
 	pGuiVer->setContentsMargins(subContentMargin, 0, 0, 0);
 	pMainLayout->addWidget(pGuiVer);

@@ -154,7 +155,7 @@ void AboutWidget::initUi()
 		pProductVer->setText(tr("HJ-USCT-01 V1.0"));
 		pBtnHelp->setText(tr("?"));
 		pCompanyCopyRight->setText(tr("Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed"));
-		pGuiVer->setText(tr("GUI Software V1.3"));
+		pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
 		pEmbededSoftVer->setText(tr("Embedded Software V1.5"));
 		pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
 		pFEBVer->setText(tr("FEB Information"));
@@ -177,3 +178,7 @@ void AboutWidget::openHelpFile()
 	//	box.exec();
 	//}
 }
+
+QString AboutWidget::getGUIVersion() {
+    return QString("%1.%2.%3").arg(GUI_VERSION_MAJOR).arg(GUI_VERSION_MINOR).arg(GUI_VERSION_BUILD);
+}
--- a/src/aboutwidget.h
+++ b/src/aboutwidget.h
@@ -20,7 +20,7 @@ public:
 	explicit AboutWidget(QWidget* parent = nullptr);
 	~AboutWidget();

-
+    QString getGUIVersion();

 private slots:
 	void openHelpFile();
--- a/src/components/SlideableTableView.cpp
+++ b/src/components/SlideableTableView.cpp
@@ -68,3 +68,8 @@ void SlideableTableView::mouseReleaseEvent(QMouseEvent *ev) {
 //    }
    QTableView::mouseReleaseEvent(ev);
 }
+
+void SlideableTableView::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+    QTableView::currentChanged(current, previous);
+    emit currentRowChanged(current.row());
+}
--- a/src/components/SlideableTableView.h
+++ b/src/components/SlideableTableView.h
@@ -12,11 +12,15 @@ public:
    explicit SlideableTableView(QWidget *parent = nullptr);
    ~SlideableTableView();

+Q_SIGNALS:
+    void currentRowChanged(int row);
 protected:
    void mousePressEvent(QMouseEvent *ev) override ;
    void mouseMoveEvent(QMouseEvent *ev) override ;
    void mouseReleaseEvent(QMouseEvent *ev) override ;

+    void currentChanged(const QModelIndex &current,
+                        const QModelIndex &previous) override;
 private:
    bool isDragging = false;
    int ox,oy,ov;
--- a/src/errorhandle/GUIErrorFactory.cpp
+++ b/src/errorhandle/GUIErrorFactory.cpp
@@ -10,7 +10,7 @@ GUIErrorBase *GUIErrorFactory::getError(const QString &errorMsg) {

    if (errorMsg.isEmpty()) return new GUIErrorBase;
    //新模式，分级
-    if (errorMsg[1] == ' ') {
+    if (errorMsg.length()>1 && errorMsg[1] == ' ') {
        char c = errorMsg[0].toLower().toLatin1();
        switch (c) {
            //WARN 级别
--- a/src/fonts/MicrosoftYahei.ttf
+++ b/src/fonts/MicrosoftYahei.ttf
--- a/src/icons/arrow-down.png
+++ b/src/icons/arrow-down.png
--- a/src/icons/arrow-up.png
+++ b/src/icons/arrow-up.png
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,6 +72,7 @@ int main(int argc, char* argv[])
 	//QObject::connect(obj, SIGNAL(touchScreen()), Locker::Instance(), SLOT(refreshTimer()));
 	QList<Qt::GestureType> gestures;
 	gestures << Qt::SwipeGesture;
+	gestures << Qt::PanGesture;
 	w.grabGestures(gestures);

 	QStringList app_args = a.arguments();
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -303,30 +303,55 @@ bool MainWindow::gestureEvent(QGestureEvent* event)
 	//qCDebug(lcExample) << "gestureEvent():" << event;
 	if (QGesture* swipe = event->gesture(Qt::SwipeGesture))
 		swipeTriggered(static_cast<QSwipeGesture*>(swipe));
-	//else if (QGesture* pan = event->gesture(Qt::PanGesture))
-		//panTriggered(static_cast<QPanGesture*>(pan));
-		//if (QGesture* pinch = event->gesture(Qt::PinchGesture))
-			//pinchTriggered(static_cast<QPinchGesture*>(pinch));
+	if (QGesture* pan = event->gesture(Qt::PanGesture))
+		panTriggered(static_cast<QPanGesture*>(pan));
+	//if (QGesture* pinch = event->gesture(Qt::PinchGesture))
+		//pinchTriggered(static_cast<QPinchGesture*>(pinch));
 	return true;
 }
-void MainWindow::swipeTriggered(QSwipeGesture* gesture)
+
+void MainWindow::panTriggered(QPanGesture* gesture)
 {
+
 	if (gesture->state() == Qt::GestureFinished) {
-		if (gesture->horizontalDirection() == QSwipeGesture::Right) {
-			int index = tab->currentIndex();
+		QPointF delta = gesture->offset();
+		int index = tab->currentIndex();
+		if (delta.x() > 50) {
+
 			index--;
 			if (index >= 0) {
 				tab->setCurrentIndex(index);
 			}
-
 		}
-		if (gesture->horizontalDirection() == QSwipeGesture::Left) {
-			int index = tab->currentIndex();
+		if (delta.x() < -50)
+		{
 			index++;
 			if (index < tab->count()) {
 				tab->setCurrentIndex(index);
 			}
 		}
+		qDebug() << "panTriggered" << index;
+	}
+}
+void MainWindow::swipeTriggered(QSwipeGesture* gesture)
+{
+
+	if (gesture->state() == Qt::GestureFinished) {
+		//if (gesture->horizontalDirection() == QSwipeGesture::Right) {
+		//	int index = tab->currentIndex();
+		//	index--;
+		//	if (index >= 0) {
+		//		tab->setCurrentIndex(index);
+		//	}
+
+		//}
+		//if (gesture->horizontalDirection() == QSwipeGesture::Left) {
+		//	int index = tab->currentIndex();
+		//	index++;
+		//	if (index < tab->count()) {
+		//		tab->setCurrentIndex(index);
+		//	}
+		//}
 		if (gesture->verticalDirection() == QSwipeGesture::Down) {
 			if (debugMode)
 			{
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -15,6 +15,7 @@ class GUIMessageDialog;
 class QTabWidget;
 class QGestureEvent;
 class QSwipeGesture;
+class QPanGesture;
 class QDockWidget;

 class MainWindow : public QMainWindow
@@ -41,6 +42,7 @@ protected:
 private:
 	bool gestureEvent(QGestureEvent* event);
 	void swipeTriggered(QSwipeGesture*);
+	void panTriggered(QPanGesture*);
 	void loadStyleSheet(const QString& sheetName);
 	cJSON* json_root = nullptr;

--- a/src/res.qrc
+++ b/src/res.qrc
@@ -48,5 +48,7 @@
        <file>icons/edit.png</file>
        <file>icons/hidearrow.png</file>
        <file>icons/logout.png</file>
+        <file>icons/arrow-down.png</file>
+        <file>icons/arrow-up.png</file>
    </qresource>
 </RCC>
--- a/src/stylesheet/Dark2.css
+++ b/src/stylesheet/Dark2.css
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -15,10 +15,6 @@
        <source>Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>GUI Software V1.3</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Embedded Software V1.5</source>
        <translation type="unfinished"></translation>
@@ -55,6 +51,10 @@
        <source>Loading...</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>GUI Software V%1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>AccountFormDialog</name>
@@ -587,6 +587,10 @@ parameters
        <source>Comment</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Delete Patient &quot;%1&quot; ?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>TabFormWidget</name>
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -4,74 +4,74 @@
 <context>
    <name>AboutWidget</name>
    <message>
-        <location filename="../aboutwidget.cpp" line="56"/>
-        <location filename="../aboutwidget.cpp" line="154"/>
+        <location filename="../aboutwidget.cpp" line="57"/>
+        <location filename="../aboutwidget.cpp" line="155"/>
        <source>HJ-USCT-01 V1.0</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="60"/>
-        <location filename="../aboutwidget.cpp" line="155"/>
+        <location filename="../aboutwidget.cpp" line="61"/>
+        <location filename="../aboutwidget.cpp" line="156"/>
        <source>?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="132"/>
+        <location filename="../aboutwidget.cpp" line="133"/>
        <source>cJSON</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="156"/>
+        <location filename="../aboutwidget.cpp" line="157"/>
        <source>Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="73"/>
-        <location filename="../aboutwidget.cpp" line="157"/>
-        <source>GUI Software V1.3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutwidget.cpp" line="66"/>
+        <location filename="../aboutwidget.cpp" line="67"/>
        <source>Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="78"/>
+        <location filename="../aboutwidget.cpp" line="74"/>
        <location filename="../aboutwidget.cpp" line="158"/>
+        <source>GUI Software V%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutwidget.cpp" line="79"/>
+        <location filename="../aboutwidget.cpp" line="159"/>
        <source>Embedded Software V1.5</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="83"/>
-        <location filename="../aboutwidget.cpp" line="159"/>
+        <location filename="../aboutwidget.cpp" line="84"/>
+        <location filename="../aboutwidget.cpp" line="160"/>
        <source>Reconstruction Software V1.2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="89"/>
-        <location filename="../aboutwidget.cpp" line="160"/>
+        <location filename="../aboutwidget.cpp" line="90"/>
+        <location filename="../aboutwidget.cpp" line="161"/>
        <source>FEB Information</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="95"/>
+        <location filename="../aboutwidget.cpp" line="96"/>
        <source>Qt 5.12.0</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="116"/>
-        <location filename="../aboutwidget.cpp" line="121"/>
+        <location filename="../aboutwidget.cpp" line="117"/>
+        <location filename="../aboutwidget.cpp" line="122"/>
        <source>Loading...</source>
        <translation>正在加载</translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="125"/>
+        <location filename="../aboutwidget.cpp" line="126"/>
        <source>Copyright (c) 1994-2021, OFFIS e.V.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="136"/>
+        <location filename="../aboutwidget.cpp" line="137"/>
        <source>Copyright (c) 2009-2017 Dave Gamble</source>
        <translation type="unfinished"></translation>
    </message>
@@ -145,18 +145,18 @@
        <translation type="vanished">医生</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="143"/>
+        <location filename="../AccountFormDialog.cpp" line="146"/>
        <source>Reset password to &quot;123456&quot; ?</source>
        <translation>密码重置为&quot;123456&quot;?</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="148"/>
+        <location filename="../AccountFormDialog.cpp" line="151"/>
        <source>Inner error, can&apos;t find reference user!</source>
        <translation>内部错误！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="153"/>
-        <location filename="../AccountFormDialog.cpp" line="191"/>
+        <location filename="../AccountFormDialog.cpp" line="156"/>
+        <location filename="../AccountFormDialog.cpp" line="194"/>
        <source>Submit change to database fail!</source>
        <translation>修改提交至数据库失败！</translation>
    </message>
@@ -166,34 +166,34 @@
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="179"/>
-        <location filename="../AccountFormDialog.cpp" line="201"/>
-        <location filename="../AccountFormDialog.cpp" line="222"/>
+        <location filename="../AccountFormDialog.cpp" line="182"/>
+        <location filename="../AccountFormDialog.cpp" line="204"/>
+        <location filename="../AccountFormDialog.cpp" line="225"/>
        <source>User Name can&apos;t be empty!</source>
        <translation>用户名不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="218"/>
+        <location filename="../AccountFormDialog.cpp" line="221"/>
        <source>User ID can&apos;t be empty!</source>
        <translation>用户ID不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="226"/>
+        <location filename="../AccountFormDialog.cpp" line="229"/>
        <source>Password can&apos;t be empty!</source>
        <translation>密码不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="230"/>
+        <location filename="../AccountFormDialog.cpp" line="233"/>
        <source>Inner error ,unset data model!</source>
        <translation>内部错误！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="234"/>
+        <location filename="../AccountFormDialog.cpp" line="237"/>
        <source>User Id exists!</source>
        <translation>用户ID已存在！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="270"/>
+        <location filename="../AccountFormDialog.cpp" line="273"/>
        <source>Submit to data base fail!</source>
        <translation>提交至数据库失败！</translation>
    </message>
@@ -207,47 +207,47 @@
    </message>
    <message>
        <location filename="../AccountTableForm.cpp" line="37"/>
-        <location filename="../AccountTableForm.cpp" line="128"/>
+        <location filename="../AccountTableForm.cpp" line="129"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
        <location filename="../AccountTableForm.cpp" line="38"/>
-        <location filename="../AccountTableForm.cpp" line="129"/>
+        <location filename="../AccountTableForm.cpp" line="130"/>
        <source>Role</source>
        <translation>角色</translation>
    </message>
    <message>
        <location filename="../AccountTableForm.cpp" line="39"/>
-        <location filename="../AccountTableForm.cpp" line="130"/>
+        <location filename="../AccountTableForm.cpp" line="131"/>
        <source>Comment</source>
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="63"/>
-        <location filename="../AccountTableForm.cpp" line="132"/>
+        <location filename="../AccountTableForm.cpp" line="64"/>
+        <location filename="../AccountTableForm.cpp" line="133"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="64"/>
-        <location filename="../AccountTableForm.cpp" line="133"/>
+        <location filename="../AccountTableForm.cpp" line="65"/>
+        <location filename="../AccountTableForm.cpp" line="134"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="65"/>
-        <location filename="../AccountTableForm.cpp" line="134"/>
+        <location filename="../AccountTableForm.cpp" line="66"/>
+        <location filename="../AccountTableForm.cpp" line="135"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="111"/>
+        <location filename="../AccountTableForm.cpp" line="112"/>
        <source>Can&apos;t delete current log in account!</source>
        <translation>当前用户无法删除日志！</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="118"/>
+        <location filename="../AccountTableForm.cpp" line="119"/>
        <source>Delete account with ID:&quot;%1&quot;!</source>
        <translation>删除账户ID:&quot;%1&quot;!</translation>
    </message>
@@ -255,20 +255,20 @@
 <context>
    <name>AdminSettingForm</name>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="32"/>
-        <location filename="../AdminSettingForm.cpp" line="82"/>
+        <location filename="../AdminSettingForm.cpp" line="33"/>
+        <location filename="../AdminSettingForm.cpp" line="84"/>
        <source>General</source>
        <translation>通用</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="32"/>
-        <location filename="../AdminSettingForm.cpp" line="82"/>
+        <location filename="../AdminSettingForm.cpp" line="33"/>
+        <location filename="../AdminSettingForm.cpp" line="84"/>
        <source>Account</source>
        <translation>用户</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="32"/>
-        <location filename="../AdminSettingForm.cpp" line="82"/>
+        <location filename="../AdminSettingForm.cpp" line="33"/>
+        <location filename="../AdminSettingForm.cpp" line="84"/>
        <source>System</source>
        <translation>系统</translation>
    </message>
@@ -297,8 +297,8 @@
        <translation type="vanished">操作日志</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="32"/>
-        <location filename="../AdminSettingForm.cpp" line="82"/>
+        <location filename="../AdminSettingForm.cpp" line="33"/>
+        <location filename="../AdminSettingForm.cpp" line="84"/>
        <source>About</source>
        <translation>关于</translation>
    </message>
@@ -362,37 +362,37 @@
 <context>
    <name>EditPatientForm</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="142"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="142"/>
        <source>Form</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="143"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="143"/>
        <source>...</source>
        <translation type="unfinished">DICOM</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="144"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="144"/>
        <source>ID</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="145"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="145"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="147"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="147"/>
        <source>Date Of Birth</source>
        <translation>出生日期</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="148"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="148"/>
        <source>Comment</source>
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="146"/>
+        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="146"/>
        <source>Gender</source>
        <translation>性别</translation>
    </message>
@@ -442,12 +442,12 @@
 <context>
    <name>GUIMessageDialog</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="106"/>
+        <location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="106"/>
        <source>Dialog</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="109"/>
+        <location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="109"/>
        <source>...</source>
        <translation></translation>
    </message>
@@ -555,7 +555,7 @@
 <context>
    <name>InputObject</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_inputobject.h" line="113"/>
+        <location filename="../../cmake-build-debug/ui_inputobject.h" line="113"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -590,7 +590,7 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_mainwindow.h" line="40"/>
+        <location filename="../../cmake-build-debug/ui_mainwindow.h" line="40"/>
        <source>MainWindow</source>
        <translation></translation>
    </message>
@@ -626,47 +626,47 @@
 <context>
    <name>PatientInformationForm</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="118"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="118"/>
        <source>Form</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="119"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="119"/>
        <source>Patient Information</source>
        <translation>患者信息</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="120"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="120"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PatientID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;患者ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="121"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="121"/>
        <source>Someone Somebody</source>
        <translation>XXX</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="122"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="122"/>
        <source>2021/11/11</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="123"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="123"/>
        <source>Female</source>
        <translation>女</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="124"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="124"/>
        <source>Acc# 27812398</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="127"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="127"/>
        <source>Current Protocol</source>
        <translation>当前协议</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/>
+        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="128"/>
        <location filename="../patientinformationform.cpp" line="42"/>
        <source>LEFT ONLY</source>
        <translation>左侧</translation>
@@ -769,75 +769,80 @@ parameters
 <context>
    <name>SelectFormWidget</name>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="45"/>
-        <location filename="../SelectFormWidget.cpp" line="288"/>
+        <location filename="../SelectFormWidget.cpp" line="48"/>
+        <location filename="../SelectFormWidget.cpp" line="301"/>
        <source>Account</source>
        <translation>账户</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="46"/>
+        <location filename="../SelectFormWidget.cpp" line="49"/>
        <source>Worklist</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="57"/>
-        <location filename="../SelectFormWidget.cpp" line="290"/>
+        <location filename="../SelectFormWidget.cpp" line="60"/>
+        <location filename="../SelectFormWidget.cpp" line="303"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="58"/>
-        <location filename="../SelectFormWidget.cpp" line="291"/>
+        <location filename="../SelectFormWidget.cpp" line="61"/>
+        <location filename="../SelectFormWidget.cpp" line="304"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="59"/>
-        <location filename="../SelectFormWidget.cpp" line="292"/>
+        <location filename="../SelectFormWidget.cpp" line="62"/>
+        <location filename="../SelectFormWidget.cpp" line="305"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="60"/>
-        <location filename="../SelectFormWidget.cpp" line="293"/>
+        <location filename="../SelectFormWidget.cpp" line="63"/>
+        <location filename="../SelectFormWidget.cpp" line="306"/>
        <source>Select</source>
        <translation>选择</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="82"/>
-        <location filename="../SelectFormWidget.cpp" line="282"/>
+        <location filename="../SelectFormWidget.cpp" line="87"/>
+        <location filename="../SelectFormWidget.cpp" line="295"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="83"/>
-        <location filename="../SelectFormWidget.cpp" line="283"/>
+        <location filename="../SelectFormWidget.cpp" line="88"/>
+        <location filename="../SelectFormWidget.cpp" line="296"/>
        <source>Birth Date</source>
        <translation>出生日期</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="84"/>
-        <location filename="../SelectFormWidget.cpp" line="284"/>
+        <location filename="../SelectFormWidget.cpp" line="89"/>
+        <location filename="../SelectFormWidget.cpp" line="297"/>
        <source>Gender</source>
        <translation>性别</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="85"/>
-        <location filename="../SelectFormWidget.cpp" line="285"/>
+        <location filename="../SelectFormWidget.cpp" line="90"/>
+        <location filename="../SelectFormWidget.cpp" line="298"/>
        <source>Add Date</source>
        <translation>添加日期</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="86"/>
-        <location filename="../SelectFormWidget.cpp" line="286"/>
+        <location filename="../SelectFormWidget.cpp" line="91"/>
+        <location filename="../SelectFormWidget.cpp" line="299"/>
        <source>Comment</source>
        <translation>备注</translation>
    </message>
+    <message>
+        <location filename="../SelectFormWidget.cpp" line="236"/>
+        <source>Delete Patient &quot;%1&quot; ?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>TabFormWidget</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_tabformwidget.h" line="54"/>
+        <location filename="../../cmake-build-debug/ui_tabformwidget.h" line="54"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -894,7 +899,7 @@ parameters
 <context>
    <name>dicomCfgDialog</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="321"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="321"/>
        <source>Dialog</source>
        <translation></translation>
    </message>
@@ -903,57 +908,57 @@ parameters
        <translation type="vanished">DICOM 设置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="322"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="322"/>
        <source>DICOM Settings</source>
        <translation>DICOM 配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="326"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="329"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="337"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="326"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="329"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="337"/>
        <source>Name</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="323"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="330"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="336"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="323"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="330"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="336"/>
        <source>IP</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="325"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="332"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="335"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="325"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="332"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="335"/>
        <source>Port</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="324"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="331"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="338"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="324"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="331"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="338"/>
        <source>AE</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="328"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="328"/>
        <source>Worklist</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="327"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="333"/>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="339"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="327"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="333"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="339"/>
        <source>...</source>
        <translation>DICOM</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="334"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="334"/>
        <source>PACS</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="340"/>
+        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="340"/>
        <source>3D Recon</source>
        <translation></translation>
    </message>
@@ -971,18 +976,18 @@ parameters
 <context>
    <name>networkCfgDialog</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="453"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="454"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="453"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="454"/>
        <source>Network Settings</source>
        <translation>网络配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="464"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="464"/>
        <source>Address</source>
        <translation>IP配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="455"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="455"/>
        <location filename="../network/networkcfgdialog.cpp" line="33"/>
        <source>IP Address</source>
        <translation>IP地址</translation>
@@ -996,85 +1001,85 @@ parameters
        <translation type="vanished">动态地址</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="457"/>
        <source>Dev</source>
        <translation>设备</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="459"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="459"/>
        <source>Subnet Mask</source>
        <translation>子网掩码</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="460"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="460"/>
        <source>Additional Address</source>
        <translation>额外地址</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="461"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="468"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="461"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="468"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="462"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="469"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="462"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="469"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="463"/>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="463"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="470"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="471"/>
        <source>Routing</source>
        <translation>路由配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="466"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="466"/>
        <source>Default IPv4 Gateway</source>
        <translation>默认网关</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="456"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="456"/>
        <source>DHCP</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="467"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="467"/>
        <source>Routing Table</source>
        <translation>路由表</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="472"/>
        <source>Name</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="473"/>
        <source>Port</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="474"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="474"/>
        <source>AE</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="475"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="475"/>
        <source>IP</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="476"/>
        <source>DICOM</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
+        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="477"/>
        <source>Result</source>
        <translation>结果</translation>
    </message>
@@ -1108,7 +1113,7 @@ parameters
 <context>
    <name>systemSettingForm</name>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="281"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="281"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -1117,17 +1122,17 @@ parameters
        <translation type="vanished">网络配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="282"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="282"/>
        <source>Protocal</source>
        <translation>默认扫描协议</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="286"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="286"/>
        <source>Worklist Filter</source>
        <translation>Worklist过滤器</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="289"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="289"/>
        <source>Disk Storage</source>
        <translation>磁盘存储</translation>
    </message>
@@ -1136,7 +1141,7 @@ parameters
        <translation type="vanished">DICOM</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="284"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="284"/>
        <source>Auto Verify</source>
        <translation>自动验证</translation>
    </message>
@@ -1145,7 +1150,7 @@ parameters
        <translation type="vanished">配置</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="285"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="285"/>
        <source>IP</source>
        <translation></translation>
    </message>
@@ -1162,7 +1167,7 @@ parameters
        <translation type="vanished">接受</translation>
    </message>
    <message>
-        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="288"/>
+        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="288"/>
        <source>DICOM</source>
        <translation></translation>
    </message>
Author	SHA1	Message	Date
Krad	866cdd3c41	V0.6.9	2022-03-15 16:29:34 +08:00
Krad	ff9020033a	Comments for cmake	2022-03-15 16:23:14 +08:00
Krad	5fb24642e3	Fix patient tableView selection bugs.	2022-03-15 16:22:58 +08:00
Krad	52bf2527fa	Add currentRowChanged signal to SlideableTableView	2022-03-15 16:22:07 +08:00
xueyan hu	e3253047af	Merge branch 'release' of http://192.168.1.178:3000/kradchen/GUI into release	2022-03-15 13:07:59 +08:00
xueyan hu	fc1be95066	Fixing VKB QDateEdit <Enter> does not work!	2022-03-15 13:06:50 +08:00
Krad	7d963899a2	Add column sort arrow to tableview	2022-03-14 18:07:28 +08:00
Krad	9366ac9bd4	V0.6.8 release check in.	2022-03-14 16:41:13 +08:00
Krad	8011ac9df8	Add Version build function to CMakeLists.txt	2022-03-08 10:45:38 +08:00
Krad	e5e4bee129	Fix Account Dialog stuck, when change pwd dialog show and click the Account Dialog.	2022-03-08 10:45:38 +08:00
Krad	3eff53a74b	Fix unselect bug of Patient grid after delete.	2022-03-08 10:45:38 +08:00
Krad	9c1b53832f	Add confirm to delete Patient.	2022-03-08 10:45:38 +08:00
Krad	39dc22a1cd	New method to set USE_SHIMLIB(use cmake parameter -DUSE_SHIMLIB=ON)	2022-03-08 10:45:38 +08:00
Krad	13fcad6d08	Add setTitle to AlertDialog	2022-03-08 10:45:38 +08:00
Krad	3fe25ce14e	Style fix	2022-03-08 10:45:38 +08:00
xueyan hu	89d237c7d5	bug fixes	2022-03-08 10:45:38 +08:00
xueyan hu	1f24841ba8	complete two finger swipe	2022-03-08 10:45:38 +08:00
Krad	d44671fb93	Fix a GUIErrorFactory out of bound bug.	2022-03-08 10:45:38 +08:00