DEV_OUTPATH Test

Style sheet error fix.
Code clean, and code style error fix.
2022-05-07 14:39:10 +08:00 · 2022-04-22 17:17:05 +08:00 · 2022-04-22 17:16:45 +08:00 · 2022-04-06 10:05:25 +08:00 · 2022-04-06 09:50:25 +08:00 · 2022-04-06 09:29:17 +08:00
85 changed files with 520 additions and 632 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # GUI Version
 set(GUI_VERSION_MAJOR 0)
 set(GUI_VERSION_MINOR 6)
-set(GUI_VERSION_BUILD 9)
+set(GUI_VERSION_BUILD 10)
 set(GUI_VERSION_BETA 1)
 # use AppVersion.h as a configure file
 configure_file(
@@ -40,7 +40,7 @@ source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${project_c})
 find_package(Qt5 COMPONENTS Core Widgets Gui OpenGL Sql VirtualKeyboard Network REQUIRED)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
-file(GLOB  project_uis ./src/*.ui)
+file(GLOB_RECURSE  project_uis ./src/*.ui)
 qt5_wrap_ui(ui_FILES ${project_uis})
 file(GLOB  project_res ./src/*.qrc)

--- a/docs/v0.6.10.txt
+++ b/docs/v0.6.10.txt
@@ -0,0 +1,5 @@
+v0.6.10
+
+重写了整个Patient的修改和新增逻辑，使用模态对话框替代的原来界面内的显示。
+去除了原来界面内编辑区域，只做显示使用。
+此外，使用滑动块替换了性别选择，日期选择的功能。
--- a/src/DateSelectDialog.cpp
+++ b/src/DateSelectDialog.cpp
@@ -5,7 +5,6 @@
 #include "DateSelectDialog.h"
 #include <QVBoxLayout>
 #include "components/DateSlidePickerBox.h"
-#include <QDate>
 DateSelectDialog::DateSelectDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
    this->setFixedSize(460, 380);
    QVBoxLayout* layout = new QVBoxLayout(formWidget);
--- a/src/DateSelectDialog.h
+++ b/src/DateSelectDialog.h
@@ -5,7 +5,7 @@
 #ifndef GUI_DATESELECTDIALOG_H
 #define GUI_DATESELECTDIALOG_H

-#include "GUIFormBaseDialog.h"
+#include "dialogs/GUIFormBaseDialog.h"
 class DateSlidePickerBox;
 class DateSelectDialog:public  GUIFormBaseDialog{
    Q_OBJECT
--- a/src/EditPatientDialog.cpp
+++ b/src/EditPatientDialog.cpp
@@ -10,11 +10,11 @@
 #include <QSqlTableModel>
 #include <QUuid>
 #include "EditPatientDialog.h"
-#include "SelectDialog.h"
+#include "dialogs/SelectDialog.h"
 #include "DateSelectDialog.h"
 #include "components/Listbox.h"

-int queryValue(QSqlTableModel* model, int colID, QVariant var)
+int queryValue(QSqlTableModel* model, int colID, const QVariant& var)
 {
    for (int i = 0; i < model->rowCount(); ++i) {
        if (model->data(model->index(i, colID)) == var) return i;
--- a/src/EditPatientDialog.h
+++ b/src/EditPatientDialog.h
@@ -5,8 +5,8 @@
 #ifndef GUI_EDITPATIENTDIALOG_H
 #define GUI_EDITPATIENTDIALOG_H

-#include "GUIFormBaseDialog.h"
-#include "editpatientform.h"
+#include "dialogs/GUIFormBaseDialog.h"
+#include "forms/select/editpatientform.h"

 class QLineEdit;
 class QTextEdit;
--- a/src/ShimLib/ShimLib.c
+++ b/src/ShimLib/ShimLib.c
@@ -113,6 +113,8 @@ const char* GetDeviceInfo(DeviceInfo infoType) {
 		return "28";
 	case  VERSION:
            return "6.6.06";
+	    case DEV_OUTPATH:
+	        return "path to store bin";
 	}
 	return "";
 }
--- a/src/ShimLib/ShimLib.h
+++ b/src/ShimLib/ShimLib.h
@@ -30,7 +30,8 @@ typedef enum {
 //kinds of device information
 typedef enum {
    MEAN_TEMPERATURE,
-    VERSION
+    VERSION,
+    DEV_OUTPATH
 } DeviceInfo;

 extern int InitLib(void(*)(const char *msg));
--- a/src/UserOperationLogForm.cpp
+++ b/src/UserOperationLogForm.cpp
@@ -13,8 +13,8 @@
 #include <QTableView>
 #include "components/SlideableTableView.h"
 #include <QPushButton>
-#include "SelectDialog.h"
-#include "mainwindow.h"
+#include "src/dialogs/SelectDialog.h"
+#include "src/windows/mainwindow.h"
 #include "event/EventCenter.h"
 QString fileNameToDate(QString fileName)
 {
--- a/src/components/AccountRoleComboDelegate.cpp
+++ b/src/components/AccountRoleComboDelegate.cpp
@@ -3,9 +3,7 @@
 //

 #include "AccountRoleComboDelegate.h"
-#include <QComboBox>
 #include <QPainter>
-#include <QStyleOptionViewItem>
 #include "db/SQLHelper.h"
 AccountRoleComboDelegate::AccountRoleComboDelegate(QWidget *parent):QItemDelegate(parent) {
    SQLHelper::QueryMap("select RoleID,RoleName from Role",map);
--- a/src/components/SlidePickerBox.cpp
+++ b/src/components/SlidePickerBox.cpp
@@ -6,7 +6,7 @@
 #include <QPainter>
 #include <QMouseEvent>
 #include <QLabel>
-#include <QFont>
+
 #include <qdebug.h>
 const int fontSize = 80;
 SlidePickerBox::SlidePickerBox(QWidget *parent):QWidget(parent) {
@@ -143,7 +143,7 @@ void SlidePickerBox::paintText(QString txt, int x, int y, const QColor& color) {
    painter.drawText(x,y,txt);
 }

-void SlidePickerBox::setItems(QStringList itemsList) {
+void SlidePickerBox::setItems(const QStringList& itemsList) {
    this->items = itemsList;
    hideLabel(selectedLbl);
    hideLabel(prevLbl);
--- a/src/components/SlidePickerBox.h
+++ b/src/components/SlidePickerBox.h
@@ -12,7 +12,7 @@ class SlidePickerBox:public QWidget {
 public:
    explicit SlidePickerBox(QWidget *parent = nullptr);
    QString getSelectedValue();
-    void setItems(QStringList itemsList);
+    void setItems(const QStringList& itemsList);
    void addItem(QString& item) {
        this->items.append(item);
    }
--- a/src/components/SlideableTableView.cpp
+++ b/src/components/SlideableTableView.cpp
@@ -6,7 +6,7 @@
 #include <QScrollBar>
 #include <QMouseEvent>
 #include <QApplication>
-#include <math.h>
+#include <cmath>

 SlideableTableView::SlideableTableView(QWidget *parent) : QTableView(parent) {

--- a/src/components/battery.cpp
+++ b/src/components/battery.cpp
@@ -229,23 +229,23 @@ QColor Battery::getNormalColorEnd() const

 QSize Battery::sizeHint() const
 {
-	return QSize(90, 120);
+	return {90, 120};
 }

 QSize Battery::minimumSizeHint() const
 {
-	return QSize(10, 30);
+	return {10, 30};
 }

-void Battery::setRange(double minValue, double maxValue)
+void Battery::setRange(double minVal, double maxVal)
 {
 	//如果最小值大于或者等于最大值则不设置
-	if (minValue >= maxValue) {
+	if (minVal >= maxVal) {
 		return;
 	}

-	this->minValue = minValue;
-	this->maxValue = maxValue;
+	this->minValue = minVal;
+	this->maxValue = maxVal;

 	//如果目标值不在范围值内,则重新设置目标值
 	//值小于最小值则取最小值,大于最大值则取最大值
@@ -259,19 +259,19 @@ void Battery::setRange(double minValue, double maxValue)
 	this->update();
 }

-void Battery::setRange(int minValue, int maxValue)
+void Battery::setRange(int minVal, int maxVal)
 {
-	setRange((double)minValue, (double)maxValue);
+	setRange((double)minVal, (double)maxVal);
 }

-void Battery::setMinValue(double minValue)
+void Battery::setMinValue(double minVal)
 {
-	setRange(minValue, maxValue);
+	setRange(minVal, maxValue);
 }

-void Battery::setMaxValue(double maxValue)
+void Battery::setMaxValue(double maxVal)
 {
-	setRange(minValue, maxValue);
+	setRange(minValue, maxVal);
 }

 void Battery::setValue(double value)
--- a/src/components/imageswitch.cpp
+++ b/src/components/imageswitch.cpp
@@ -45,7 +45,7 @@ ImageSwitch::ButtonStyle ImageSwitch::getButtonStyle() const

 QSize ImageSwitch::sizeHint() const
 {
-	return QSize(100, 50);
+	return {100, 50};
 }

 QSize ImageSwitch::minimumSizeHint() const
@@ -53,19 +53,19 @@ QSize ImageSwitch::minimumSizeHint() const
 	return sizeHint();
 }

-void ImageSwitch::setChecked(bool isChecked)
+void ImageSwitch::setChecked(bool value)
 {
-	if (this->isChecked != isChecked) {
-		this->isChecked = isChecked;
+	if (this->isChecked != value) {
+		this->isChecked = value;
 		imgFile = isChecked ? imgOnFile : imgOffFile;
 		this->update();
 	}
 }

-void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& buttonStyle)
+void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& style)
 {
-	if (this->buttonStyle != buttonStyle) {
-		this->buttonStyle = buttonStyle;
+	if (this->buttonStyle != style) {
+		this->buttonStyle = style;

 		if (buttonStyle == ButtonStyle_1) {
 			imgOffFile = ":/icons/imageswitch/btncheckoff1.png";
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -314,3 +314,7 @@ void DeviceManager::close() {
 QString DeviceManager::getSoftwareVersion() {
    return GetDeviceInfo(VERSION);
 }
+
+QString DeviceManager::getScanOutputPath() {
+    return GetDeviceInfo(DEV_OUTPATH);
+}
--- a/src/device/DeviceManager.h
+++ b/src/device/DeviceManager.h
@@ -21,6 +21,7 @@ public:
        errorOccurred = v;
    }
    QString getSoftwareVersion();
+    QString getScanOutputPath();
    bool getErrorOccurred(){
        return errorOccurred;
    }
--- a/src/dialogs/AccountFormDialog.cpp
+++ b/src/dialogs/AccountFormDialog.cpp
--- a/src/dialogs/AccountFormDialog.h
+++ b/src/dialogs/AccountFormDialog.h
--- a/src/dialogs/AlertDialog.cpp
+++ b/src/dialogs/AlertDialog.cpp
--- a/src/dialogs/AlertDialog.h
+++ b/src/dialogs/AlertDialog.h
--- a/src/dialogs/ChangePasswordFormDialog.cpp
+++ b/src/dialogs/ChangePasswordFormDialog.cpp
--- a/src/dialogs/ChangePasswordFormDialog.h
+++ b/src/dialogs/ChangePasswordFormDialog.h
--- a/src/dialogs/GUIFormBaseDialog.cpp
+++ b/src/dialogs/GUIFormBaseDialog.cpp
--- a/src/dialogs/GUIFormBaseDialog.h
+++ b/src/dialogs/GUIFormBaseDialog.h
--- a/src/dialogs/SelectDialog.cpp
+++ b/src/dialogs/SelectDialog.cpp
@@ -24,7 +24,7 @@ bool SelectDialog::updateReferenceData() {
 	return true;
 }

-void SelectDialog::setValues(QStringList dates) {
+void SelectDialog::setValues(const QStringList& dates) {
 	box->setItems(dates);
 }

--- a/src/dialogs/SelectDialog.h
+++ b/src/dialogs/SelectDialog.h
@@ -12,7 +12,7 @@ class SelectDialog :public  GUIFormBaseDialog{
 public:
    explicit SelectDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
    ~SelectDialog() override;
-    void setValues(QStringList values);
+    void setValues(const QStringList& values);
    QString getSelectedValue();
    void setSelectedValue(const QString& val);
 protected:
--- a/src/dialogs/guimessagedialog.cpp
+++ b/src/dialogs/guimessagedialog.cpp
--- a/src/dialogs/guimessagedialog.h
+++ b/src/dialogs/guimessagedialog.h
--- a/src/dialogs/guimessagedialog.ui
+++ b/src/dialogs/guimessagedialog.ui
--- a/src/editpatientform.cpp
+++ b/src/editpatientform.cpp
@@ -1,167 +0,0 @@
-#include "editpatientform.h"
-#include "ui_editpatientform.h"
-#include <QListView>
-#include <QHBoxLayout>
-#include <QToolButton>
-#include <QButtonGroup>
-#include "guimacros.h"
-#include <qdebug.h>
-#include "event/EventCenter.h"
-
-EditPatientForm::EditPatientForm(QWidget* parent) :
-	QWidget(parent),
-	ui(new Ui::EditPatientForm)
-{
-//    this->layout()->setContentsMargins(5,5,5,5);
-	ui->setupUi(this);
-	//ui->lbl_Sex->setText(tr("Gender"));
-	QHBoxLayout* sexlayout = new QHBoxLayout(ui->sexpanelwidget);
-	sexlayout->setMargin(6);
-	ADD_TOOL_SIZE_BTN_TO_LAYOUT(F, ":/icons/female_d.png", 30, sexlayout);
-	ADD_TOOL_SIZE_BTN_TO_LAYOUT(M, ":/icons/male_d.png", 30, sexlayout);
-	btnF->setText(tr("Female"));
-	btnM->setText(tr("Male"));
-
-    ui->hideBtn->setSizePolicy(QSizePolicy::Policy::Expanding,QSizePolicy::Policy::Preferred);
-    ui->hideBtn->setObjectName("hideeditBtn");
-    ui->hideBtn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    ui->hideBtn->setIcon(QIcon(":/icons/hidearrow.png"));
-    ui->hideBtn->setIconSize({30,30});
-	ui->hideBtn->setText(tr("   Hide Panel"));
-    connect(ui->hideBtn,&QToolButton::clicked,[=](){
-        emit hideBtnClicked();
-    });
-
-	//    btnFemale->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	//    btnMale->setToolButtonStyle(Qt::ToolButtonIconOnly);
-
-	btnF->setObjectName("sexBtn");
-	btnM->setObjectName("sexBtn");
-	//btnF->setText("Female");
-	//btnM->setText("Male");
-	ui->sexpanelwidget->setEnabled(editEnable);
-	btnF->setEnabled(editEnable);
-	btnM->setEnabled(editEnable);
-	btnF->setCheckable(true);
-	btnM->setCheckable(true);
-	QButtonGroup* group = new QButtonGroup(this);
-	group->addButton(btnF);
-	group->addButton(btnM);
-	btnF->setChecked(true);
-	btnFemale = btnF;
-	btnMale = btnM;
-	QHBoxLayout* layout = new QHBoxLayout(this->ui->editcmdWidget);
-
-	ADD_TOOL_BTN(Cancel, ":/icons/close_circle.png");
-	ADD_TOOL_BTN(Accpet, ":/icons/selected.png");
-	btnCancel->setText(tr("Cancel"));
-	btnAccpet->setText(tr("Accept"));
-	btnCancel->setEnabled(editEnable);
-	btnCancel->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	btnCancel->setIcon(QIcon(editEnable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png"));
-	btnAccpet->setEnabled(editEnable);
-	btnAccpet->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	btnAccpet->setIcon(QIcon(editEnable ? ":/icons/selected.png" : ":/icons/selected_d.png"));
-	btnEditAccept = btnAccpet;
-	btnEditCancel = btnCancel;
-	connect(btnEditCancel, &QToolButton::clicked, [=]() {
-		clearPatientInformation();
-		this->setEditEnable(false);
-		restorePatientInformation();
-		emit editCancel();
-		});
-	connect(btnEditAccept, &QToolButton::clicked, [=]() {
-		if (ui->tbx_ID->text().isEmpty())return;
-		if (ui->tbx_Name->text().isEmpty())return;
-		storePatientInformation();
-		bool result = true;
-		emit editAccept(getPatientInformation(), result);
-		if (result) this->setEditEnable(false);
-		});
-	ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd");
-
-	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
-
-		ui->retranslateUi(this);
-		btnF->setText(tr("Female"));
-		btnM->setText(tr("Male"));
-		btnCancel->setText(tr("Cancel"));
-		btnAccpet->setText(tr("Accept"));
-		});
-
-
-
-}
-
-EditPatientForm::~EditPatientForm()
-{
-	delete ui;
-}
-
-void EditPatientForm::setPatientInformation(PatientInformation* information) {
-	if (information)
-	{
-		ui->tbx_ID->setText(information->ID);
-		ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate, "yyyy-MM-dd"));
-		ui->tbx_Name->setText(information->Name);
-		ui->rtbx_Comment->setText(information->Comment);
-		btnFemale->setChecked(information->Sex == "F");
-		btnMale->setChecked(information->Sex != "F");
-		currentPatientUID = information->PatientUID;
-		AddDate = information->AddDate;
-		storePatientInformation();
-	}
-}
-
-void EditPatientForm::clearPatientInformation() {
-	ui->tbx_ID->setText("");
-	ui->tbx_Dob->setDate(QDate::currentDate());
-	ui->tbx_Name->setText("");
-	btnFemale->setChecked(true);
-	btnMale->setChecked(false);
-	ui->rtbx_Comment->setText("");
-	currentPatientUID = "";
-	AddDate = "";
-}
-
-void EditPatientForm::setEditEnable(bool enable) {
-	ui->tbx_ID->setEnabled(enable);
-	ui->tbx_Dob->setEnabled(enable);
-	ui->tbx_Name->setEnabled(enable);
-	ui->sexpanelwidget->setEnabled(enable);
-	btnFemale->setEnabled(enable);
-	btnFemale->setIcon(QIcon(enable ? ":/icons/female.png" : ":/icons/female_d.png"));
-	btnMale->setEnabled(enable);
-	btnMale->setIcon(QIcon(enable ? ":/icons/male.png" : ":/icons/male_d.png"));
-	ui->rtbx_Comment->setEnabled(enable);
-	btnEditAccept->setEnabled(enable);
-	btnEditCancel->setEnabled(enable);
-	btnEditCancel->setIcon(QIcon(enable ? ":/icons/close_circle.png" : ":/icons/close_circle_d.png"));
-	btnEditAccept->setIcon(QIcon(enable ? ":/icons/selected.png" : ":/icons/selected_d.png"));
-	editEnable = enable;
-	//    ui->->setEnabled(enable);
-}
-
-void EditPatientForm::storePatientInformation() {
-	store.PatientUID = currentPatientUID;
-	store.AddDate = AddDate;
-	store.ID = ui->tbx_ID->text();
-	store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd");
-	store.Name = ui->tbx_Name->text();
-	store.Sex = btnFemale->isChecked() ? "F" : "M";
-	store.Comment = ui->rtbx_Comment->toPlainText();
-	qDebug() << store.PatientUID << "," << store.ID << "," << store.BirthDate << "," << store.Name << "," << store.Sex;
-}
-
-void EditPatientForm::restorePatientInformation() {
-	currentPatientUID = store.PatientUID;
-	AddDate = store.AddDate;
-	ui->tbx_ID->setText(store.ID);
-	ui->tbx_Dob->setDate(QDate::fromString(store.BirthDate, "yyyy-MM-dd"));
-	ui->tbx_Name->setText(store.Name);
-	ui->rtbx_Comment->setText(store.Comment);
-	btnFemale->setChecked(store.Sex == "F");
-	btnMale->setChecked(store.Sex != "F");
-	//    ui->cb_Sex->setCurrentText(store.Sex=="F"?"Female":(store.Name=="M"?"Male":"Other"));
-
-}
--- a/src/editpatientform.ui
+++ b/src/editpatientform.ui
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EditPatientForm</class>
- <widget class="QWidget" name="EditPatientForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>466</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QToolButton" name="hideBtn">
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="leftMargin">
-      <number>6</number>
-     </property>
-     <property name="topMargin">
-      <number>6</number>
-     </property>
-     <property name="rightMargin">
-      <number>6</number>
-     </property>
-     <property name="bottomMargin">
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="lbl_ID">
-       <property name="text">
-        <string>ID</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tbx_ID">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lbl_Name">
-       <property name="text">
-        <string>Name</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tbx_Name">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lbl_Sex">
-       <property name="text">
-        <string>Gender</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="sexpanelwidget" native="true"/>
-     </item>
-     <item>
-      <widget class="QLabel" name="lbl_DOB">
-       <property name="text">
-        <string>Date Of Birth</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDateEdit" name="tbx_Dob">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="buttonSymbols">
-        <enum>QAbstractSpinBox::NoButtons</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="widget" native="true">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>1</number>
-        </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lbl_Comment">
-       <property name="text">
-        <string>Comment</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QTextEdit" name="rtbx_Comment">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="editcmdWidget" native="true"/>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/src/forms/TopBarWidget.cpp
+++ b/src/forms/TopBarWidget.cpp
--- a/src/forms/TopBarWidget.h
+++ b/src/forms/TopBarWidget.h
--- a/src/forms/scan/ScanFormWidget.cpp
+++ b/src/forms/scan/ScanFormWidget.cpp
@@ -8,7 +8,7 @@
 #include <QToolButton>
 #include "ui_tabformwidget.h"
 #include "guimacros.h"
-#include "patientinformationform.h"
+#include "src/forms/scan/patientinformationform.h"
 #include <QButtonGroup>
 #include "event/EventCenter.h"
 #include <QImage>
--- a/src/forms/scan/ScanFormWidget.h
+++ b/src/forms/scan/ScanFormWidget.h
@@ -5,7 +5,7 @@
 #ifndef GUI_SCANFORMWIDGET_H
 #define GUI_SCANFORMWIDGET_H

-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <functional>
 class PatientInformationForm;
 class ScanFormWidget :public TabFormWidget {
--- a/src/forms/scan/patientinformationform.cpp
+++ b/src/forms/scan/patientinformationform.cpp
--- a/src/forms/scan/patientinformationform.h
+++ b/src/forms/scan/patientinformationform.h
@@ -2,7 +2,7 @@
 #define PATIENTINFORMATIONFORM_H

 #include <QWidget>
-#include "editpatientform.h"
+#include "src/forms/select/editpatientform.h"
 namespace Ui {
 class PatientInformationForm;
 }
--- a/src/forms/scan/patientinformationform.ui
+++ b/src/forms/scan/patientinformationform.ui
--- a/src/forms/select/SelectFormWidget.cpp
+++ b/src/forms/select/SelectFormWidget.cpp
@@ -11,15 +11,13 @@
 #include <QUuid>
 #include <QDate>
 #include "db/SQLHelper.h"
-#include "editpatientform.h"
 #include "guimacros.h"
 #include "event/EventCenter.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include <QDebug>
 #include "log/UserOperationLog.h"
-#include <QSortFilterProxyModel>
 #include "src/components/VerticalTextToolButton.h"
-#include "AlertDialog.h"
+#include "dialogs/AlertDialog.h"

 #include <QScroller>

@@ -124,13 +122,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	if (model->rowCount() > 0)
 	{
 		table->selectRow(0);
-		PatientInformation pat;
-#define ADD_PATIENT_PROPERTY(val)\
-        pat. val = model->data(model->index(table->currentIndex().row(),PatientInformationEnum:: val)).toString();
-		EDIT_PATIENT()
-#undef ADD_PATIENT_PROPERTY
-			edit_patient->setPatientInformation(&pat);
-	}
+        setPatientDetail(table, model, edit_patient);
+    }
 	//events----------------------------------------------------------------------
 	//prepare button state
    auto prepareButtons = [=](bool disableALL){
@@ -142,12 +135,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
    };
 	//table current row selection changing event
 	connect(table, &SlideableTableView::currentRowChanged, [=](int row) {
-			PatientInformation pat;
-#define ADD_PATIENT_PROPERTY(val)\
-            pat. val = model->data(model->index(row,PatientInformationEnum:: val)).toString();
-			EDIT_PATIENT()
-#undef ADD_PATIENT_PROPERTY
-				edit_patient->setPatientInformation(&pat);
+        setPatientDetail(table, model, edit_patient);
        prepareButtons(false);
 	});

@@ -168,7 +156,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
            table->selectRow(0);
            model->selectRow(0);
        }
-        LOG_USER_OPERATION(AddPatient);
+        LOG_USER_OPERATION(AddPatient)
        btnSelect->setEnabled(true);
 	});

@@ -181,6 +169,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
        // accept change
        if (dialog.exec() == QDialog::Accepted) {
            table->clicked(table->currentIndex());
+            setPatientDetail(table, model, edit_patient);
            LOG_USER_OPERATION(AddPatient);
            btnSelect->setEnabled(true);
        }
@@ -204,10 +193,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 			selectedRow = 0;
 		}
 		qDebug() << inf->PatientUID << inf->AddDate;
-#define ADD_PATIENT_PROPERTY(val)\
+        #define ADD_PATIENT_PROPERTY(val)\
        model->setData(model->index(selectedRow,PatientInformationEnum:: val),inf-> val);
 		EDIT_PATIENT()
-#undef ADD_PATIENT_PROPERTY
+        #undef ADD_PATIENT_PROPERTY
 			if (model->submitAll())
 			{
 				table->selectRow(selectedRow);
@@ -217,11 +206,11 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 				//TODO:add some error handle logic
 			}
 		if (isAdd) {
-			LOG_USER_OPERATION(AddPatient);
+			LOG_USER_OPERATION(AddPatient)
 		}
 		else
 		{
-			LOG_USER_OPERATION(ChangePatientInfo);
+			LOG_USER_OPERATION(ChangePatientInfo)
 		}
 		btnSelect->setEnabled(true);
 		});
@@ -247,7 +236,6 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
        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);

@@ -256,16 +244,15 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
            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()
-#undef ADD_PATIENT_PROPERTY
-                edit_patient->setPatientInformation(&pat);
-                LOG_USER_OPERATION(DeletePatient);
+                setPatientDetail(table, model, edit_patient);
+                LOG_USER_OPERATION(DeletePatient)
            }
        } else {
            //TODO:error handle
+            dialog.setButtonMode(OkOnly);
+            dialog.setTitle(tr("Alert"));
+            dialog.setAlertMessage(QString(tr("Can't delete selected Patient , db submit error!")));
+            dialog.exec();
        }
        prepareButtons(false);

@@ -276,7 +263,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :

 		EventCenter::Default()->triggerEvent(GUIEvents::PatientSelected, nullptr, edit_patient->getPatientInformation()->Copy());
        selectedPatientUID = edit_patient->getPatientInformation()->PatientUID;
-		LOG_USER_OPERATION(SelectPatient);
+		LOG_USER_OPERATION(SelectPatient)
 		});

    // btn account slot
@@ -318,6 +305,16 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
    prepareButtons(false);
 }

+void SelectFormWidget::setPatientDetail(const SlideableTableView *table, const QSqlTableModel *model,
+                                        EditPatientForm *edit_patient) const {
+    PatientInformation pat;
+#define ADD_PATIENT_PROPERTY(val)\
+        pat. val = model->data(model->index(table->currentIndex().row(),PatientInformationEnum:: val),Qt::EditRole).toString();
+    EDIT_PATIENT()
+#undef ADD_PATIENT_PROPERTY
+    edit_patient->setPatientInformation(&pat);
+}
+

 SelectFormWidget::~SelectFormWidget()
 {
--- a/src/forms/select/SelectFormWidget.h
+++ b/src/forms/select/SelectFormWidget.h
@@ -5,9 +5,11 @@
 #ifndef GUI_SELECTFORMWIDGET_H
 #define GUI_SELECTFORMWIDGET_H

-#include "tabformwidget.h"
+
+#include "forms/tabformwidget.h"
 #include "EditPatientDialog.h"
 class EditPatientForm;
+class SlideableTableView;
 class SelectFormWidget: public TabFormWidget {
    Q_OBJECT
 public:
@@ -17,6 +19,8 @@ public:
 private:
    QString selectedPatientUID;

+    void
+    setPatientDetail(const SlideableTableView *table, const QSqlTableModel *model, EditPatientForm *edit_patient) const;
 };


--- a/src/forms/select/editpatientform.cpp
+++ b/src/forms/select/editpatientform.cpp
@@ -0,0 +1,88 @@
+#include "editpatientform.h"
+#include "ui_editpatientform.h"
+#include <QListView>
+#include <QHBoxLayout>
+#include <QToolButton>
+#include <QButtonGroup>
+#include "guimacros.h"
+#include <qdebug.h>
+#include "event/EventCenter.h"
+
+EditPatientForm::EditPatientForm(QWidget* parent) :
+	QWidget(parent),
+	ui(new Ui::EditPatientForm)
+{
+//    this->layout()->setContentsMargins(5,5,5,5);
+	ui->setupUi(this);
+
+    ui->hideBtn->setSizePolicy(QSizePolicy::Policy::Expanding,QSizePolicy::Policy::Preferred);
+    ui->hideBtn->setObjectName("hideeditBtn");
+    ui->hideBtn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    ui->hideBtn->setIcon(QIcon(":/icons/hidearrow.png"));
+    ui->hideBtn->setIconSize({30,30});
+	ui->hideBtn->setText(tr("   Hide Panel"));
+    connect(ui->hideBtn,&QToolButton::clicked,[=](){
+        emit hideBtnClicked();
+    });
+	ui->tbx_Dob->setDisplayFormat("yyyy/MM/dd");
+
+	ui->tbx_ID->setEnabled(false);
+    ui->tbx_ID->setObjectName("display_tbx");
+	ui->tbx_Dob->setEnabled(false);
+    ui->tbx_Dob->setObjectName("display_tbx");
+	ui->tbx_Name->setEnabled(false);
+    ui->tbx_Name->setObjectName("display_tbx");
+    ui->tbx_Sex->setEnabled(false);
+    ui->tbx_Sex->setObjectName("display_tbx");
+    ui->rtbx_Comment->setEnabled(false);
+    ui->rtbx_Comment->setObjectName("display_tbx");
+
+    connect(EventCenter::Default(), &EventCenter::ReloadLanguage, [=]() {
+
+		ui->retranslateUi(this);
+        ui->tbx_Sex->setText(store.Sex == "F"?tr("Female"):(store.Sex=="M"?tr("Male"):tr("Other")));
+	});
+
+
+
+}
+
+EditPatientForm::~EditPatientForm()
+{
+	delete ui;
+}
+
+void EditPatientForm::setPatientInformation(PatientInformation* information) {
+	if (information)
+	{
+		ui->tbx_ID->setText(information->ID);
+		ui->tbx_Dob->setDate(QDate::fromString(information->BirthDate, "yyyy-MM-dd"));
+		ui->tbx_Name->setText(information->Name);
+		ui->rtbx_Comment->setText(information->Comment);
+        ui->tbx_Sex->setText(information->Sex == "F"?tr("Female"):(information->Sex=="M"?tr("Male"):tr("Other")));
+		currentPatientUID = information->PatientUID;
+		AddDate = information->AddDate;
+		store.Sex = information->Sex;
+		storePatientInformation();
+	}
+}
+
+void EditPatientForm::clearPatientInformation() {
+	ui->tbx_ID->setText("");
+	ui->tbx_Dob->setDate(QDate::currentDate());
+	ui->tbx_Name->setText("");
+    ui->tbx_Sex->setText("");
+	ui->rtbx_Comment->setText("");
+	currentPatientUID = "";
+	AddDate = "";
+}
+
+void EditPatientForm::storePatientInformation() {
+	store.PatientUID = currentPatientUID;
+	store.AddDate = AddDate;
+	store.ID = ui->tbx_ID->text();
+	store.BirthDate = ui->tbx_Dob->date().toString("yyyy-MM-dd");
+	store.Name = ui->tbx_Name->text();
+	store.Comment = ui->rtbx_Comment->toPlainText();
+}
+
--- a/src/forms/select/editpatientform.h
+++ b/src/forms/select/editpatientform.h
@@ -29,6 +29,10 @@ enum PatientInformationEnum{
 #undef ADD_PATIENT_PROPERTY
 };

+/**
+ * @brief this class was designed to be a edit form,
+ * but now has been change to a detail display class.
+ */
 class PatientInformation:public QObject{
 Q_OBJECT
 public:
@@ -65,9 +69,8 @@ public:
    }
    void clearPatientInformation();
    void storePatientInformation();
-    void restorePatientInformation();
-    void setEditEnable(bool enable);
-    signals:
+
+signals:
    void editAccept(PatientInformation * detail,bool & accept);
    void editCancel();
    signals:
@@ -77,11 +80,6 @@ private:
    QString currentPatientUID;
    QString AddDate;
    PatientInformation store;
-    bool editEnable=false;
-    QToolButton* btnEditAccept;
-    QToolButton* btnEditCancel;
-    QToolButton* btnFemale;
-    QToolButton* btnMale;
 };

 #endif // EDITPATIENTFORM_H
