Skip to content

Q
qgroundcontrol
Commit f5d89a62 authored by Michael Carpenter's avatar Michael Carpenter
Browse files
Options

Change to how configuration view operates, menu on the left side rather than top

parent 0049997b
Show whitespace changes
Inline Side-by-side
Showing with 1051 additions and 894 deletions
files/styles/style-indoor.css
View file @ f5d89a62
...@@ -178,8 +178,8 @@ QDoubleSpinBox::down-button { ...@@ -178,8 +178,8 @@ QDoubleSpinBox::down-button {
} }
QPushButton { QPushButton {
min-height: 20px; /*min-height: 20px;*/
max-height: 20px; /*max-height: 20px;*/
border: 1px solid #465158; border: 1px solid #465158;
margin: 1px; margin: 1px;
border-radius: 2px; border-radius: 2px;
......
files/styles/style-outdoor.css
View file @ f5d89a62
...@@ -184,8 +184,8 @@ QDoubleSpinBox::down-button { ...@@ -184,8 +184,8 @@ QDoubleSpinBox::down-button {
QPushButton { QPushButton {
font-weight: bold; font-weight: bold;
min-height: 18px; /*min-height: 18px;*/
max-height: 18px; /*max-height: 18px;*/
border: 2px solid #4A4A4F; border: 2px solid #4A4A4F;
border-radius: 5px; border-radius: 5px;
padding-left: 10px; padding-left: 10px;
......
src/ui/QGCVehicleConfig.cc
View file @ f5d89a62
...@@ -44,6 +44,12 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : ...@@ -44,6 +44,12 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
setObjectName("QGC_VEHICLECONFIG"); setObjectName("QGC_VEHICLECONFIG");
ui->setupUi(this); ui->setupUi(this);
connect(ui->rcMenuButton,SIGNAL(clicked()),this,SLOT(rcMenuButtonClicked()));
connect(ui->sensorMenuButton,SIGNAL(clicked()),this,SLOT(sensorMenuButtonClicked()));
connect(ui->generalMenuButton,SIGNAL(clicked()),this,SLOT(generalMenuButtonClicked()));
connect(ui->advancedMenuButton,SIGNAL(clicked()),this,SLOT(advancedMenuButtonClicked()));
requestCalibrationRC(); requestCalibrationRC();
if (mav) mav->requestParameter(0, "RC_TYPE"); if (mav) mav->requestParameter(0, "RC_TYPE");
...@@ -89,6 +95,25 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : ...@@ -89,6 +95,25 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView())); connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView()));
updateTimer.start(); updateTimer.start();
} }
void QGCVehicleConfig::rcMenuButtonClicked()
{
ui->stackedWidget->setCurrentIndex(0);
}
void QGCVehicleConfig::sensorMenuButtonClicked()
{
ui->stackedWidget->setCurrentIndex(1);
}
void QGCVehicleConfig::generalMenuButtonClicked()
{
ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count()-2);
}
void QGCVehicleConfig::advancedMenuButtonClicked()
{
ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count()-1);
}
QGCVehicleConfig::~QGCVehicleConfig() QGCVehicleConfig::~QGCVehicleConfig()
{ {
...@@ -247,8 +272,18 @@ void QGCVehicleConfig::loadQgcConfig(bool primary) ...@@ -247,8 +272,18 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
//Load tabs for general configuration //Load tabs for general configuration
foreach (QString dir,generaldir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) foreach (QString dir,generaldir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
{ {
QWidget *tab = new QWidget(ui->tabWidget); QPushButton *button = new QPushButton(ui->scrollAreaWidgetContents_3);
ui->tabWidget->insertTab(2,tab,dir); connect(button,SIGNAL(clicked()),this,SLOT(menuButtonClicked()));
ui->navBarLayout->insertWidget(2,button);
button->setMinimumHeight(100);
button->setMinimumWidth(100);
button->show();
button->setText(dir);
//QWidget *tab = new QWidget(ui->tabWidget);
//ui->tabWidget->insertTab(2,tab,dir);
QWidget *tab = new QWidget(ui->stackedWidget);
ui->stackedWidget->insertWidget(2,tab);
buttonToWidgetMap[button] = tab;
tab->setLayout(new QVBoxLayout()); tab->setLayout(new QVBoxLayout());
tab->show(); tab->show();
QScrollArea *area = new QScrollArea(); QScrollArea *area = new QScrollArea();
...@@ -283,8 +318,20 @@ void QGCVehicleConfig::loadQgcConfig(bool primary) ...@@ -283,8 +318,20 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
//Load tabs for vehicle specific configuration //Load tabs for vehicle specific configuration
foreach (QString dir,vehicledir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) foreach (QString dir,vehicledir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
{ {
QWidget *tab = new QWidget(ui->tabWidget); //QWidget *tab = new QWidget(ui->tabWidget);
ui->tabWidget->insertTab(2,tab,dir); //ui->tabWidget->insertTab(2,tab,dir);
QPushButton *button = new QPushButton(ui->scrollAreaWidgetContents_3);
connect(button,SIGNAL(clicked()),this,SLOT(menuButtonClicked()));
ui->navBarLayout->insertWidget(2,button);
QWidget *tab = new QWidget(ui->stackedWidget);
ui->stackedWidget->insertWidget(2,tab);
buttonToWidgetMap[button] = tab;
button->setMinimumHeight(100);
button->setMinimumWidth(100);
button->show();
button->setText(dir);
tab->setLayout(new QVBoxLayout()); tab->setLayout(new QVBoxLayout());
tab->show(); tab->show();
QScrollArea *area = new QScrollArea(); QScrollArea *area = new QScrollArea();
...@@ -361,6 +408,19 @@ void QGCVehicleConfig::loadQgcConfig(bool primary) ...@@ -361,6 +408,19 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
}
void QGCVehicleConfig::menuButtonClicked()
{
QPushButton *button = qobject_cast<QPushButton*>(sender());
if (!button)
{
return;
}
if (buttonToWidgetMap.contains(button))
{
ui->stackedWidget->setCurrentWidget(buttonToWidgetMap[button]);
}
} }
void QGCVehicleConfig::loadConfig() void QGCVehicleConfig::loadConfig()
......
src/ui/QGCVehicleConfig.h
View file @ f5d89a62
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <QTimer> #include <QTimer>
#include <QList> #include <QList>
#include <QGroupBox> #include <QGroupBox>
#include <QPushButton>
#include "QGCToolWidget.h" #include "QGCToolWidget.h"
#include "UASInterface.h" #include "UASInterface.h"
...@@ -29,6 +30,11 @@ public: ...@@ -29,6 +30,11 @@ public:
}; };
public slots: public slots:
void rcMenuButtonClicked();
void sensorMenuButtonClicked();
void generalMenuButtonClicked();
void advancedMenuButtonClicked();
/** Set the MAV currently being calibrated */ /** Set the MAV currently being calibrated */
void setActiveUAS(UASInterface* active); void setActiveUAS(UASInterface* active);
/** Fallback function, automatically called by loadConfig() upon failure to find and xml file*/ /** Fallback function, automatically called by loadConfig() upon failure to find and xml file*/
...@@ -125,6 +131,7 @@ public slots: ...@@ -125,6 +131,7 @@ public slots:
} }
protected slots: protected slots:
void menuButtonClicked();
/** Reset the RC calibration */ /** Reset the RC calibration */
void resetCalibrationRC(); void resetCalibrationRC();
/** Write the RC calibration */ /** Write the RC calibration */
...@@ -183,7 +190,7 @@ protected: ...@@ -183,7 +190,7 @@ protected:
private: private:
Ui::QGCVehicleConfig *ui; Ui::QGCVehicleConfig *ui;
QMap<QPushButton*,QWidget*> buttonToWidgetMap;
signals: signals:
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
}; };
......
src/ui/QGCVehicleConfig.ui
View file @ f5d89a62
...@@ -6,83 +6,149 @@ ...@@ -6,83 +6,149 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>760</width> <width>1151</width>
<height>541</height> <height>602</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,2,1">
<property name="horizontalSpacing"> <item>
<number>6</number> <widget class="QScrollArea" name="scrollArea_6">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property> </property>
<property name="verticalSpacing"> <property name="maximumSize">
<number>8</number> <size>
<width>125</width>
<height>16777215</height>
</size>
</property> </property>
<property name="margin"> <property name="widgetResizable">
<number>6</number> <bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>123</width>
<height>582</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<layout class="QVBoxLayout" name="navBarLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<item>
<widget class="QPushButton" name="rcMenuButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property> </property>
<item row="2" column="1">
<widget class="QPushButton" name="storeButton">
<property name="text"> <property name="text">
<string>Store to EEPROM</string> <string>RC
Calibration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item>
<widget class="QLabel" name="statusLabel"> <widget class="QPushButton" name="sensorMenuButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="text"> <property name="text">
<string>No pending changes</string> <string>Sensor
Calibration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QPushButton" name="generalMenuButton">
<property name="currentIndex"> <property name="minimumSize">
<number>2</number> <size>
<width>100</width>
<height>100</height>
</size>
</property> </property>
<widget class="QWidget" name="rcTab"> <property name="maximumSize">
<attribute name="title"> <size>
<string>RC Calibration</string> <width>100</width>
</attribute> <height>100</height>
<layout class="QGridLayout" name="gridLayout_5" columnstretch="1,1,10,1,1,10,1,1,1,1,1,1,1,1,10"> </size>
<property name="topMargin">
<number>20</number>
</property> </property>
<item row="8" column="1" rowspan="3"> <property name="text">
<widget class="QSlider" name="throttleSlider"> <string>General
<property name="minimum"> Config</string>
<number>0</number>
</property> </property>
<property name="maximum"> </widget>
<number>100</number> </item>
<item>
<widget class="QPushButton" name="advancedMenuButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property> </property>
<property name="value"> <property name="maximumSize">
<number>0</number> <size>
<width>100</width>
<height>100</height>
</size>
</property> </property>
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <string>Advanced
Config</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="4" rowspan="3" colspan="2"> </layout>
<widget class="QSlider" name="pitchSlider"> </item>
<property name="minimum"> </layout>
<number>0</number> </widget>
</property> </widget>
<property name="maximum"> </item>
<number>100</number> <item>
</property> <layout class="QVBoxLayout" name="verticalLayout">
<property name="value"> <item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<property name="orientation"> <widget class="QWidget" name="page">
<enum>Qt::Vertical</enum> <layout class="QVBoxLayout" name="verticalLayout_15">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>RC Calibration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" rowspan="2" colspan="9"> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QComboBox" name="rcTypeComboBox"> <widget class="QComboBox" name="rcTypeComboBox">
...@@ -128,35 +194,40 @@ ...@@ -128,35 +194,40 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0" colspan="12"> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>598</width> <width>20</width>
<height>5</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="4" column="0"> <item>
<widget class="QLabel" name="txLabel"> <layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="1">
<widget class="QLabel" name="chanLabel_3">
<property name="text"> <property name="text">
<string/> <string>0000</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="7"> <item row="3" column="7">
<widget class="QLabel" name="instructionLabel"> <widget class="QCheckBox" name="invertCheckBox_8">
<property name="text"> <property name="text">
<string/> <string>Invert</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="10" colspan="2"> <item row="1" column="4">
<spacer name="horizontalSpacer_7"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
...@@ -168,12 +239,57 @@ ...@@ -168,12 +239,57 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0" colspan="13"> <item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_2"> <widget class="QLabel" name="chanName_3">
<item row="3" column="5">
<widget class="QLabel" name="chanName_8">
<property name="text"> <property name="text">
<string>Aux 3</string> <string>Yaw / Rudder</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="chanLabel_5">
<property name="text">
<string>0000</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="7">
<widget class="QCheckBox" name="invertCheckBox_5">
<property name="text">
<string>Invert</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="invertCheckBox">
<property name="text">
<string>Invert</string>
</property>
</widget>
</item>
<item row="2" column="8">
<widget class="QSpinBox" name="aux2SpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>8</number>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -251,16 +367,6 @@ ...@@ -251,16 +367,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="8">
<widget class="QSpinBox" name="aux2SpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>8</number>
</property>
</widget>
</item>
<item row="3" column="8"> <item row="3" column="8">
<widget class="QSpinBox" name="aux3SpinBox"> <widget class="QSpinBox" name="aux3SpinBox">
<property name="minimum"> <property name="minimum">
...@@ -382,27 +488,27 @@ ...@@ -382,27 +488,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="8"> <item row="3" column="5">
<widget class="QSpinBox" name="modeSpinBox"> <widget class="QLabel" name="chanName_8">
<property name="minimum"> <property name="text">
<number>1</number> <string>Aux 3</string>
</property>
<property name="maximum">
<number>8</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="7">
<widget class="QLabel" name="chanName"> <widget class="QCheckBox" name="invertCheckBox_6">
<property name="text"> <property name="text">
<string>Roll / Ailerons</string> <string>Invert</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="0" column="8">
<widget class="QCheckBox" name="invertCheckBox_2"> <widget class="QSpinBox" name="modeSpinBox">
<property name="text"> <property name="minimum">
<string>Invert</string> <number>1</number>
</property>
<property name="maximum">
<number>8</number>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -413,142 +519,85 @@ ...@@ -413,142 +519,85 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="7"> <item row="1" column="2">
<widget class="QCheckBox" name="invertCheckBox_6"> <widget class="QCheckBox" name="invertCheckBox_2">
<property name="text"> <property name="text">
<string>Invert</string> <string>Invert</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="0" column="0">
<widget class="QLabel" name="chanLabel_3"> <widget class="QLabel" name="chanName">
<property name="text"> <property name="text">
<string>0000</string> <string>Roll / Ailerons</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="7"> </layout>
<widget class="QCheckBox" name="invertCheckBox_8">
<property name="text">
<string>Invert</string>
</property>
</widget>
</item> </item>
<item row="1" column="4"> <item>
<spacer name="horizontalSpacer_2"> <layout class="QHBoxLayout" name="horizontalLayout_14">
<property name="orientation"> <item>
<enum>Qt::Horizontal</enum> <layout class="QGridLayout" name="gridLayout_3">
</property> <item row="0" column="0">
<property name="sizeHint" stdset="0"> <widget class="QLabel" name="rightStickLabel">
<property name="maximumSize">
<size> <size>
<width>40</width> <width>200</width>
<height>20</height> <height>200</height>
</size> </size>
</property> </property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QLabel" name="chanName_3">
<property name="text"> <property name="text">
<string>Yaw / Rudder</string> <string/>
</property> </property>
</widget> <property name="pixmap">
</item> <pixmap resource="../../qgroundcontrol.qrc">:/files/images/rc_stick.svg</pixmap>
<item row="0" column="6"> </property>
<widget class="QLabel" name="chanLabel_5"> <property name="scaledContents">
<property name="text"> <bool>true</bool>
<string>0000</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="1" column="0">
<spacer name="horizontalSpacer"> <widget class="QSlider" name="rollSlider">
<property name="orientation"> <property name="minimum">
<enum>Qt::Horizontal</enum> <number>0</number>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> <property name="maximum">
</item> <number>100</number>
<item row="0" column="7">
<widget class="QCheckBox" name="invertCheckBox_5">
<property name="text">
<string>Invert</string>
</property> </property>
</widget> <property name="value">
</item> <number>0</number>
<item row="0" column="2">
<widget class="QCheckBox" name="invertCheckBox">
<property name="text">
<string>Invert</string>
</property> </property>
</widget>
</item>
</layout>
</item>
<item row="5" column="13" colspan="2">
<spacer name="horizontalSpacer_12">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size>
<width>22</width>
<height>122</height>
</size>
</property>
</spacer>
</item> </item>
<item row="6" column="0" colspan="15"> <item row="0" column="1">
<spacer name="verticalSpacer"> <widget class="QSlider" name="pitchSlider">
<property name="orientation"> <property name="minimum">
<enum>Qt::Vertical</enum> <number>0</number>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>598</width>
<height>17</height>
</size>
</property> </property>
</spacer> <property name="maximum">
</item> <number>100</number>
<item row="8" column="3" rowspan="3">
<widget class="QLabel" name="rightStickLabel">
<property name="text">
<string/>
</property> </property>
<property name="pixmap"> <property name="value">
<pixmap resource="../../qgroundcontrol.qrc">:/files/images/rc_stick.svg</pixmap> <number>0</number>
</property> </property>
<property name="scaledContents"> <property name="orientation">
<bool>true</bool> <enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2" rowspan="3"> </layout>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item row="8" column="0" rowspan="3"> <item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="leftStickLabel"> <widget class="QLabel" name="leftStickLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
...@@ -556,6 +605,12 @@ ...@@ -556,6 +605,12 @@
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="sizeIncrement"> <property name="sizeIncrement">
<size> <size>
<width>10</width> <width>10</width>
...@@ -577,22 +632,12 @@ ...@@ -577,22 +632,12 @@
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> <property name="alignment">
</item> <set>Qt::AlignCenter</set>
<item row="8" column="14">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item row="11" column="0"> <item row="1" column="0">
<widget class="QSlider" name="yawSlider"> <widget class="QSlider" name="yawSlider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
...@@ -608,8 +653,8 @@ ...@@ -608,8 +653,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="3"> <item row="0" column="1">
<widget class="QSlider" name="rollSlider"> <widget class="QSlider" name="throttleSlider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>
...@@ -620,35 +665,18 @@ ...@@ -620,35 +665,18 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="11" column="6" colspan="8">
<widget class="QPushButton" name="rcCalibrationButton">
<property name="text">
<string>Start Calibration</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> </layout>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item> </item>
<item row="8" column="10" rowspan="3"> <item>
<widget class="QSlider" name="aux1Slider"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QSlider" name="modeSwitchSlider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>
...@@ -660,8 +688,8 @@ ...@@ -660,8 +688,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="11" rowspan="3"> <item>
<widget class="QSlider" name="aux2Slider"> <widget class="QSlider" name="aux1Slider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>
...@@ -673,8 +701,8 @@ ...@@ -673,8 +701,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="12" rowspan="3" colspan="2"> <item>
<widget class="QSlider" name="aux3Slider"> <widget class="QSlider" name="aux2Slider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>
...@@ -686,8 +714,8 @@ ...@@ -686,8 +714,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="9" rowspan="3"> <item>
<widget class="QSlider" name="modeSwitchSlider"> <widget class="QSlider" name="aux3Slider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>
...@@ -699,33 +727,54 @@ ...@@ -699,33 +727,54 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="5" rowspan="2" colspan="4"> </layout>
<spacer name="horizontalSpacer_5"> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<widget class="QPushButton" name="rcCalibrationButton">
<property name="text">
<string>Start Calibration</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="setTrimButton">
<property name="text">
<string>Set Trim</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>20</width>
<height>20</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="11" column="14"> </layout>
<widget class="QPushButton" name="setTrimButton"> </widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Set Trim</string> <string>Sensor Calibration</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</widget>
<widget class="QWidget" name="sensorTab">
<attribute name="title">
<string>Sensor Calibration</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<item> <item>
...@@ -751,8 +800,8 @@ p, li { white-space: pre-wrap; } ...@@ -751,8 +800,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>354</width> <width>314</width>
<height>448</height> <height>508</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
...@@ -769,11 +818,15 @@ p, li { white-space: pre-wrap; } ...@@ -769,11 +818,15 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="multirotorTab"> <widget class="QWidget" name="page_3">
<attribute name="title"> <layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>General Config</string> <string>General Config</string>
</attribute> </property>
<layout class="QVBoxLayout" name="verticalLayout_6"> </widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
...@@ -822,8 +875,8 @@ p, li { white-space: pre-wrap; } ...@@ -822,8 +875,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>354</width> <width>314</width>
<height>404</height> <height>434</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
...@@ -859,8 +912,8 @@ p, li { white-space: pre-wrap; } ...@@ -859,8 +912,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>354</width> <width>313</width>
<height>404</height> <height>434</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
...@@ -881,11 +934,15 @@ p, li { white-space: pre-wrap; } ...@@ -881,11 +934,15 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="fixedWingTab"> <widget class="QWidget" name="page_4">
<attribute name="title"> <layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Advanced Config</string> <string>Advanced Config</string>
</attribute> </property>
<layout class="QVBoxLayout" name="verticalLayout"> </widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
...@@ -934,8 +991,8 @@ p, li { white-space: pre-wrap; } ...@@ -934,8 +991,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>354</width> <width>161</width>
<height>404</height> <height>446</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
...@@ -971,8 +1028,8 @@ p, li { white-space: pre-wrap; } ...@@ -971,8 +1028,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>354</width> <width>160</width>
<height>404</height> <height>446</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
...@@ -995,6 +1052,39 @@ p, li { white-space: pre-wrap; } ...@@ -995,6 +1052,39 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string>No pending changes</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="storeButton">
<property name="text">
<string>Store to EEPROM</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
......
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