diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 583264d9654fea8ca0ebed82dc57d6b057dd8e08..b86003be94e5fbffe82f4f50969acc725ee61d57 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -228,7 +228,8 @@ FORMS += src/ui/MainWindow.ui \ src/ui/designer/QGCComboBox.ui \ src/ui/designer/QGCTextLabel.ui \ src/ui/uas/UASQuickView.ui \ - src/ui/uas/UASQuickViewItemSelect.ui + src/ui/uas/UASQuickViewItemSelect.ui \ + src/ui/uas/UASActionsWidget.ui INCLUDEPATH += src \ src/ui \ src/ui/linechart \ @@ -379,7 +380,8 @@ HEADERS += src/MG.h \ src/ui/uas/UASQuickView.h \ src/ui/uas/UASQuickViewItem.h \ src/ui/uas/UASQuickViewItemSelect.h \ - src/ui/uas/UASQuickViewTextItem.h + src/ui/uas/UASQuickViewTextItem.h \ + src/ui/uas/UASActionsWidget.h # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::HEADERS += src/ui/map3D/QGCGoogleEarthView.h @@ -549,7 +551,8 @@ SOURCES += src/main.cc \ src/ui/uas/UASQuickViewItem.cc \ src/ui/uas/UASQuickView.cc \ src/ui/uas/UASQuickViewTextItem.cc \ - src/ui/uas/UASQuickViewItemSelect.cc + src/ui/uas/UASQuickViewItemSelect.cc \ + src/ui/uas/UASActionsWidget.cpp # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc diff --git a/src/ui/uas/UASActionsWidget.cpp b/src/ui/uas/UASActionsWidget.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c356e3c5a656ba707b5ad99cbc506e172ff8d93c --- /dev/null +++ b/src/ui/uas/UASActionsWidget.cpp @@ -0,0 +1,11 @@ +#include "UASActionsWidget.h" + + +UASActionsWidget::UASActionsWidget(QWidget *parent) : QWidget(parent) +{ + ui.setupUi(this); +} + +UASActionsWidget::~UASActionsWidget() +{ +} diff --git a/src/ui/uas/UASActionsWidget.h b/src/ui/uas/UASActionsWidget.h new file mode 100644 index 0000000000000000000000000000000000000000..e3ff17bc5511c39637233423d9fd7faee5db2395 --- /dev/null +++ b/src/ui/uas/UASActionsWidget.h @@ -0,0 +1,19 @@ +#ifndef UASACTIONSWIDGET_H +#define UASACTIONSWIDGET_H + +#include +#include "ui_UASActionsWidget.h" + +class UASActionsWidget : public QWidget +{ + Q_OBJECT + +public: + explicit UASActionsWidget(QWidget *parent = 0); + ~UASActionsWidget(); + +private: + Ui::UASActionsWidget ui; +}; + +#endif // UASACTIONSWIDGET_H diff --git a/src/ui/uas/UASActionsWidget.ui b/src/ui/uas/UASActionsWidget.ui new file mode 100644 index 0000000000000000000000000000000000000000..63b8dd0a25a9e285e98226a0fb097ee525dd481b --- /dev/null +++ b/src/ui/uas/UASActionsWidget.ui @@ -0,0 +1,223 @@ + + + UASActionsWidget + + + + 0 + 0 + 413 + 304 + + + + Form + + + + + 10 + 10 + 241 + 161 + + + + Mission Controls + + + + + 10 + 50 + 131 + 23 + + + + Go To Waypoint + + + + + + 10 + 20 + 131 + 22 + + + + + + + 150 + 50 + 81 + 23 + + + + Restart Mission + + + + + + 10 + 120 + 221 + 31 + + + + + + + + + + Change Speed + + + + + + + + + 10 + 81 + 221 + 31 + + + + + + + + + + Change Altitude + + + + + + + + + + 0 + 180 + 401 + 111 + + + + Auto Actions + + + + + 10 + 20 + 141 + 22 + + + + + + + 10 + 50 + 141 + 23 + + + + Execute Action + + + + + + 160 + 20 + 141 + 22 + + + + + + + 160 + 50 + 141 + 23 + + + + Set Mode + + + + + + 10 + 80 + 91 + 23 + + + + Auto + + + + + + 110 + 80 + 91 + 23 + + + + Manual + + + + + + 210 + 80 + 91 + 23 + + + + RTL + + + + + + 310 + 20 + 81 + 51 + + + + Arm/Disarm + + + + + + +