sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize debug console

Browse Source
This commit is contained in:
xueyan hu
2022-01-19 14:24:16 +08:00
parent 437423dd00
commit 54e1539783
9 changed files with 96 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/InputObject.cpp
View File

@@ -89,7 +89,7 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event)
{ {
emit touchScreen(); emit touchScreen();
qDebug() << "touchScreen()"; //qDebug() << "touchScreen()";
} }
//mouse button release means setfocus is useless //mouse button release means setfocus is useless
if (event->type() == QEvent::MouseButtonRelease) if (event->type() == QEvent::MouseButtonRelease)
@@ -141,7 +141,7 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event)
} }
void InputObject::ShowPanel() { void InputObject::ShowPanel() {
if (!qApp->focusWidget()) return; if (!qApp->focusWidget()) return;
if (qApp->focusWidget()->inherits("QLineEdit")) if (qApp->focusWidget()->inherits("QLineEdit"))
{ {
curLine = qobject_cast<QLineEdit*>(qApp->focusWidget()); curLine = qobject_cast<QLineEdit*>(qApp->focusWidget());

17
src/main.cpp
View File

@@ -75,11 +75,15 @@ int main(int argc, char* argv[])
w.grabGestures(gestures); w.grabGestures(gestures);
QStringList app_args = a.arguments(); QStringList app_args = a.arguments();
int ret = 0; int ret = 0;
if (app_args.contains("-d")) if (app_args.contains("-d"))
//if (true) //if (true)
{ {
w.debugConsoleOn(); w.debugConsoleOn();
w.showFullScreen();
qInstallMessageHandler(MainWindow::QMessageOutput); qInstallMessageHandler(MainWindow::QMessageOutput);
QThread thread; QThread thread;
StdOutRedirector redir; StdOutRedirector redir;
@@ -88,9 +92,10 @@ int main(int argc, char* argv[])
redir.moveToThread(&thread); redir.moveToThread(&thread);
QObject::connect(&Timer, SIGNAL(timeout()), &redir, SLOT(readOutsToTF())); QObject::connect(&Timer, SIGNAL(timeout()), &redir, SLOT(readOutsToTF()));
fflush(stdout); fflush(stdout);
Timer.start(1000); Timer.start(10000);
thread.start(); thread.start();
w.showFullScreen();
DeviceManager::Default()->initDevice(); DeviceManager::Default()->initDevice();
w.requestLogin(); w.requestLogin();
@@ -102,8 +107,8 @@ int main(int argc, char* argv[])
w.showFullScreen(); w.showFullScreen();
DeviceManager::Default()->initDevice(); DeviceManager::Default()->initDevice();
w.requestLogin(); w.requestLogin();
ret = a.exec(); ret = a.exec();
} }
DeviceManager::Default()->close(); DeviceManager::Default()->close();
return ret; return ret;
} }

44
src/mainwindow.cpp
View File

@@ -21,7 +21,7 @@
#include <QDateTime> #include <QDateTime>
#include "TopBarWidget.h" #include "TopBarWidget.h"
#include <QGestureEvent> #include <QGestureEvent>
#include <QDockWidget>
void MainWindow::QMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg) void MainWindow::QMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
{ {
@@ -161,9 +161,9 @@ MainWindow::MainWindow(QWidget* parent) :
} }
qApp->processEvents(); qApp->processEvents();
}); });
connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError); connect(DeviceManager::Default(), &DeviceManager::raiseGlobalError, this, &MainWindow::triggerError);
GUIErrorHandle::Default()->init(); GUIErrorHandle::Default()->init();
l = new LoginWindow(this); l = new LoginWindow(this);
t = QThread::create([]() { t = QThread::create([]() {
QThread::sleep(10); QThread::sleep(10);
int f = 0x00100001; int f = 0x00100001;
@@ -198,8 +198,8 @@ MainWindow::MainWindow(QWidget* parent) :
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
t->terminate(); t->terminate();
delete t; delete t;
delete ui; delete ui;
delete redir; delete redir;
} }
@@ -243,7 +243,7 @@ QTextEdit* MainWindow::getEdit()
void MainWindow::requestLogin() { void MainWindow::requestLogin() {
l->clearInputData(); l->clearInputData();
l->setWindowModality(Qt::WindowModal); l->setWindowModality(Qt::WindowModal);
l->showFullScreen(); l->showFullScreen();
this->centerWidgetHide(); this->centerWidgetHide();
@@ -251,14 +251,22 @@ void MainWindow::requestLogin() {
{ {
l->exec(); l->exec();
} }
l->setResult(QDialog::Rejected); l->setResult(QDialog::Rejected);
this->centerWidgetShow(); this->centerWidgetShow();
} }
void MainWindow::debugConsoleOn() { void MainWindow::debugConsoleOn() {
debugMode = true;
dockWidget = new QDockWidget(this);
dockWidget->setObjectName(QString::fromUtf8("dockWidget"));
dockWidget->setAllowedAreas(Qt::RightDockWidgetArea);
this->addDockWidget(static_cast<Qt::DockWidgetArea>(2), dockWidget);
QTextEdit* text_edit = new QTextEdit(this); QTextEdit* text_edit = new QTextEdit(this);
text_edit->setFocusPolicy(Qt::NoFocus); text_edit->setFocusPolicy(Qt::NoFocus);
ui->centralWidget->layout()->addWidget(text_edit); dockWidget->setWidget(text_edit);
const QString edit_style = const QString edit_style =
"QScrollBar:vertical{border: 0px solid grey; background:#2d2d2d; width: 15px; margin: 0px 0 0px 0; }" "QScrollBar:vertical{border: 0px solid grey; background:#2d2d2d; width: 15px; margin: 0px 0 0px 0; }"
"QScrollBar::handle:vertical{background:#5a5a5a;min-height: 25px;}" "QScrollBar::handle:vertical{background:#5a5a5a;min-height: 25px;}"
@@ -295,11 +303,11 @@ bool MainWindow::gestureEvent(QGestureEvent* event)
//qCDebug(lcExample) << "gestureEvent():" << event; //qCDebug(lcExample) << "gestureEvent():" << event;
if (QGesture* swipe = event->gesture(Qt::SwipeGesture)) if (QGesture* swipe = event->gesture(Qt::SwipeGesture))
swipeTriggered(static_cast<QSwipeGesture*>(swipe)); swipeTriggered(static_cast<QSwipeGesture*>(swipe));
else if (QGesture* pan = event->gesture(Qt::PanGesture)) //else if (QGesture* pan = event->gesture(Qt::PanGesture))
//panTriggered(static_cast<QPanGesture*>(pan)); //panTriggered(static_cast<QPanGesture*>(pan));
if (QGesture* pinch = event->gesture(Qt::PinchGesture)) //if (QGesture* pinch = event->gesture(Qt::PinchGesture))
//pinchTriggered(static_cast<QPinchGesture*>(pinch)); //pinchTriggered(static_cast<QPinchGesture*>(pinch));
return true; return true;
} }
void MainWindow::swipeTriggered(QSwipeGesture* gesture) void MainWindow::swipeTriggered(QSwipeGesture* gesture)
{ {
@@ -319,6 +327,18 @@ void MainWindow::swipeTriggered(QSwipeGesture* gesture)
tab->setCurrentIndex(index); tab->setCurrentIndex(index);
} }
} }
if (gesture->verticalDirection() == QSwipeGesture::Down) {
if (debugMode)
{
dockWidget->show();
}
}
if (gesture->verticalDirection() == QSwipeGesture::Up) {
if (debugMode)
{
dockWidget->hide();
}
}
//update(); //update();
} }
} }

