rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-56 - UI support

Browse Source
This commit is contained in:
Alessio Morale 2015-07-25 12:02:58 +02:00
parent 7973ab9d0a
commit 383a4731c7
2 changed files with 112 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
View File

@ -3,6 +3,7 @@
*
* @file configtxpidswidget.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* @addtogroup GCSPlugins GCS Plugins
* @{
* @addtogroup ConfigPlugin Config Plugin
@ -162,7 +163,8 @@ static bool isExpoOption(int pidOption)
static bool isAcroPlusFactorOption(int pidOption)
{
return pidOption == TxPIDSettings::PIDS_ACROPLUSFACTOR;
return pidOption == TxPIDSettings::PIDS_ACROPLUSFACTORPITCH
|| pidOption == TxPIDSettings::PIDS_ACROPLUSFACTORROLL;
}
template <class StabilizationSettingsBankX>

115
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -241,7 +241,7 @@ margin-top: -1px;
<number>0</number>
</property>
<item row="1" column="1">
<widget class="QSlider" name="AttitudeResponsivenessSlider_2">
<widget class="QSlider" name="AcroFactorRollSlider">
<property name="minimumSize">
<size>
<width>0</width>
@ -278,12 +278,13 @@ margin-top: -1px;
<string>fieldname:AcroInsanityFactor</string>
<string>scale:0.01</string>
<string>buttongroup:77</string>
<string>element:Roll</string>
</stringlist>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="spinBox_3">
<widget class="QSpinBox" name="AcroFactorRollSpinBox">
<property name="minimumSize">
<size>
<width>60</width>
@ -311,12 +312,13 @@ margin-top: -1px;
<string>fieldname:AcroInsanityFactor</string>
<string>scale:0.01</string>
<string>buttongroup:77</string>
<string>element:Roll</string>
</stringlist>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<widget class="QLabel" name="AcroFactorRollLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -330,7 +332,106 @@ margin-top: -1px;
</size>
</property>
<property name="text">
<string>Factor</string>
<string>Roll Factor</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="AcroFactorPitchSlider">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Acro + slider can be adjusted to change the amount of manual control blending.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>5</number>
</property>
<property name="objrelation" stdset="0">
<stringlist>
<string>objname:StabilizationSettingsBankX</string>
<string>fieldname:AcroInsanityFactor</string>
<string>scale:0.01</string>
<string>buttongroup:77</string>
<string>element:Pitch</string>
</stringlist>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="AcroFactorPitchSpinBox">
<property name="minimumSize">
<size>
<width>60</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>22</height>
</size>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>50</number>
</property>
<property name="objrelation" stdset="0">
<stringlist>
<string>objname:StabilizationSettingsBankX</string>
<string>fieldname:AcroInsanityFactor</string>
<string>scale:0.01</string>
<string>buttongroup:77</string>
<string>element:Pitch</string>
</stringlist>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="AcroFactorPitchLabel_13">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Pitch Factor</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -27298,8 +27399,10 @@ Useful if you have accidentally changed some settings.</string>
<tabstop>RateYawResponsivenessSlider</tabstop>
<tabstop>spinBox_5</tabstop>
<tabstop>pushButton_21</tabstop>
<tabstop>AttitudeResponsivenessSlider_2</tabstop>
<tabstop>spinBox_3</tabstop>
<tabstop>AcroFactorRollSlider</tabstop>
<tabstop>AcroFactorRollSpinBox</tabstop>
<tabstop>AcroFactorPitchSlider</tabstop>
<tabstop>AcroFactorPitchSpinBox</tabstop>
<tabstop>pushButton_12</tabstop>
<tabstop>RateYawResponsivenessSlider_2</tabstop>
<tabstop>expoSpinnerRoll</tabstop>