rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

Fixed bug in configvehicletypewidget.cpp that prevented Octo Coax X from being selected.

Browse Source 
Fixed labelnames in airframes.ui that were causing compile warnings.
This commit is contained in:
Kenn Sebesta 2012-05-06 12:22:43 -04:00
parent cdd9c32bff
commit 40e215ae27
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ground/openpilotgcs/src/plugins/config/airframe.ui
View File

@ -1389,13 +1389,13 @@ margin:1px;</string>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="0"> <layout class="QVBoxLayout" name="verticalLayout_31" stretch="0">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_61">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_31">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_51">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1417,7 +1417,7 @@ margin:1px;</string>
<widget class="QComboBox" name="groundVehicleType"/> <widget class="QComboBox" name="groundVehicleType"/>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_31">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -1432,7 +1432,7 @@ margin:1px;</string>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_23"> <layout class="QHBoxLayout" name="horizontalLayout_33">
<item> <item>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="font"> <property name="font">
@ -1462,9 +1462,9 @@ margin:1px;</string>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_41">
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_7">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1480,7 +1480,7 @@ margin:1px;</string>
<property name="title"> <property name="title">
<string>Output channel asignmets</string> <string>Output channel asignmets</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_3"> <layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="gvEngineLabel"> <widget class="QLabel" name="gvEngineLabel">
<property name="minimumSize"> <property name="minimumSize">
@ -1644,11 +1644,11 @@ margin:1px;</string>
<property name="title"> <property name="title">
<string>Differential Steering Mix</string> <string>Differential Steering Mix</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_33">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_30">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_14"> <layout class="QVBoxLayout" name="verticalLayout_34">
<item> <item>
<widget class="QLabel" name="differentialSteeringLabel1"> <widget class="QLabel" name="differentialSteeringLabel1">
<property name="minimumSize"> <property name="minimumSize">
@ -1685,7 +1685,7 @@ margin:1px;</string>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_15"> <layout class="QVBoxLayout" name="verticalLayout_35">
<item> <item>
<widget class="QLabel" name="differentialSteeringLabel2"> <widget class="QLabel" name="differentialSteeringLabel2">
<property name="minimumSize"> <property name="minimumSize">
@ -1727,7 +1727,7 @@ margin:1px;</string>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_4"> <spacer name="horizontalSpacer_24">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -1750,7 +1750,7 @@ margin:1px;</string>
<property name="title"> <property name="title">
<string>Front throttle curve</string> <string>Front throttle curve</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_16"> <layout class="QVBoxLayout" name="verticalLayout_36">
<item> <item>
<widget class="MixerCurveWidget" name="groundVehicleThrottle1" native="true"> <widget class="MixerCurveWidget" name="groundVehicleThrottle1" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1807,7 +1807,7 @@ margin:1px;</string>
<property name="title"> <property name="title">
<string>Rear throttle curve</string> <string>Rear throttle curve</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_17"> <layout class="QVBoxLayout" name="verticalLayout_37">
<item> <item>
<widget class="MixerCurveWidget" name="groundVehicleThrottle2" native="true"> <widget class="MixerCurveWidget" name="groundVehicleThrottle2" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1850,7 +1850,7 @@ margin:1px;</string>
</layout> </layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer_1">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -1863,9 +1863,9 @@ margin:1px;</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_13"> <layout class="QHBoxLayout" name="horizontalLayout_28">
<item> <item>
<spacer name="horizontalSpacer_11"> <spacer name="horizontalSpacer_21">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>

5
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
View File

@ -119,7 +119,7 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
QStringList airframeTypes; QStringList airframeTypes;
airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter" << "Ground" << "Custom"; airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter" << "Ground" << "Custom";
m_aircraft->aircraftType->addItems(airframeTypes); m_aircraft->aircraftType->addItems(airframeTypes);
m_aircraft->aircraftType->setCurrentIndex(1); m_aircraft->aircraftType->setCurrentIndex(0); //Set default vehicle to Fixed Wing
QStringList fixedWingTypes; QStringList fixedWingTypes;
fixedWingTypes << "Elevator aileron rudder" << "Elevon" << "Vtail"; fixedWingTypes << "Elevator aileron rudder" << "Elevon" << "Vtail";
@ -655,7 +655,8 @@ void ConfigVehicleTypeWidget::setupAirframeUI(QString frameType)
frameType == "HexaCoax" || frameType == "Hexacopter Y6" || frameType == "HexaCoax" || frameType == "Hexacopter Y6" ||
frameType == "Octo" || frameType == "Octocopter" || frameType == "Octo" || frameType == "Octocopter" ||
frameType == "OctoV" || frameType == "Octocopter V" || frameType == "OctoV" || frameType == "Octocopter V" ||
frameType == "OctoCoaxP" || frameType == "Octo Coax +" ) { frameType == "OctoCoaxP" || frameType == "Octo Coax +" ||
frameType == "OctoCoaxX" || frameType == "Octo Coax X" ) {
//Call multi-rotor setup UI //Call multi-rotor setup UI
setupMultiRotorUI(frameType); setupMultiRotorUI(frameType);