8
src/mainwindow.h
View File

@@ -15,7 +15,7 @@ class GUIMessageDialog;
class QTabWidget; class QTabWidget;
class QGestureEvent; class QGestureEvent;
class QSwipeGesture; class QSwipeGesture;
class QDockWidget;
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {
@@ -45,14 +45,16 @@ private:
cJSON* json_root = nullptr; cJSON* json_root = nullptr;
Ui::MainWindow* ui; Ui::MainWindow* ui;
QDockWidget* dockWidget;
GUIMessageDialog* msgDialog = nullptr; GUIMessageDialog* msgDialog = nullptr;
StdOutRedirector* redir = nullptr; StdOutRedirector* redir = nullptr;
QTextEdit* console = nullptr; QTextEdit* console = nullptr;
bool m_bLoaded = false; bool m_bLoaded = false;
QTabWidget* tab = nullptr; QTabWidget* tab = nullptr;
int admin_tab_index = -1; int admin_tab_index = -1;
LoginWindow* l; LoginWindow* l;
QThread* t; QThread* t;
bool debugMode = false;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

4
src/translations/en_US.ts
View File

@@ -78,10 +78,6 @@
<source>Logout</source> <source>Logout</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Change Role</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Reset password to &quot;123456&quot; ?</source> <source>Reset password to &quot;123456&quot; ?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
src/translations/en_US.ts.bak
View File

@@ -78,10 +78,6 @@
<source>Logout</source> <source>Logout</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Change Role</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Reset password to &quot;123456&quot; ?</source> <source>Reset password to &quot;123456&quot; ?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

BIN
src/translations/zh_CN.qm
View File

Binary file not shown.

48
src/translations/zh_CN.ts
View File

@@ -104,17 +104,17 @@
<translation>输入用户名</translation> <translation>输入用户名</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="57"/> <location filename="../AccountFormDialog.cpp" line="59"/>
<source>Password</source> <source>Password</source>
<translation>密码</translation> <translation>密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="70"/> <location filename="../AccountFormDialog.cpp" line="125"/>
<source>Change Password</source> <source>Change Password</source>
<translation>修改密码</translation> <translation>修改密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="64"/> <location filename="../AccountFormDialog.cpp" line="62"/>
<source>Input password</source> <source>Input password</source>
<translation>输入密码</translation> <translation>输入密码</translation>
</message> </message>
@@ -127,75 +127,73 @@
<translation type="vanished">重置密码</translation> <translation type="vanished">重置密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="70"/> <location filename="../AccountFormDialog.cpp" line="125"/>
<source>Reset Password</source> <source>Reset Password</source>
<translation>密码重置</translation> <translation>密码重置</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="81"/> <location filename="../AccountFormDialog.cpp" line="100"/>
<location filename="../AccountFormDialog.cpp" line="83"/>
<source>Logout</source> <source>Logout</source>
<translation>登出</translation> <translation>登出</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="112"/>
<source>Change Role</source> <source>Change Role</source>
<translation>类型</translation> <translation type="vanished">类型</translation>
</message> </message>
<message> <message>
<source>doctor</source> <source>doctor</source>
<translation type="vanished">医生</translation> <translation type="vanished">医生</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="129"/> <location filename="../AccountFormDialog.cpp" line="143"/>
<source>Reset password to &quot;123456&quot; ?</source> <source>Reset password to &quot;123456&quot; ?</source>
<translation>密码重置为&quot;123456&quot;?</translation> <translation>密码重置为&quot;123456&quot;?</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="135"/> <location filename="../AccountFormDialog.cpp" line="148"/>
<source>Inner error, can&apos;t find reference user!</source> <source>Inner error, can&apos;t find reference user!</source>
<translation>内部错误！</translation> <translation>内部错误！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="141"/> <location filename="../AccountFormDialog.cpp" line="153"/>
<location filename="../AccountFormDialog.cpp" line="211"/> <location filename="../AccountFormDialog.cpp" line="191"/>
<source>Submit change to database fail!</source> <source>Submit change to database fail!</source>
<translation>修改提交至数据库失败！</translation> <translation>修改提交至数据库失败！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="169"/> <location filename="../AccountFormDialog.cpp" line="74"/>
<source>Comment</source> <source>Comment</source>
<translation>备注</translation> <translation>备注</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="199"/> <location filename="../AccountFormDialog.cpp" line="179"/>
<location filename="../AccountFormDialog.cpp" line="221"/> <location filename="../AccountFormDialog.cpp" line="201"/>
<location filename="../AccountFormDialog.cpp" line="242"/> <location filename="../AccountFormDialog.cpp" line="222"/>
<source>User Name can&apos;t be empty!</source> <source>User Name can&apos;t be empty!</source>
<translation>用户名不能为空！</translation> <translation>用户名不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="238"/> <location filename="../AccountFormDialog.cpp" line="218"/>
<source>User ID can&apos;t be empty!</source> <source>User ID can&apos;t be empty!</source>
<translation>用户ID不能为空！</translation> <translation>用户ID不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="246"/> <location filename="../AccountFormDialog.cpp" line="226"/>
<source>Password can&apos;t be empty!</source> <source>Password can&apos;t be empty!</source>
<translation>密码不能为空！</translation> <translation>密码不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="250"/> <location filename="../AccountFormDialog.cpp" line="230"/>
<source>Inner error ,unset data model!</source> <source>Inner error ,unset data model!</source>
<translation>内部错误！</translation> <translation>内部错误！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="254"/> <location filename="../AccountFormDialog.cpp" line="234"/>
<source>User Id exists!</source> <source>User Id exists!</source>
<translation>用户ID已存在！</translation> <translation>用户ID已存在！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="290"/> <location filename="../AccountFormDialog.cpp" line="270"/>
<source>Submit to data base fail!</source> <source>Submit to data base fail!</source>
<translation>提交至数据库失败！</translation> <translation>提交至数据库失败！</translation>
</message> </message>
@@ -1175,22 +1173,22 @@ parameters
<translation>正在加载...</translation> <translation>正在加载...</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="191"/> <location filename="../systemsettingform.cpp" line="189"/>
<source>total: %1G</source> <source>total: %1G</source>
<translation>总量：%1G</translation> <translation>总量：%1G</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="195"/> <location filename="../systemsettingform.cpp" line="193"/>
<source>Get disk total size fail!</source> <source>Get disk total size fail!</source>
<translation>磁盘总空间获取失败！</translation> <translation>磁盘总空间获取失败！</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="174"/> <location filename="../systemsettingform.cpp" line="172"/>
<source>used: %1G</source> <source>used: %1G</source>
<translation>使用：%1G</translation> <translation>使用：%1G</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="178"/> <location filename="../systemsettingform.cpp" line="176"/>
<source>Get disk used size fail!</source> <source>Get disk used size fail!</source>
<translation>磁盘使用空间获取失败！</translation> <translation>磁盘使用空间获取失败！</translation>
</message> </message>

48
src/translations/zh_CN.ts.bak
View File

@@ -104,17 +104,17 @@
<translation>输入用户名</translation> <translation>输入用户名</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="57"/> <location filename="../AccountFormDialog.cpp" line="59"/>
<source>Password</source> <source>Password</source>
<translation>密码</translation> <translation>密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="70"/> <location filename="../AccountFormDialog.cpp" line="125"/>
<source>Change Password</source> <source>Change Password</source>
<translation>修改密码</translation> <translation>修改密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="64"/> <location filename="../AccountFormDialog.cpp" line="62"/>
<source>Input password</source> <source>Input password</source>
<translation>输入密码</translation> <translation>输入密码</translation>
</message> </message>
@@ -127,75 +127,73 @@
<translation type="vanished">重置密码</translation> <translation type="vanished">重置密码</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="70"/> <location filename="../AccountFormDialog.cpp" line="125"/>
<source>Reset Password</source> <source>Reset Password</source>
<translation>密码重置</translation> <translation>密码重置</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="81"/> <location filename="../AccountFormDialog.cpp" line="100"/>
<location filename="../AccountFormDialog.cpp" line="83"/>
<source>Logout</source> <source>Logout</source>
<translation>登出</translation> <translation>登出</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="112"/>
<source>Change Role</source> <source>Change Role</source>
<translation>类型</translation> <translation type="vanished">类型</translation>
</message> </message>
<message> <message>
<source>doctor</source> <source>doctor</source>
<translation type="vanished">医生</translation> <translation type="vanished">医生</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="129"/> <location filename="../AccountFormDialog.cpp" line="143"/>
<source>Reset password to &quot;123456&quot; ?</source> <source>Reset password to &quot;123456&quot; ?</source>
<translation>密码重置为&quot;123456&quot;?</translation> <translation>密码重置为&quot;123456&quot;?</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="135"/> <location filename="../AccountFormDialog.cpp" line="148"/>
<source>Inner error, can&apos;t find reference user!</source> <source>Inner error, can&apos;t find reference user!</source>
<translation>内部错误！</translation> <translation>内部错误！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="141"/> <location filename="../AccountFormDialog.cpp" line="153"/>
<location filename="../AccountFormDialog.cpp" line="211"/> <location filename="../AccountFormDialog.cpp" line="191"/>
<source>Submit change to database fail!</source> <source>Submit change to database fail!</source>
<translation>修改提交至数据库失败！</translation> <translation>修改提交至数据库失败！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="169"/> <location filename="../AccountFormDialog.cpp" line="74"/>
<source>Comment</source> <source>Comment</source>
<translation>备注</translation> <translation>备注</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="199"/> <location filename="../AccountFormDialog.cpp" line="179"/>
<location filename="../AccountFormDialog.cpp" line="221"/> <location filename="../AccountFormDialog.cpp" line="201"/>
<location filename="../AccountFormDialog.cpp" line="242"/> <location filename="../AccountFormDialog.cpp" line="222"/>
<source>User Name can&apos;t be empty!</source> <source>User Name can&apos;t be empty!</source>
<translation>用户名不能为空！</translation> <translation>用户名不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="238"/> <location filename="../AccountFormDialog.cpp" line="218"/>
<source>User ID can&apos;t be empty!</source> <source>User ID can&apos;t be empty!</source>
<translation>用户ID不能为空！</translation> <translation>用户ID不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="246"/> <location filename="../AccountFormDialog.cpp" line="226"/>
<source>Password can&apos;t be empty!</source> <source>Password can&apos;t be empty!</source>
<translation>密码不能为空！</translation> <translation>密码不能为空！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="250"/> <location filename="../AccountFormDialog.cpp" line="230"/>
<source>Inner error ,unset data model!</source> <source>Inner error ,unset data model!</source>
<translation>内部错误！</translation> <translation>内部错误！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="254"/> <location filename="../AccountFormDialog.cpp" line="234"/>
<source>User Id exists!</source> <source>User Id exists!</source>
<translation>用户ID已存在！</translation> <translation>用户ID已存在！</translation>
</message> </message>
<message> <message>
<location filename="../AccountFormDialog.cpp" line="290"/> <location filename="../AccountFormDialog.cpp" line="270"/>
<source>Submit to data base fail!</source> <source>Submit to data base fail!</source>
<translation>提交至数据库失败！</translation> <translation>提交至数据库失败！</translation>
</message> </message>
@@ -1175,22 +1173,22 @@ parameters
<translation>正在加载...</translation> <translation>正在加载...</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="191"/> <location filename="../systemsettingform.cpp" line="189"/>
<source>total: %1G</source> <source>total: %1G</source>
<translation>总量：%1G</translation> <translation>总量：%1G</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="195"/> <location filename="../systemsettingform.cpp" line="193"/>
<source>Get disk total size fail!</source> <source>Get disk total size fail!</source>
<translation>磁盘总空间获取失败！</translation> <translation>磁盘总空间获取失败！</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="174"/> <location filename="../systemsettingform.cpp" line="172"/>
<source>used: %1G</source> <source>used: %1G</source>
<translation>使用：%1G</translation> <translation>使用：%1G</translation>
</message> </message>
<message> <message>
<location filename="../systemsettingform.cpp" line="178"/> <location filename="../systemsettingform.cpp" line="176"/>
<source>Get disk used size fail!</source> <source>Get disk used size fail!</source>
<translation>磁盘使用空间获取失败！</translation> <translation>磁盘使用空间获取失败！</translation>
</message> </message>