Skip to content

Q
qgroundcontrol
Commit c5bed07a authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

parents 9af04635 8691d1e1
Show whitespace changes
Inline Side-by-side
Showing with 358 additions and 1 deletion
qgroundcontrol.pro
View file @ c5bed07a
...@@ -269,7 +269,8 @@ FORMS += src/ui/MainWindow.ui \ ...@@ -269,7 +269,8 @@ FORMS += src/ui/MainWindow.ui \
src/ui/main/QGCWelcomeMainWindow.ui \ src/ui/main/QGCWelcomeMainWindow.ui \
src/ui/configuration/terminalconsole.ui \ src/ui/configuration/terminalconsole.ui \
src/ui/configuration/SerialSettingsDialog.ui \ src/ui/configuration/SerialSettingsDialog.ui \
src/ui/configuration/ApmFirmwareConfig.ui src/ui/configuration/ApmFirmwareConfig.ui \
src/ui/px4_configuration/QGCPX4AirframeConfig.ui
INCLUDEPATH += src \ INCLUDEPATH += src \
src/ui \ src/ui \
...@@ -472,6 +473,7 @@ HEADERS += src/MG.h \ ...@@ -472,6 +473,7 @@ HEADERS += src/MG.h \
src/uas/UASParameterDataModel.h \ src/uas/UASParameterDataModel.h \
src/uas/UASParameterCommsMgr.h \ src/uas/UASParameterCommsMgr.h \
src/ui/QGCPendingParamWidget.h \ src/ui/QGCPendingParamWidget.h \
src/ui/px4_configuration/QGCPX4AirframeConfig.h \
src/ui/QGCBaseParamWidget.h src/ui/QGCBaseParamWidget.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
...@@ -691,6 +693,7 @@ SOURCES += src/main.cc \ ...@@ -691,6 +693,7 @@ SOURCES += src/main.cc \
src/uas/UASParameterDataModel.cc \ src/uas/UASParameterDataModel.cc \
src/uas/UASParameterCommsMgr.cc \ src/uas/UASParameterCommsMgr.cc \
src/ui/QGCPendingParamWidget.cc \ src/ui/QGCPendingParamWidget.cc \
src/ui/px4_configuration/QGCPX4AirframeConfig.cc \
src/ui/QGCBaseParamWidget.cc src/ui/QGCBaseParamWidget.cc
# 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
......
src/ui/px4_configuration/QGCPX4AirframeConfig.cc 0 → 100644
View file @ c5bed07a
#include "QGCPX4AirframeConfig.h"
#include "ui_QGCPX4AirframeConfig.h"
QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
QWidget(parent),
ui(new Ui::QGCPX4AirframeConfig)
{
ui->setupUi(this);
}
QGCPX4AirframeConfig::~QGCPX4AirframeConfig()
{
delete ui;
}
src/ui/px4_configuration/QGCPX4AirframeConfig.h 0 → 100644
View file @ c5bed07a
#ifndef QGCPX4AIRFRAMECONFIG_H
#define QGCPX4AIRFRAMECONFIG_H
#include <QWidget>
namespace Ui {
class QGCPX4AirframeConfig;
}
class QGCPX4AirframeConfig : public QWidget
{
Q_OBJECT
public:
explicit QGCPX4AirframeConfig(QWidget *parent = 0);
~QGCPX4AirframeConfig();
private:
Ui::QGCPX4AirframeConfig *ui;
};
#endif // QGCPX4AIRFRAMECONFIG_H
src/ui/px4_configuration/QGCPX4AirframeConfig.ui 0 → 100644
View file @ c5bed07a
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QGCPX4AirframeConfig</class>
<widget class="QWidget" name="QGCPX4AirframeConfig">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>602</width>
<height>345</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>561</width>
<height>299</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="planePushButton">
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>120</width>
<height>120</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="planeComboBox">
<item>
<property name="text">
<string>Please select</string>
</property>
</item>
<item>
<property name="text">
<string>EasyStar</string>
</property>
</item>
<item>
<property name="text">
<string>EasyStar 2</string>
</property>
</item>
<item>
<property name="text">
<string>EasyStar 2 w. Ailerons</string>
</property>
</item>
<item>
<property name="text">
<string>Bixler 2</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Standard Plane</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="flyingWingPushButton">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="flyingWingComboBox">
<item>
<property name="text">
<string>Bormatec CamFlyer Q</string>
</property>
</item>
<item>
<property name="text">
<string>FX-61 Phantom</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Flying Wing</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QPushButton" name="quadXPushButton">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="quadXComboBox">
<item>
<property name="text">
<string>AR.Drone Frame</string>
</property>
</item>
<item>
<property name="text">
<string>Arducopter C Frame</string>
</property>
</item>
<item>
<property name="text">
<string>DJI F330 Frame</string>
</property>
</item>
<item>
<property name="text">
<string>DJI F450 Frame</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Quadrotor X</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="3">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="QuadPlusPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_4"/>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Quadrotor +</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QPushButton" name="HexaXPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_5"/>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Hexarotor X</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QPushButton" name="HexaPlusPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_6"/>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Hexarotor +</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="2">
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QPushButton" name="octoXPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_7"/>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Octorotor X</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="3">
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QPushButton" name="octoPlusPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_8"/>
</item>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Octorotor +</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QPushButton" name="hPushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_9">
<item>
<property name="text">
<string>Steadydrone</string>
</property>
</item>
<item>
<property name="text">
<string>H Frame Custom</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string>H Frame</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="statusLabel">
<property name="text">
<string>No changes values</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="applyButton">
<property name="text">
<string>Apply and Restart</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment