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

Disable sliders by default, as default airframe is Aileron and on a clean

Browse Source 
board with no settings the mixer slider will be enabled.

Use setCurrentText rather than relying on an index
This commit is contained in:
Fredrik Larson 2014-08-28 05:58:14 +10:00
parent 63c4392932
commit 772ea8e051
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui
View File

@ -218,7 +218,7 @@ margin:1px;</string>
<item> <item>
<widget class="QSlider" name="elevonSlider1"> <widget class="QSlider" name="elevonSlider1">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -286,7 +286,7 @@ margin:1px;</string>
<item> <item>
<widget class="QSlider" name="elevonSlider2"> <widget class="QSlider" name="elevonSlider2">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -737,4 +737,3 @@ margin:1px;</string>
</connection> </connection>
</connections> </connections>
</ui> </ui>

8
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -137,9 +137,9 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
m_aircraft->fwAileron1Label->setText("Elevon 1"); m_aircraft->fwAileron1Label->setText("Elevon 1");
m_aircraft->fwAileron2Label->setText("Elevon 2"); m_aircraft->fwAileron2Label->setText("Elevon 2");
m_aircraft->fwElevator1ChannelBox->setEnabled(false); m_aircraft->fwElevator1ChannelBox->setEnabled(false);
m_aircraft->fwElevator1ChannelBox->setCurrentIndex(0); m_aircraft->fwElevator1ChannelBox->setCurrentText("None");
m_aircraft->fwElevator2ChannelBox->setEnabled(false); m_aircraft->fwElevator2ChannelBox->setEnabled(false);
m_aircraft->fwElevator2ChannelBox->setCurrentIndex(0); m_aircraft->fwElevator2ChannelBox->setCurrentText("None");
m_aircraft->fwRudder1ChannelBox->setEnabled(true); m_aircraft->fwRudder1ChannelBox->setEnabled(true);
m_aircraft->fwRudder2ChannelBox->setEnabled(true); m_aircraft->fwRudder2ChannelBox->setEnabled(true);
@ -154,9 +154,9 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
planeimg->setElementId("vtail"); planeimg->setElementId("vtail");
setComboCurrentIndex(m_aircraft->fixedWingType, m_aircraft->fixedWingType->findText("Vtail")); setComboCurrentIndex(m_aircraft->fixedWingType, m_aircraft->fixedWingType->findText("Vtail"));
m_aircraft->fwRudder1ChannelBox->setEnabled(false); m_aircraft->fwRudder1ChannelBox->setEnabled(false);
m_aircraft->fwRudder1ChannelBox->setCurrentIndex(0); m_aircraft->fwRudder1ChannelBox->setCurrentText("None");
m_aircraft->fwRudder2ChannelBox->setEnabled(false); m_aircraft->fwRudder2ChannelBox->setEnabled(false);
m_aircraft->fwRudder2ChannelBox->setCurrentIndex(0); m_aircraft->fwRudder2ChannelBox->setCurrentText("None");
m_aircraft->fwElevator1Label->setText("Vtail 1"); m_aircraft->fwElevator1Label->setText("Vtail 1");
m_aircraft->fwElevator1ChannelBox->setEnabled(true); m_aircraft->fwElevator1ChannelBox->setEnabled(true);