--- a/src/forms/select/editpatientform.ui
+++ b/src/forms/select/editpatientform.ui
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditPatientForm</class>
+ <widget class="QWidget" name="EditPatientForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>466</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QToolButton" name="hideBtn">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lbl_ID">
+     <property name="text">
+      <string>ID</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="tbx_ID">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lbl_Name">
+     <property name="text">
+      <string>Name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="tbx_Name">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lbl_Sex">
+     <property name="text">
+      <string>Gender</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="tbx_Sex">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lbl_DOB">
+     <property name="text">
+      <string>Date Of Birth</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDateEdit" name="tbx_Dob">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="buttonSymbols">
+      <enum>QAbstractSpinBox::NoButtons</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>1</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lbl_Comment">
+     <property name="text">
+      <string>Comment</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="rtbx_Comment">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="editcmdWidget" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/src/forms/settings/AccountTableForm.cpp
+++ b/src/forms/settings/AccountTableForm.cpp
@@ -9,12 +9,12 @@
 #include <QHeaderView>
 #include "components/AccountRoleComboDelegate.h"
 #include "guimacros.h"
-#include "AlertDialog.h"
+#include "src/dialogs/AlertDialog.h"
 #include "db/SQLHelper.h"
 #include "models/User.h"
 #include <QSqlRecord>
 #include "components/SlideableTableView.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include "event/EventCenter.h"
 AccountTableForm::AccountTableForm(QWidget* parent) {
 	layout = new QVBoxLayout(this);
--- a/src/forms/settings/AccountTableForm.h
+++ b/src/forms/settings/AccountTableForm.h
--- a/src/forms/settings/AdminSettingForm.cpp
+++ b/src/forms/settings/AdminSettingForm.cpp
@@ -7,13 +7,9 @@
 #include <QStackedWidget>
 #include <QStringListModel>
 #include <QListWidget>
-#include "tabformwidget.h"
-#include <QListWidgetItem>
 #include "ui_tabformwidget.h"
-#include <QLabel>
 #include "UserOperationLogForm.h"
 #include "generalform.h"
-#include <QPushButton>
 #include "systemsettingform.h"
 #include "AccountTableForm.h"
 #include "event/EventCenter.h"
@@ -57,20 +53,6 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	systemSettingForm* systemSetting = new systemSettingForm(this);
 	stackedWidget->addWidget(systemSetting);

-	//QLabel* systemSetting = new QLabel(this);
-	//systemSetting->setText("systemSetting");
-	//stackedWidget->addWidget(systemSetting);
-
-	//QLabel* Info = new QLabel(this);
-	//Info->setText("info");
-	//stackedWidget->addWidget(Info);
-
-	//UserOperationLogForm* operationLogForm = new UserOperationLogForm(this);
-	//stackedWidget->addWidget(operationLogForm);
-
-	//QLabel* about = new QLabel(this);
-	//about->setText(tr("About"));
-
 	AboutWidget* about = new AboutWidget(this);
 	stackedWidget->addWidget(about);

--- a/src/forms/settings/AdminSettingForm.h
+++ b/src/forms/settings/AdminSettingForm.h
@@ -5,7 +5,7 @@
 #ifndef GUI_ADMINSETTINGFORM_H
 #define GUI_ADMINSETTINGFORM_H

-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"

 class AdminSettingForm:public TabFormWidget {
    Q_OBJECT
--- a/src/forms/settings/aboutwidget.cpp
+++ b/src/forms/settings/aboutwidget.cpp
@@ -77,7 +77,8 @@ void AboutWidget::initUi()
 	pMainLayout->addWidget(pGuiVer);

 	pEmbededSoftVer = new QLabel(this);
-	pEmbededSoftVer->setText(tr("Embedded Software V%1").arg(getEmbVersion()));
+//	pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
+	pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath()));
 	pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0);
 	pMainLayout->addWidget(pEmbededSoftVer);

