Add Version build function to CMakeLists.txt

AppVersion.h.in

@@ -0,0 +1,10 @@
+//
+// Created by Krad on 2022/3/8.
+//
+
+#ifndef GUI_VERSION_H
+#define GUI_VERSION_H
+#define GUI_VERSION_MAJOR @GUI_VERSION_MAJOR@
+#define GUI_VERSION_MINOR @GUI_VERSION_MINOR@
+#define GUI_VERSION_BUILD @GUI_VERSION_BUILD@
+#endif //GUI_VERSION_H

CMakeLists.txt

@@ -5,15 +5,23 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread")
 
+# GUI Version
+set(GUI_VERSION_MAJOR 0)
+set(GUI_VERSION_MINOR 6)
+set(GUI_VERSION_BUILD 8)
+
+configure_file(
+        "AppVersion.h.in"
+        "AppVersion.h"
+)
+
 file(GLOB_RECURSE  project_headers ./src/*.h)
 file(GLOB_RECURSE  project_cpps ./src/*.cpp)
 file(GLOB_RECURSE  project_cxx ./src/*.cxx)
 file(GLOB_RECURSE  project_cc ./src/*.cc)
 
-if(UNIX)
+if(NOT UNIX)
-set(USE_SHIMLIB ON)
+        set(USE_SHIMLIB OFF)
-else()
-set(USE_SHIMLIB OFF)
 endif()
 if(UNIX AND USE_SHIMLIB)
         file(GLOB_RECURSE  project_c ./src/json/*.c)

cfgs/usct-product

@@ -0,0 +1,74 @@
+{
+	"login":	{
+		"defaultUser":	"usct"
+	},
+	"general":	{
+		"defaultlanguage":	"en_US",
+		"language":	"zh_CN;en_US",
+		"institutionName":	"",
+		"institutionAddr":	"",
+		"lockscreen":	"30"
+	},
+	"protocol":	{
+		"default":	"RSTAND",
+		"lists":	"LSTAND;RSTAND;LONE;RONE"
+	},
+	"storagepolicy":	{
+		"mininum":	"85"
+	},
+	"lastlogin":	{
+		"password":	"",
+		"remember":	"false",
+		"usercode":	""
+	},
+	"worklist":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"pacs":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"recon":	{
+		"ae":	"",
+		"ip":	"",
+		"name":	"",
+		"port":	""
+	},
+	"address":	{
+		"device":	"eth0",
+		"dhcp":	"true",
+		"ip":	"",
+		"mask":	"",
+		"ae":	"",
+		"name":	"",
+		"port":	"",
+		"additional":	[{
+				"ip":	"",
+				"netmask":	""
+			}, {
+				"ip":	"",
+				"netmask":	""
+			}]
+	},
+	"routing":	{
+		"defaultgateway":	"",
+		"routingtable":	[{
+				"destination":	"",
+				"gateway":	"",
+				"netmask":	""
+			}, {
+				"destination":	"",
+				"gateway":	"",
+				"netmask":	""
+			}]
+	},
+	"worklistfilter":	{
+		"default":	"Today",
+		"lists":	"Today;Recent3Days;ThisWeek;ThisMonth"
+	}
+}

src/AccountFormDialog.cpp

@@ -131,13 +131,16 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
         layout->addWidget(lbl_endline9);
         if (m_mode == Self) {
             connect(btn_Pwd, &QPushButton::clicked, [=]() {
-                ChangePasswordFormDialog dia(this->parentWidget());
+                ChangePasswordFormDialog dia(this);
+                dia.setGeometry(this->geometry());
                 dia.setWindowModality(Qt::WindowModal);
                 dia.exec();
+
             });
         } else {
             connect(btn_Pwd, &QAbstractButton::clicked, [=]() {
                 AlertDialog dialog(this);
+                dialog.setGeometry(this->geometry());
                 dialog.setButtonMode(OkAndCancel);
                 dialog.setWindowModality(Qt::WindowModal);
                 dialog.setAlertMessage(tr("Reset password to \"123456\" ?"));

src/AccountTableForm.cpp

@@ -50,8 +50,9 @@ AccountTableForm::AccountTableForm(QWidget* parent) {
 	table->setColumnWidth(4, 150);
 
 	QWidget* cmdPanel = new QWidget(this);
-	cmdPanel->setObjectName("commandWidget");
+	cmdPanel->setObjectName("commandWidgetnoBBorder");
 	QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel);
+
 	cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
 	QWidget* spacerLine = new QWidget(this);
 	spacerLine->setFixedWidth(2);

src/AdminSettingForm.cpp

@@ -23,8 +23,9 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 
 	QHBoxLayout* layout = new QHBoxLayout(this);
 	layout->setMargin(0);
-	layout->setContentsMargins(0, 8, 0, 8);
+	layout->setContentsMargins(0, 8, 0, 1);
 	this->ui->contentWidget->setLayout(layout);
+	this->ui->contentWidget->setObjectName("contentWidgetWithBBorder");
 	QListWidget* widget = new QListWidget(this);
 	widget->setFixedWidth(250);
 	QStringList menus;
@@ -41,6 +42,7 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
 	QWidget* spacerLine2 = new QWidget(this);
 	spacerLine2->setFixedWidth(2);
 	spacerLine2->setObjectName("verSpaceLine");
+	spacerLine2->setStyleSheet("margin-bottom:8px");
 	layout->addWidget(spacerLine2);
 	layout->addWidget(stackedWidget);
 	this->ui->commandWidget->hide();

src/AlertDialog.cpp

@@ -12,7 +12,7 @@ AlertDialog::AlertDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog
     QVBoxLayout* layout = new QVBoxLayout(formWidget);
     layout->setSpacing(10);
     // add title
-    QLabel* lbl_title = new QLabel(this);
+    lbl_title = new QLabel(this);
     lbl_title->setAlignment(Qt::AlignCenter);
     lbl_title->setText(tr("Warning"));
     lbl_title->setObjectName("title");
@@ -28,3 +28,7 @@ AlertDialog::~AlertDialog() {
 void AlertDialog::setAlertMessage(const QString &msg) {
     this->lbl_msg->setText(msg);
 }
+
+void AlertDialog::setTitle(const QString &msg) {
+    lbl_title->setText(msg);
+}

src/AlertDialog.h

@@ -12,11 +12,13 @@ public:
     explicit AlertDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     ~AlertDialog();
     void setAlertMessage(const QString& msg);
+    void setTitle(const QString& msg);
 protected:
     bool updateReferenceData() override{return true;}
 
 private:
     QLabel* lbl_msg;
+    QLabel* lbl_title;
 };
 
 

src/SelectFormWidget.cpp

@@ -19,6 +19,9 @@
 #include "log/UserOperationLog.h"
 #include <QSortFilterProxyModel>
 #include "src/components/VerticalTextToolButton.h"
+#include "AlertDialog.h"
+
+#include <QScroller>
 
 #define ADD_CENTER_ITEM(row,col,text)\
     item = new QTableWidgetItem(text);\
@@ -61,7 +64,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 
 	//Init content widget
 	QHBoxLayout* contentLayout = new QHBoxLayout();
-    contentLayout->setContentsMargins(5,5,0,5);
+	contentLayout->setContentsMargins(5, 5, 0, 5);
 	this->ui->contentWidget->setLayout(contentLayout);
 	// TableView for patient
 	QTableView* table = new SlideableTableView(this);
@@ -72,7 +75,9 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	table->verticalHeader()->setDefaultSectionSize(38);
 	table->horizontalHeader()->setStretchLastSection(true);
 	//data from SQLITE
-
+	// 
+	//avoid pan comsumed by tableview!
+	table->viewport()->ungrabGesture(Qt::PanGesture);
 
 	auto model = SQLHelper::getTable("Patient");
 	model->setFilter("Flag=0");
@@ -114,21 +119,21 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 	edit_patient->hide();
 	contentLayout->addWidget(edit_patient);
 
-    auto *btnShowEdit = new VerticalTextToolButton(this);
+	auto* btnShowEdit = new VerticalTextToolButton(this);
 	btnShowEdit->setObjectName("showeditBtn");
 	btnShowEdit->setIcon(QIcon(":/icons/edit.png"));
 	btnShowEdit->setIconSize(QSize(30, 30));
 	btnShowEdit->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 	btnShowEdit->setFixedHeight(225);
-//    btnShowEdit->setVerticalText("E\nd\ni\nt\nP\na\nn\ne\nl");
+	//    btnShowEdit->setVerticalText("E\nd\ni\nt\nP\na\nn\ne\nl");
 	btnShowEdit->setVerticalText("Patient Detail");
 	contentLayout->addWidget(btnShowEdit);
 	contentLayout->setAlignment(btnShowEdit, Qt::AlignmentFlag::AlignTop);
-    connect(btnShowEdit,&QToolButton::clicked,[=](){
+	connect(btnShowEdit, &QToolButton::clicked, [=]() {
 		edit_patient->show();
 		btnShowEdit->hide();
 		});
-    connect(edit_patient, &EditPatientForm::hideBtnClicked, [=](){
+	connect(edit_patient, &EditPatientForm::hideBtnClicked, [=]() {
 		edit_patient->hide();
 		btnShowEdit->show();
 		});
@@ -223,6 +228,13 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 
 	connect(btnDelete, &QToolButton::clicked, [=]() {
 		if (currentRow < 0)return;
+        AlertDialog dialog(this);
+        dialog.setButtonMode(OkAndCancel);
+        dialog.setTitle("Confirm");
+        dialog.setWindowModality(Qt::WindowModal);
+        QString pat_name =  model->index(currentRow, PatientInformationEnum::Name).data().toString();
+        dialog.setAlertMessage(QString(tr("Delete Patient \"%1\" ?")).arg(pat_name));
+        if (dialog.exec()!=QDialog::Accepted) return;
 		model->setData(model->index(currentRow, PatientInformationEnum::Flag), 9);
 		//        model->removeRow(currentRow);
 		if (model->submitAll())
@@ -232,6 +244,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 			{
 				table->selectRow(0);
 				model->selectRow(0);
+				currentRow = 0;
 				PatientInformation pat;
 #define ADD_PATIENT_PROPERTY(val)\
                 pat. val = model->data(model->index(0,PatientInformationEnum:: val)).toString();
@@ -298,4 +311,5 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
 
 SelectFormWidget::~SelectFormWidget()
 {
+
 }

src/aboutwidget.cpp

@@ -7,6 +7,7 @@
 #include <QStringList>
 #include "json/cmdhelper.h"
 #include <QThread>
+#include "AppVersion.h"
 
 AboutWidget::AboutWidget(QWidget* parent)
 	: QWidget(parent)
@@ -70,7 +71,7 @@ void AboutWidget::initUi()
 	pMainLayout->addSpacing(subContentSpacing);
 
 	pGuiVer = new QLabel(this);
-	pGuiVer->setText(tr("GUI Software V1.3"));
+	pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
 	pGuiVer->setContentsMargins(subContentMargin, 0, 0, 0);
 	pMainLayout->addWidget(pGuiVer);
 
@@ -154,7 +155,7 @@ void AboutWidget::initUi()
 		pProductVer->setText(tr("HJ-USCT-01 V1.0"));
 		pBtnHelp->setText(tr("?"));
 		pCompanyCopyRight->setText(tr("Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed"));
-		pGuiVer->setText(tr("GUI Software V1.3"));
+		pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
 		pEmbededSoftVer->setText(tr("Embedded Software V1.5"));
 		pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
 		pFEBVer->setText(tr("FEB Information"));
@@ -177,3 +178,7 @@ void AboutWidget::openHelpFile()
 	//	box.exec();
 	//}
 }
+
+QString AboutWidget::getGUIVersion() {
+    return QString("%1.%2.%3").arg(GUI_VERSION_MAJOR).arg(GUI_VERSION_MINOR).arg(GUI_VERSION_BUILD);
+}

src/aboutwidget.h

@@ -20,7 +20,7 @@ public:
 	explicit AboutWidget(QWidget* parent = nullptr);
 	~AboutWidget();
 
-
+    QString getGUIVersion();
 
 private slots:
 	void openHelpFile();

src/device/DeviceManager.cpp

@@ -85,8 +85,13 @@ void DeviceManager::initDevice() {
 		// check device status=========================================
 		//device is ready return
 		if (inf.status != SCANNING) {
+            //double check
+            QThread::msleep(100);
+            inf = GetStatus();
+            if (inf.status != SCANNING){
                 TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
                 return;
+            }
 		}
 		//        if (inf.status == BUSY) {
 		//            QString msg("Device is busy, Stop operation fail!");
@@ -293,7 +298,7 @@ void DeviceManager::processScan(const char* json, bool empty) {
 		lastStatus = SCANNING;
 		previewing = false;
 		qDebug() << "Start progress timer";
-		timerID = startTimer(300);
+		timerID = startTimer(500);
 		return;
 	}
 	QString errmsg("ScanControl start fail!");

src/errorhandle/GUIErrorFactory.cpp

@@ -10,7 +10,7 @@ GUIErrorBase *GUIErrorFactory::getError(const QString &errorMsg) {
 
     if (errorMsg.isEmpty()) return new GUIErrorBase;
     //新模式，分级
-    if (errorMsg[1] == ' ') {
+    if (errorMsg.length()>1 && errorMsg[1] == ' ') {
         char c = errorMsg[0].toLower().toLatin1();
         switch (c) {
             //WARN 级别

src/main.cpp

@@ -72,6 +72,7 @@ int main(int argc, char* argv[])
 	//QObject::connect(obj, SIGNAL(touchScreen()), Locker::Instance(), SLOT(refreshTimer()));
 	QList<Qt::GestureType> gestures;
 	gestures << Qt::SwipeGesture;
+	gestures << Qt::PanGesture;
 	w.grabGestures(gestures);
 
 	QStringList app_args = a.arguments();

src/mainwindow.cpp

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

src/mainwindow.h

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