diff --git a/App/CommandUI/CommandUI.cpp b/App/CommandUI/CommandUI.cpp index 547649c..e1ff53c 100644 --- a/App/CommandUI/CommandUI.cpp +++ b/App/CommandUI/CommandUI.cpp @@ -1,4 +1,4 @@ -#include "CommandUI.h" +#include "CommandUI.h" #include "ui_CommandUI.h" #include "QtTextToSpeech/QtTextToSpeech" @@ -133,6 +133,20 @@ void CommandUI::wheelEvent(QWheelEvent *e) } } +void CommandUI::keyPressEvent(QKeyEvent *event) //键盘按下事件 +{ + + switch(event->key()) + { + case Qt::Key_Space : + { + qInfo() << "command key" << event; + } + break; + } +} + + void CommandUI::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::MiddleButton) diff --git a/App/CommandUI/CommandUI.h b/App/CommandUI/CommandUI.h index 70f588e..292cded 100644 --- a/App/CommandUI/CommandUI.h +++ b/App/CommandUI/CommandUI.h @@ -1,4 +1,4 @@ -#ifndef COMMANDUI_H +#ifndef COMMANDUI_H #define COMMANDUI_H #include @@ -60,6 +60,10 @@ protected: void wheelEvent(QWheelEvent *e); void mousePressEvent(QMouseEvent *event); + void keyPressEvent(QKeyEvent *event); + + void loadCommandJson(const QString& jsonFilename); + public slots: void setFloat(void); void setFloatFlag(bool flag); @@ -91,9 +95,7 @@ private slots: void on_groupBox_Command_clicked(); -protected: - void loadCommandJson(const QString& jsonFilename); private: diff --git a/mavlink b/mavlink index 54c7286..d1fe3a3 160000 --- a/mavlink +++ b/mavlink @@ -1 +1 @@ -Subproject commit 54c7286a2cd08c17b8ea612be84c9e27314935b5 +Subproject commit d1fe3a364f2c09ec68e3f35d4c04b297a0d2efa4