diff --git a/src/InputObject.cpp b/src/InputObject.cpp index bbe3600..ee7480e 100644 --- a/src/InputObject.cpp +++ b/src/InputObject.cpp @@ -89,7 +89,7 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event) { emit touchScreen(); - qDebug() << "touchScreen()"; + //qDebug() << "touchScreen()"; } //mouse button release means setfocus is useless if (event->type() == QEvent::MouseButtonRelease) @@ -141,7 +141,7 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event) } void InputObject::ShowPanel() { - if (!qApp->focusWidget()) return; + if (!qApp->focusWidget()) return; if (qApp->focusWidget()->inherits("QLineEdit")) { curLine = qobject_cast(qApp->focusWidget()); diff --git a/src/main.cpp b/src/main.cpp index ec8c898..d021218 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -75,11 +75,15 @@ int main(int argc, char* argv[]) w.grabGestures(gestures); QStringList app_args = a.arguments(); - int ret = 0; + int ret = 0; + if (app_args.contains("-d")) //if (true) { + w.debugConsoleOn(); + w.showFullScreen(); + qInstallMessageHandler(MainWindow::QMessageOutput); QThread thread; StdOutRedirector redir; @@ -88,9 +92,10 @@ int main(int argc, char* argv[]) redir.moveToThread(&thread); QObject::connect(&Timer, SIGNAL(timeout()), &redir, SLOT(readOutsToTF())); fflush(stdout); - Timer.start(1000); + Timer.start(10000); thread.start(); - w.showFullScreen(); + + DeviceManager::Default()->initDevice(); w.requestLogin(); @@ -102,8 +107,8 @@ int main(int argc, char* argv[]) w.showFullScreen(); DeviceManager::Default()->initDevice(); w.requestLogin(); - ret = a.exec(); + ret = a.exec(); } - DeviceManager::Default()->close(); - return ret; + DeviceManager::Default()->close(); + return ret; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4df3683..0beafc7 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -21,7 +21,7 @@ #include #include "TopBarWidget.h" #include - +#include void MainWindow::QMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg) { @@ -161,9 +161,9 @@ MainWindow::MainWindow(QWidget* parent) : } qApp->processEvents(); }); - connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError); - GUIErrorHandle::Default()->init(); - l = new LoginWindow(this); + connect(DeviceManager::Default(), &DeviceManager::raiseGlobalError, this, &MainWindow::triggerError); + GUIErrorHandle::Default()->init(); + l = new LoginWindow(this); t = QThread::create([]() { QThread::sleep(10); int f = 0x00100001; @@ -198,8 +198,8 @@ MainWindow::MainWindow(QWidget* parent) : MainWindow::~MainWindow() { - t->terminate(); - delete t; + t->terminate(); + delete t; delete ui; delete redir; } @@ -243,7 +243,7 @@ QTextEdit* MainWindow::getEdit() void MainWindow::requestLogin() { - l->clearInputData(); + l->clearInputData(); l->setWindowModality(Qt::WindowModal); l->showFullScreen(); this->centerWidgetHide(); @@ -251,14 +251,22 @@ void MainWindow::requestLogin() { { l->exec(); } - l->setResult(QDialog::Rejected); + l->setResult(QDialog::Rejected); this->centerWidgetShow(); } void MainWindow::debugConsoleOn() { + + debugMode = true; + dockWidget = new QDockWidget(this); + dockWidget->setObjectName(QString::fromUtf8("dockWidget")); + dockWidget->setAllowedAreas(Qt::RightDockWidgetArea); + this->addDockWidget(static_cast(2), dockWidget); + QTextEdit* text_edit = new QTextEdit(this); text_edit->setFocusPolicy(Qt::NoFocus); - ui->centralWidget->layout()->addWidget(text_edit); + dockWidget->setWidget(text_edit); + const QString edit_style = "QScrollBar:vertical{border: 0px solid grey; background:#2d2d2d; width: 15px; margin: 0px 0 0px 0; }" "QScrollBar::handle:vertical{background:#5a5a5a;min-height: 25px;}" @@ -295,11 +303,11 @@ bool MainWindow::gestureEvent(QGestureEvent* event) //qCDebug(lcExample) << "gestureEvent():" << event; if (QGesture* swipe = event->gesture(Qt::SwipeGesture)) swipeTriggered(static_cast(swipe)); - else if (QGesture* pan = event->gesture(Qt::PanGesture)) + //else if (QGesture* pan = event->gesture(Qt::PanGesture)) //panTriggered(static_cast(pan)); - if (QGesture* pinch = event->gesture(Qt::PinchGesture)) + //if (QGesture* pinch = event->gesture(Qt::PinchGesture)) //pinchTriggered(static_cast(pinch)); - return true; + return true; } void MainWindow::swipeTriggered(QSwipeGesture* gesture) { @@ -319,6 +327,18 @@ void MainWindow::swipeTriggered(QSwipeGesture* gesture) tab->setCurrentIndex(index); } } + if (gesture->verticalDirection() == QSwipeGesture::Down) { + if (debugMode) + { + dockWidget->show(); + } + } + if (gesture->verticalDirection() == QSwipeGesture::Up) { + if (debugMode) + { + dockWidget->hide(); + } + } //update(); } } \ No newline at end of file diff --git a/src/mainwindow.h b/src/mainwindow.h index e056bda..d1dc469 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -15,7 +15,7 @@ class GUIMessageDialog; class QTabWidget; class QGestureEvent; class QSwipeGesture; - +class QDockWidget; class MainWindow : public QMainWindow { @@ -45,14 +45,16 @@ private: cJSON* json_root = nullptr; Ui::MainWindow* ui; + QDockWidget* dockWidget; GUIMessageDialog* msgDialog = nullptr; StdOutRedirector* redir = nullptr; QTextEdit* console = nullptr; bool m_bLoaded = false; QTabWidget* tab = nullptr; int admin_tab_index = -1; - LoginWindow* l; - QThread* t; + LoginWindow* l; + QThread* t; + bool debugMode = false; }; #endif // MAINWINDOW_H diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index e3d904f..7a9caf5 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -78,10 +78,6 @@ Logout - - Change Role - - Reset password to "123456" ? diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak index e3d904f..7a9caf5 100644 --- a/src/translations/en_US.ts.bak +++ b/src/translations/en_US.ts.bak @@ -78,10 +78,6 @@ Logout - - Change Role - - Reset password to "123456" ? diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm index 6cb8394..f30b4c4 100644 Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 05661f0..2651393 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -104,17 +104,17 @@ 输入用户名 - + Password 密码 - + Change Password 修改密码 - + Input password 输入密码 @@ -127,75 +127,73 @@ 重置密码 - + Reset Password 密码重置 - - + Logout 登出 - Change Role - 类型 + 类型 doctor 医生 - + Reset password to "123456" ? 密码重置为"123456"? - + Inner error, can't find reference user! 内部错误！ - - + + Submit change to database fail! 修改提交至数据库失败！ - + Comment 备注 - - - + + + User Name can't be empty! 用户名不能为空！ - + User ID can't be empty! 用户ID不能为空！ - + Password can't be empty! 密码不能为空！ - + Inner error ,unset data model! 内部错误！ - + User Id exists! 用户ID已存在！ - + Submit to data base fail! 提交至数据库失败！ @@ -1175,22 +1173,22 @@ parameters 正在加载... - + total: %1G 总量：%1G - + Get disk total size fail! 磁盘总空间获取失败！ - + used: %1G 使用：%1G - + Get disk used size fail! 磁盘使用空间获取失败！ diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak index 05661f0..2651393 100644 --- a/src/translations/zh_CN.ts.bak +++ b/src/translations/zh_CN.ts.bak @@ -104,17 +104,17 @@ 输入用户名 - + Password 密码 - + Change Password 修改密码 - + Input password 输入密码 @@ -127,75 +127,73 @@ 重置密码 - + Reset Password 密码重置 - - + Logout 登出 - Change Role - 类型 + 类型 doctor 医生 - + Reset password to "123456" ? 密码重置为"123456"? - + Inner error, can't find reference user! 内部错误！ - - + + Submit change to database fail! 修改提交至数据库失败！ - + Comment 备注 - - - + + + User Name can't be empty! 用户名不能为空！ - + User ID can't be empty! 用户ID不能为空！ - + Password can't be empty! 密码不能为空！ - + Inner error ,unset data model! 内部错误！ - + User Id exists! 用户ID已存在！ - + Submit to data base fail! 提交至数据库失败！ @@ -1175,22 +1173,22 @@ parameters 正在加载... - + total: %1G 总量：%1G - + Get disk total size fail! 磁盘总空间获取失败！ - + used: %1G 使用：%1G - + Get disk used size fail! 磁盘使用空间获取失败！