@@ -157,7 +158,8 @@ void AboutWidget::initUi()
 		pBtnHelp->setText(tr("?"));
 		pCompanyCopyRight->setText(tr("Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed"));
 		pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
-		pEmbededSoftVer->setText(tr("Embedded Software V%1").arg(getEmbVersion()));
+//		pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
+		pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath()));
 		pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
 		pFEBVer->setText(tr("FEB Information"));
 		});
@@ -191,3 +193,7 @@ QString AboutWidget::getGUIVersion() {
 QString AboutWidget::getEmbVersion() {
    return DeviceManager::Default()->getSoftwareVersion();
 }
+
+QString AboutWidget::getDataStorePath() {
+    return DeviceManager::Default()->getScanOutputPath();;
+}
--- a/src/forms/settings/aboutwidget.h
+++ b/src/forms/settings/aboutwidget.h
@@ -22,6 +22,7 @@ public:

    QString getGUIVersion();
    QString getEmbVersion();
+    QString getDataStorePath();

 private slots:
 	void openHelpFile();
--- a/src/forms/settings/generalform.cpp
+++ b/src/forms/settings/generalform.cpp
@@ -10,10 +10,10 @@
 #include <QEvent>
 #include "event/EventCenter.h"
 #include "json/jsonobject.h"
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"

-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"

 GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 {
@@ -71,16 +71,16 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 	lockTime->setText(JsonObject::Instance()->lockScreenTimeout());

 	//connection
-	connect(instName, &QLineEdit::textChanged, [=](QString str)
+	connect(instName, &QLineEdit::textChanged, [=](const QString& str)
 		{
 			JsonObject::Instance()->setInstitutionName(str);
 		});

-	connect(instAddr, &QLineEdit::textChanged, [=](QString str)
+	connect(instAddr, &QLineEdit::textChanged, [=](const QString&  str)
 		{
 			JsonObject::Instance()->setInstitutionAddr(str);
 		});
-	connect(lockTime, &QLineEdit::textChanged, [=](QString str)
+	connect(lockTime, &QLineEdit::textChanged, [=](const QString&  str)
 		{
 			//take effect
 			JsonObject::Instance()->setLockScreenTimeout(str);
--- a/src/forms/settings/generalform.h
+++ b/src/forms/settings/generalform.h
--- a/src/forms/settings/systemsettingform.cpp
+++ b/src/forms/settings/systemsettingform.cpp
@@ -2,16 +2,11 @@
 #include "ui_systemsettingform.h"

 #include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QDebug>
-#include <QLabel>
 #include <QLineEdit>
-#include <QEvent>
 #include <QToolButton>

-#include "SelectDialog.h"
-#include "components/imageswitch.h"
+#include "src/dialogs/SelectDialog.h"
 #include "network/networkcfgdialog.h"
 #include "network/dicomcfgdialog.h"
 #include "network/getadminpsw.h"
@@ -20,7 +15,6 @@
 #include "event/EventCenter.h"
 #include "device/DeviceManager.h"
 #include "json/cmdhelper.h"
-#include "appvals/AppGlobalValues.h"

 systemSettingForm::systemSettingForm(QWidget* parent) :
 	QWidget(parent),
--- a/src/forms/settings/systemsettingform.h
+++ b/src/forms/settings/systemsettingform.h
--- a/src/forms/settings/systemsettingform.ui
+++ b/src/forms/settings/systemsettingform.ui
--- a/src/forms/tabformwidget.cpp
+++ b/src/forms/tabformwidget.cpp
--- a/src/forms/tabformwidget.h
+++ b/src/forms/tabformwidget.h
--- a/src/forms/tabformwidget.ui
+++ b/src/forms/tabformwidget.ui
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
-#include "mainwindow.h"
+#include "src/windows/mainwindow.h"
 #include <QApplication>
-#include "loginwindow.h"
-#include "InputObject.h"
+#include "src/windows/loginwindow.h"
+#include "src/utilities/InputObject.h"
 #include <QQmlApplicationEngine>
 #include "db/SQLHelper.h"
 #include <QTextCodec>
@@ -13,8 +13,8 @@
 #include <QTranslator>
 #include <src/device/DeviceManager.h>
 #include "json/jsonobject.h"
-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"
 QString loadFontFromFile(QString path)
 {
 	static QString font;
--- a/src/models/User.cpp
+++ b/src/models/User.cpp
@@ -48,7 +48,7 @@ bool User::submitChange() {
    return result;
 }

-bool User::QueryUser(QString userID, QString Pwd) {
+bool User::QueryUser(const QString& userID, const QString& Pwd) {

    QString sql = QString("select * from Account where UserCode=:userID and Password=:pwd");
    QMap<QString,QVariant> map;
@@ -82,7 +82,7 @@ bool User::QueryUser(QString userID, QString Pwd) {
 }


-bool User::existsUser(QString userCode) {
+bool User::existsUser(const QString& userCode) {
    QString sql = QString("select * from Account where UserCode=:userID");
    QMap<QString,QVariant> map;
    QMap<QString,QVariant> params;
@@ -91,7 +91,7 @@ bool User::existsUser(QString userCode) {
    return !map.isEmpty();
 }

-bool User::getUser(QString userUID, User& user) {
+bool User::getUser(const QString& userUID, User& user) {
    QString sql = QString("select * from Account where UserID=:userUID");
    QMap<QString,QVariant> map;
    QMap<QString,QVariant> params;
@@ -113,7 +113,7 @@ bool User::getUser(QString userUID, User& user) {
 static bool LOAD_ALL_ROLE = false;
 static QMap<QString,QString> roleCache;

-QString User::getRoleName(QString RoleID) {
+QString User::getRoleName(const QString& RoleID) {
    if (roleCache.contains(RoleID)) return roleCache[RoleID];
    QString sql = QString("select RoleName from  Role where RoleID=:RoleID");
    QMap<QString,QVariant> map;
@@ -124,7 +124,7 @@ QString User::getRoleName(QString RoleID) {
    return map["RoleName"].toString();
 }

-QString User::getRoleID(QString RoleName) {
+QString User::getRoleID(const QString& RoleName) {
    if (roleCache.values().contains(RoleName)) {
        int index = roleCache.values().indexOf(RoleName);
        return roleCache.keys()[index];
@@ -155,7 +155,7 @@ QStringList User::getAllRoleName() {
    return  roleCache.values();
 }

-bool User::insertUser(QString UserCode, User &user) {
+bool User::insertUser(const QString& UserCode, User &user) {
    user.m_UserID = QUuid::createUuid().toString();
    user.m_UserCode = UserCode;
    static QString updateSQL = "insert into Account (%1) values (%2)";
--- a/src/models/User.h
+++ b/src/models/User.h
@@ -20,8 +20,8 @@ USER_PROPERTY(Comment)
 class User:public QObject {
    Q_OBJECT
 public:
-    static bool QueryUser(QString userID, QString Pwd);
-    static bool existsUser(QString userCode);
+    static bool QueryUser(const QString& userID, const QString& Pwd);
+    static bool existsUser(const QString& userCode);
    static QString getEncryptedPassword(const QString& password)
    {
        QByteArray bytePwd = password.toLatin1();
@@ -31,8 +31,8 @@ public:
    static User* Current(){
        return currentUser;
    }
-    static bool getUser(QString userUID,User& user);
-    static bool insertUser(QString UserCode,User& user);
+    static bool getUser(const QString& userUID,User& user);
+    static bool insertUser(const QString& UserCode,User& user);
    explicit User(QObject *parent=nullptr);
    ~User();
    QString getIndexName(){
@@ -65,8 +65,8 @@ public:
    bool isAdmin();
    bool isEngineer();
    bool resetPassword();
-    static QString getRoleName(QString RoleID);
-    static QString getRoleID(QString RoleName);
+    static QString getRoleName(const QString& RoleID);
+    static QString getRoleID(const QString& RoleName);
    static QStringList getAllRoleName();
 private:
    static User* currentUser;
--- a/src/network/dicomcfgdialog.ui
+++ b/src/network/dicomcfgdialog.ui
--- a/src/network/getadminpsw.cpp
+++ b/src/network/getadminpsw.cpp
@@ -6,8 +6,6 @@
 #include <QLabel>
 #include <QtWidgets/QLineEdit>
 #include "getadminpsw.h"
-#include "device/networkmanager.h"
-#include "device/networkmanager.h"

 GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {

--- a/src/network/getadminpsw.h
+++ b/src/network/getadminpsw.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GETADMINPSW_H
 #define GUI_GETADMINPSW_H

-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetAdminPsw :public  GUIFormBaseDialog {
--- a/src/network/getipdialog.h
+++ b/src/network/getipdialog.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GETIPDIALOG_H
 #define GUI_GETIPDIALOG_H

-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetIPDialog :public  GUIFormBaseDialog {
--- a/src/network/getroutedialog.h
+++ b/src/network/getroutedialog.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GetRouteDialog_H
 #define GUI_GETROUTEDIALOG_H

-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetRouteDialog :public  GUIFormBaseDialog {
--- a/src/network/networkcfgdialog.cpp
+++ b/src/network/networkcfgdialog.cpp
@@ -8,7 +8,7 @@
 #include <QItemSelectionModel>
 #include <QGraphicsDropShadowEffect>

-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"

 #include <QThread>
 networkCfgDialog::networkCfgDialog(QWidget* parent) :
--- a/src/network/networkcfgdialog.ui
+++ b/src/network/networkcfgdialog.ui
--- a/src/stylesheet/Dark2.css
+++ b/src/stylesheet/Dark2.css
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -15,6 +15,10 @@
        <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>
@@ -51,10 +55,6 @@
        <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,10 +587,6 @@ 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="57"/>
-        <location filename="../aboutwidget.cpp" line="155"/>
+        <location filename="../aboutwidget.cpp" line="56"/>
+        <location filename="../aboutwidget.cpp" line="154"/>
        <source>HJ-USCT-01 V1.0</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="61"/>
-        <location filename="../aboutwidget.cpp" line="156"/>
+        <location filename="../aboutwidget.cpp" line="60"/>
+        <location filename="../aboutwidget.cpp" line="155"/>
        <source>?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="133"/>
+        <location filename="../aboutwidget.cpp" line="132"/>
        <source>cJSON</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="157"/>
+        <location filename="../aboutwidget.cpp" line="156"/>
        <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="67"/>
+        <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"/>
        <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="74"/>
+        <location filename="../aboutwidget.cpp" line="78"/>
        <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="84"/>
-        <location filename="../aboutwidget.cpp" line="160"/>
+        <location filename="../aboutwidget.cpp" line="83"/>
+        <location filename="../aboutwidget.cpp" line="159"/>
        <source>Reconstruction Software V1.2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="90"/>
-        <location filename="../aboutwidget.cpp" line="161"/>
+        <location filename="../aboutwidget.cpp" line="89"/>
+        <location filename="../aboutwidget.cpp" line="160"/>
        <source>FEB Information</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="96"/>
+        <location filename="../aboutwidget.cpp" line="95"/>
        <source>Qt 5.12.0</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="117"/>
-        <location filename="../aboutwidget.cpp" line="122"/>
+        <location filename="../aboutwidget.cpp" line="116"/>
+        <location filename="../aboutwidget.cpp" line="121"/>
        <source>Loading...</source>
        <translation>正在加载</translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="126"/>
+        <location filename="../aboutwidget.cpp" line="125"/>
        <source>Copyright (c) 1994-2021, OFFIS e.V.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../aboutwidget.cpp" line="137"/>
+        <location filename="../aboutwidget.cpp" line="136"/>
        <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="146"/>
+        <location filename="../AccountFormDialog.cpp" line="143"/>
        <source>Reset password to &quot;123456&quot; ?</source>
        <translation>密码重置为&quot;123456&quot;?</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="151"/>
+        <location filename="../AccountFormDialog.cpp" line="148"/>
        <source>Inner error, can&apos;t find reference user!</source>
        <translation>内部错误！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="156"/>
-        <location filename="../AccountFormDialog.cpp" line="194"/>
+        <location filename="../AccountFormDialog.cpp" line="153"/>
+        <location filename="../AccountFormDialog.cpp" line="191"/>
        <source>Submit change to database fail!</source>
        <translation>修改提交至数据库失败！</translation>
    </message>
@@ -166,34 +166,34 @@
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="182"/>
-        <location filename="../AccountFormDialog.cpp" line="204"/>
-        <location filename="../AccountFormDialog.cpp" line="225"/>
+        <location filename="../AccountFormDialog.cpp" line="179"/>
+        <location filename="../AccountFormDialog.cpp" line="201"/>
+        <location filename="../AccountFormDialog.cpp" line="222"/>
        <source>User Name can&apos;t be empty!</source>
        <translation>用户名不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="221"/>
+        <location filename="../AccountFormDialog.cpp" line="218"/>
        <source>User ID can&apos;t be empty!</source>
        <translation>用户ID不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="229"/>
+        <location filename="../AccountFormDialog.cpp" line="226"/>
        <source>Password can&apos;t be empty!</source>
        <translation>密码不能为空！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="233"/>
+        <location filename="../AccountFormDialog.cpp" line="230"/>
        <source>Inner error ,unset data model!</source>
        <translation>内部错误！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="237"/>
+        <location filename="../AccountFormDialog.cpp" line="234"/>
        <source>User Id exists!</source>
        <translation>用户ID已存在！</translation>
    </message>
    <message>
-        <location filename="../AccountFormDialog.cpp" line="273"/>
+        <location filename="../AccountFormDialog.cpp" line="270"/>
        <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="129"/>
+        <location filename="../AccountTableForm.cpp" line="128"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
        <location filename="../AccountTableForm.cpp" line="38"/>
-        <location filename="../AccountTableForm.cpp" line="130"/>
+        <location filename="../AccountTableForm.cpp" line="129"/>
        <source>Role</source>
        <translation>角色</translation>
    </message>
    <message>
        <location filename="../AccountTableForm.cpp" line="39"/>
-        <location filename="../AccountTableForm.cpp" line="131"/>
+        <location filename="../AccountTableForm.cpp" line="130"/>
        <source>Comment</source>
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="64"/>
-        <location filename="../AccountTableForm.cpp" line="133"/>
+        <location filename="../AccountTableForm.cpp" line="63"/>
+        <location filename="../AccountTableForm.cpp" line="132"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="65"/>
-        <location filename="../AccountTableForm.cpp" line="134"/>
+        <location filename="../AccountTableForm.cpp" line="64"/>
+        <location filename="../AccountTableForm.cpp" line="133"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="66"/>
-        <location filename="../AccountTableForm.cpp" line="135"/>
+        <location filename="../AccountTableForm.cpp" line="65"/>
+        <location filename="../AccountTableForm.cpp" line="134"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="112"/>
+        <location filename="../AccountTableForm.cpp" line="111"/>
        <source>Can&apos;t delete current log in account!</source>
        <translation>当前用户无法删除日志！</translation>
    </message>
    <message>
-        <location filename="../AccountTableForm.cpp" line="119"/>
+        <location filename="../AccountTableForm.cpp" line="118"/>
        <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="33"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="32"/>
+        <location filename="../AdminSettingForm.cpp" line="82"/>
        <source>General</source>
        <translation>通用</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="33"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="32"/>
+        <location filename="../AdminSettingForm.cpp" line="82"/>
        <source>Account</source>
        <translation>用户</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="33"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="32"/>
+        <location filename="../AdminSettingForm.cpp" line="82"/>
        <source>System</source>
        <translation>系统</translation>
    </message>
@@ -297,8 +297,8 @@
        <translation type="vanished">操作日志</translation>
    </message>
    <message>
-        <location filename="../AdminSettingForm.cpp" line="33"/>
-        <location filename="../AdminSettingForm.cpp" line="84"/>
+        <location filename="../AdminSettingForm.cpp" line="32"/>
+        <location filename="../AdminSettingForm.cpp" line="82"/>
        <source>About</source>
        <translation>关于</translation>
    </message>
@@ -362,37 +362,37 @@
 <context>
    <name>EditPatientForm</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="142"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="142"/>
        <source>Form</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="143"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="143"/>
        <source>...</source>
        <translation type="unfinished">DICOM</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="144"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="144"/>
        <source>ID</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="145"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="145"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="147"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="147"/>
        <source>Date Of Birth</source>
        <translation>出生日期</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="148"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="148"/>
        <source>Comment</source>
        <translation>备注</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_editpatientform.h" line="146"/>
+        <location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="146"/>
        <source>Gender</source>
        <translation>性别</translation>
    </message>
@@ -442,12 +442,12 @@
 <context>
    <name>GUIMessageDialog</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="106"/>
+        <location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="106"/>
        <source>Dialog</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="109"/>
+        <location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="109"/>
        <source>...</source>
        <translation></translation>
    </message>
@@ -555,7 +555,7 @@
 <context>
    <name>InputObject</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_inputobject.h" line="113"/>
+        <location filename="../../out/build/x64-Debug/ui_inputobject.h" line="113"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -590,7 +590,7 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_mainwindow.h" line="40"/>
+        <location filename="../../out/build/x64-Debug/ui_mainwindow.h" line="40"/>
        <source>MainWindow</source>
        <translation></translation>
    </message>
@@ -626,47 +626,47 @@
 <context>
    <name>PatientInformationForm</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="118"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="118"/>
        <source>Form</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="119"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="119"/>
        <source>Patient Information</source>
        <translation>患者信息</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="120"/>
+        <location filename="../../out/build/x64-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="../../cmake-build-debug/ui_patientinformationform.h" line="121"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="121"/>
        <source>Someone Somebody</source>
        <translation>XXX</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="122"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="122"/>
        <source>2021/11/11</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="123"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="123"/>
        <source>Female</source>
        <translation>女</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="124"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="124"/>
        <source>Acc# 27812398</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="127"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="127"/>
        <source>Current Protocol</source>
        <translation>当前协议</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_patientinformationform.h" line="128"/>
+        <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/>
        <location filename="../patientinformationform.cpp" line="42"/>
        <source>LEFT ONLY</source>
        <translation>左侧</translation>
@@ -769,80 +769,75 @@ parameters
 <context>
    <name>SelectFormWidget</name>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="48"/>
-        <location filename="../SelectFormWidget.cpp" line="301"/>
+        <location filename="../SelectFormWidget.cpp" line="45"/>
+        <location filename="../SelectFormWidget.cpp" line="288"/>
        <source>Account</source>
        <translation>账户</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="49"/>
+        <location filename="../SelectFormWidget.cpp" line="46"/>
        <source>Worklist</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="60"/>
-        <location filename="../SelectFormWidget.cpp" line="303"/>
+        <location filename="../SelectFormWidget.cpp" line="57"/>
+        <location filename="../SelectFormWidget.cpp" line="290"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="61"/>
-        <location filename="../SelectFormWidget.cpp" line="304"/>
+        <location filename="../SelectFormWidget.cpp" line="58"/>
+        <location filename="../SelectFormWidget.cpp" line="291"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="62"/>
-        <location filename="../SelectFormWidget.cpp" line="305"/>
+        <location filename="../SelectFormWidget.cpp" line="59"/>
+        <location filename="../SelectFormWidget.cpp" line="292"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="63"/>
-        <location filename="../SelectFormWidget.cpp" line="306"/>
+        <location filename="../SelectFormWidget.cpp" line="60"/>
+        <location filename="../SelectFormWidget.cpp" line="293"/>
        <source>Select</source>
        <translation>选择</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="87"/>
-        <location filename="../SelectFormWidget.cpp" line="295"/>
+        <location filename="../SelectFormWidget.cpp" line="82"/>
+        <location filename="../SelectFormWidget.cpp" line="282"/>
        <source>Name</source>
        <translation>姓名</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="88"/>
-        <location filename="../SelectFormWidget.cpp" line="296"/>
+        <location filename="../SelectFormWidget.cpp" line="83"/>
+        <location filename="../SelectFormWidget.cpp" line="283"/>
        <source>Birth Date</source>
        <translation>出生日期</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="89"/>
-        <location filename="../SelectFormWidget.cpp" line="297"/>
+        <location filename="../SelectFormWidget.cpp" line="84"/>
+        <location filename="../SelectFormWidget.cpp" line="284"/>
        <source>Gender</source>
        <translation>性别</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="90"/>
-        <location filename="../SelectFormWidget.cpp" line="298"/>
+        <location filename="../SelectFormWidget.cpp" line="85"/>
+        <location filename="../SelectFormWidget.cpp" line="285"/>
        <source>Add Date</source>
        <translation>添加日期</translation>
    </message>
    <message>
-        <location filename="../SelectFormWidget.cpp" line="91"/>
-        <location filename="../SelectFormWidget.cpp" line="299"/>
+        <location filename="../SelectFormWidget.cpp" line="86"/>
+        <location filename="../SelectFormWidget.cpp" line="286"/>
        <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="../../cmake-build-debug/ui_tabformwidget.h" line="54"/>
+        <location filename="../../out/build/x64-Debug/ui_tabformwidget.h" line="54"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -899,7 +894,7 @@ parameters
 <context>
    <name>dicomCfgDialog</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="321"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="321"/>
        <source>Dialog</source>
        <translation></translation>
    </message>
@@ -908,57 +903,57 @@ parameters
        <translation type="vanished">DICOM 设置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="322"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="322"/>
        <source>DICOM Settings</source>
        <translation>DICOM 配置</translation>
    </message>
    <message>
-        <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"/>
+        <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"/>
        <source>Name</source>
        <translation></translation>
    </message>
    <message>
-        <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"/>
+        <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"/>
        <source>IP</source>
        <translation></translation>
    </message>
    <message>
-        <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"/>
+        <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"/>
        <source>Port</source>
        <translation></translation>
    </message>
    <message>
-        <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"/>
+        <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"/>
        <source>AE</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="328"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="328"/>
        <source>Worklist</source>
        <translation></translation>
    </message>
    <message>
-        <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"/>
+        <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"/>
        <source>...</source>
        <translation>DICOM</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="334"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="334"/>
        <source>PACS</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="340"/>
+        <location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="340"/>
        <source>3D Recon</source>
        <translation></translation>
    </message>
@@ -976,18 +971,18 @@ parameters
 <context>
    <name>networkCfgDialog</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="453"/>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="454"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="453"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="454"/>
        <source>Network Settings</source>
        <translation>网络配置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="464"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="464"/>
        <source>Address</source>
        <translation>IP配置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="455"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="455"/>
        <location filename="../network/networkcfgdialog.cpp" line="33"/>
        <source>IP Address</source>
        <translation>IP地址</translation>
@@ -1001,85 +996,85 @@ parameters
        <translation type="vanished">动态地址</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="457"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
        <source>Dev</source>
        <translation>设备</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="459"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="459"/>
        <source>Subnet Mask</source>
        <translation>子网掩码</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="460"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="460"/>
        <source>Additional Address</source>
        <translation>额外地址</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="461"/>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="468"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="461"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="468"/>
        <source>Add</source>
        <translation>新增</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="462"/>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="469"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="462"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="469"/>
        <source>Edit</source>
        <translation>编辑</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="463"/>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="470"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="463"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
        <source>Delete</source>
        <translation>删除</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="471"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
        <source>Routing</source>
        <translation>路由配置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="466"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="466"/>
        <source>Default IPv4 Gateway</source>
        <translation>默认网关</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="456"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="456"/>
        <source>DHCP</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="467"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="467"/>
        <source>Routing Table</source>
        <translation>路由表</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="472"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
        <source>Name</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="473"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
        <source>Port</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="474"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="474"/>
        <source>AE</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="475"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="475"/>
        <source>IP</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="476"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
        <source>DICOM</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="477"/>
+        <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
        <source>Result</source>
        <translation>结果</translation>
    </message>
@@ -1113,7 +1108,7 @@ parameters
 <context>
    <name>systemSettingForm</name>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="281"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="281"/>
        <source>Form</source>
        <translation></translation>
    </message>
@@ -1122,17 +1117,17 @@ parameters
        <translation type="vanished">网络配置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="282"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="282"/>
        <source>Protocal</source>
        <translation>默认扫描协议</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="286"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="286"/>
        <source>Worklist Filter</source>
        <translation>Worklist过滤器</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="289"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="289"/>
        <source>Disk Storage</source>
        <translation>磁盘存储</translation>
    </message>
@@ -1141,7 +1136,7 @@ parameters
        <translation type="vanished">DICOM</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="284"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="284"/>
        <source>Auto Verify</source>
        <translation>自动验证</translation>
    </message>
@@ -1150,7 +1145,7 @@ parameters
        <translation type="vanished">配置</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="285"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="285"/>
        <source>IP</source>
        <translation></translation>
    </message>
@@ -1167,7 +1162,7 @@ parameters
        <translation type="vanished">接受</translation>
    </message>
    <message>
-        <location filename="../../cmake-build-debug/ui_systemsettingform.h" line="288"/>
+        <location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="288"/>
        <source>DICOM</source>
        <translation></translation>
    </message>
--- a/src/utilities/InputObject.cpp
+++ b/src/utilities/InputObject.cpp
@@ -1,6 +1,5 @@
 #include "InputObject.h"
 #include "ui_inputobject.h"
-//#include "qdesktopwidget.h"
 #include <QDebug>
 #include <QEvent>
 #include <QKeyEvent>
--- a/src/utilities/InputObject.h
+++ b/src/utilities/InputObject.h
--- a/src/utilities/StdOutRedirector.cpp
+++ b/src/utilities/StdOutRedirector.cpp
--- a/src/utilities/StdOutRedirector.h
+++ b/src/utilities/StdOutRedirector.h
--- a/src/utilities/inputobject.ui
+++ b/src/utilities/inputobject.ui
--- a/src/utilities/languageswitcher.cpp
+++ b/src/utilities/languageswitcher.cpp
@@ -29,9 +29,8 @@ void LanguageSwitcher::setDefaultLanguage(QString str)
 	QString lan = QString(":/translations/" + str + ".qm");
 	if (translator->load(lan))
 	{
-		//qDebug() << "installTranslator";
-		//QApplication::installTranslator(translator);
+        EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
 	}
-	EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
+
 }

--- a/src/utilities/languageswitcher.h
+++ b/src/utilities/languageswitcher.h
--- a/src/utilities/locker.cpp
+++ b/src/utilities/locker.cpp
--- a/src/utilities/locker.h
+++ b/src/utilities/locker.h
--- a/src/windows/loginwindow.cpp
+++ b/src/windows/loginwindow.cpp
@@ -10,11 +10,11 @@
 #include <QCryptographicHash>
 #include <src/event/EventCenter.h>
 #include "db/SQLHelper.h"
-#include "InputObject.h"
+#include "src/utilities/InputObject.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "json/jsonobject.h"
-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"

 LoginWindow::LoginWindow(QWidget* parent)
 	: QDialog(parent)
--- a/src/windows/loginwindow.h
+++ b/src/windows/loginwindow.h
--- a/src/windows/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -4,22 +4,22 @@
 #include <QSizePolicy>
 #include <QHBoxLayout>
 #include "event/EventCenter.h"
-#include "tabformwidget.h"
-#include "SelectFormWidget.h"
-#include "ScanFormWidget.h"
-#include "guimessagedialog.h"
+#include "src/forms/tabformwidget.h"
+#include "src/forms/select/SelectFormWidget.h"
+#include "src/forms/scan/ScanFormWidget.h"
+#include "src/dialogs/guimessagedialog.h"
 #include "device/DeviceManager.h"
 #include "errorhandle/GUIErrorHandle.h"
 #include "loginwindow.h"
 #include <QTextEdit>
 #include <QScrollBar>
 #include "models/User.h"
-#include "AdminSettingForm.h"
+#include "src/forms/settings/AdminSettingForm.h"
 #include "appvals/AppGlobalValues.h"
 #include <fstream>
 #include <sstream>
 #include <QDateTime>
-#include "TopBarWidget.h"
+#include "src/forms/TopBarWidget.h"
 #include <QGestureEvent>
 #include <QDockWidget>

--- a/src/windows/mainwindow.h
+++ b/src/windows/mainwindow.h
@@ -4,7 +4,7 @@
 #include <QMainWindow>
 #include <QDebug>
 #include <QTimer>
-#include "StdOutRedirector.h"
+#include "src/utilities/StdOutRedirector.h"
 #include "json/cJSON.h"
 #include "loginwindow.h"

--- a/src/windows/mainwindow.ui
+++ b/src/windows/mainwindow.ui
Author	SHA1	Message	Date
Krad	593883d980	DEV_OUTPATH Test	2022-05-07 14:39:10 +08:00
Krad	4e09f2eef6	Style sheet error fix.	2022-04-22 17:17:05 +08:00
Krad	27487fdf3c	Code clean, and code style error fix.	2022-04-22 17:16:45 +08:00
Krad	7cee364fc3	Fix UI build error.	2022-04-06 10:05:25 +08:00
Krad	9d85acaac5	v0.6.10beta2	2022-04-06 09:50:25 +08:00
Krad	bc8f5cdeb2	Merge fix	2022-04-06 09:29:17 +08:00
Krad	73cd96333d	File arrangement	2022-04-06 09:16:26 +08:00
Krad	5dafb1e816	Refactor a setPatientDetail method.	2022-04-02 14:52:21 +08:00
Krad	2c686d6179	Change editpatientform to a only detail display widget.	2022-04-02 14:49:10 +08:00
Krad	19786da9fe	Remove redundant 'V' Embedded Software version text.	2022-04-02 14:46:14 +08:00