v0.6.10beta2

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(

docs/v0.6.10.txt

@@ -0,0 +1,5 @@
+v0.6.10
+
+重写了整个Patient的修改和新增逻辑，使用模态对话框替代的原来界面内的显示。
+去除了原来界面内编辑区域，只做显示使用。
+此外，使用滑动块替换了性别选择，日期选择的功能。

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

src/EditPatientDialog.cpp

@@ -10,7 +10,7 @@
 #include <QSqlTableModel>
 #include <QUuid>
 #include "EditPatientDialog.h"
-#include "SelectDialog.h"
+#include "dialogs/SelectDialog.h"
 #include "DateSelectDialog.h"
 #include "components/Listbox.h"
 

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;

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)
 {

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"));
-
-}

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>

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>

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 {

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;
 }

src/forms/select/SelectFormWidget.cpp

@@ -14,12 +14,12 @@
 #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 +124,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 +137,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);
 	});
 
@@ -181,6 +171,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 +195,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);
@@ -247,7 +238,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 +246,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);
+                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);
 
@@ -318,6 +307,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()
 {

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;
 };
 
 

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();
+}
+

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

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>

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);

src/forms/settings/AdminSettingForm.cpp

@@ -7,7 +7,7 @@
 #include <QStackedWidget>
 #include <QStringListModel>
 #include <QListWidget>
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <QListWidgetItem>
 #include "ui_tabformwidget.h"
 #include <QLabel>

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

src/forms/settings/aboutwidget.cpp

@@ -77,7 +77,7 @@ 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->setContentsMargins(subContentMargin, 0, 0, 0);
 	pMainLayout->addWidget(pEmbededSoftVer);
 
@@ -157,7 +157,7 @@ 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()));
 		pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
 		pFEBVer->setText(tr("FEB Information"));
 		});

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)
 {

src/forms/settings/systemsettingform.cpp

@@ -10,7 +10,7 @@
 #include <QEvent>
 #include <QToolButton>
 
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"
 #include "components/imageswitch.h"
 #include "network/networkcfgdialog.h"
 #include "network/dicomcfgdialog.h"

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;

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 {

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 {

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 {

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) :

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)

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>
 

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"