zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Addition of "Actions" widget. Similar to the Control dock widget, but APM specific.

QGC4.4
Michael Carpenter 12 years ago
parent
0032c8d031
commit
296a2b37f2
4 changed files with 259 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      qgroundcontrol.pro
  2. 11
      src/ui/uas/UASActionsWidget.cpp
  3. 19
      src/ui/uas/UASActionsWidget.h
  4. 223
      src/ui/uas/UASActionsWidget.ui

9
qgroundcontrol.pro
Unescape View File

@ -228,7 +228,8 @@ FORMS += src/ui/MainWindow.ui \
src/ui/designer/QGCComboBox.ui \ src/ui/designer/QGCComboBox.ui \
src/ui/designer/QGCTextLabel.ui \ src/ui/designer/QGCTextLabel.ui \
src/ui/uas/UASQuickView.ui \ src/ui/uas/UASQuickView.ui \
src/ui/uas/UASQuickViewItemSelect.ui src/ui/uas/UASQuickViewItemSelect.ui \
src/ui/uas/UASActionsWidget.ui
INCLUDEPATH += src \ INCLUDEPATH += src \
src/ui \ src/ui \
src/ui/linechart \ src/ui/linechart \
@ -379,7 +380,8 @@ HEADERS += src/MG.h \
src/ui/uas/UASQuickView.h \ src/ui/uas/UASQuickView.h \
src/ui/uas/UASQuickViewItem.h \ src/ui/uas/UASQuickViewItem.h \
src/ui/uas/UASQuickViewItemSelect.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 # 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 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/UASQuickViewItem.cc \
src/ui/uas/UASQuickView.cc \ src/ui/uas/UASQuickView.cc \
src/ui/uas/UASQuickViewTextItem.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 # 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 macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc

11
src/ui/uas/UASActionsWidget.cpp
Unescape View File

@ -0,0 +1,11 @@
#include "UASActionsWidget.h"
UASActionsWidget::UASActionsWidget(QWidget *parent) : QWidget(parent)
{
ui.setupUi(this);
}
UASActionsWidget::~UASActionsWidget()
{
}

19
src/ui/uas/UASActionsWidget.h
Unescape View File

@ -0,0 +1,19 @@
#ifndef UASACTIONSWIDGET_H
#define UASACTIONSWIDGET_H
#include <QWidget>
#include "ui_UASActionsWidget.h"
class UASActionsWidget : public QWidget
{
Q_OBJECT
public:
explicit UASActionsWidget(QWidget *parent = 0);
~UASActionsWidget();
private:
Ui::UASActionsWidget ui;
};
#endif // UASACTIONSWIDGET_H

223
src/ui/uas/UASActionsWidget.ui
Unescape View File

@ -0,0 +1,223 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UASActionsWidget</class>
<widget class="QWidget" name="UASActionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>413</width>
<height>304</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>241</width>
<height>161</height>
</rect>
</property>
<property name="title">
<string>Mission Controls</string>
</property>
<widget class="QPushButton" name="pushButton_9">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>131</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Go To Waypoint</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_2">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>131</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_6">
<property name="geometry">
<rect>
<x>150</x>
<y>50</y>
<width>81</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Restart Mission</string>
</property>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>120</y>
<width>221</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSpinBox" name="spinBox_2"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_12">
<property name="text">
<string>Change Speed</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>10</x>
<y>81</y>
<width>221</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSpinBox" name="spinBox"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_11">
<property name="text">
<string>Change Altitude</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_2">
<property name="geometry">
<rect>
<x>0</x>
<y>180</y>
<width>401</width>
<height>111</height>
</rect>
</property>
<property name="title">
<string>Auto Actions</string>
</property>
<widget class="QComboBox" name="comboBox">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>141</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_8">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>141</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Execute Action</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_3">
<property name="geometry">
<rect>
<x>160</x>
<y>20</y>
<width>141</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_5">
<property name="geometry">
<rect>
<x>160</x>
<y>50</y>
<width>141</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Set Mode</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>91</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Auto</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>110</x>
<y>80</y>
<width>91</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Manual</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_4">
<property name="geometry">
<rect>
<x>210</x>
<y>80</y>
<width>91</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>RTL</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_10">
<property name="geometry">
<rect>
<x>310</x>
<y>20</y>
<width>81</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string>Arm/Disarm</string>
</property>
</widget>
</widget>
</widget>
<resources/>
<connections/>
</ui>
Write Preview
Loading…
Cancel
Save