rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-984 Minor fixes before actual gui changes.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2014-01-06 22:25:38 +01:00
parent a2e0158bfb
commit 69e5f0c186
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27631,7 +27631,7 @@ border-radius: 5;</string>
<stringlist>
<string>objname:AltitudeHoldSettings</string>
<string>button:default</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28182,7 +28182,7 @@ border-radius: 5;</string>
<string>fieldname:Kp</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28207,7 +28207,7 @@ border-radius: 5;</string>
<string>fieldname:Ki</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28232,7 +28232,7 @@ border-radius: 5;</string>
<string>fieldname:Kd</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28844,7 +28844,7 @@ border-radius: 5;</string>
<string>fieldname:Kp</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28890,7 +28890,7 @@ border-radius: 5;</string>
<string>fieldname:Ki</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -28936,7 +28936,7 @@ border-radius: 5;</string>
<string>fieldname:Kd</string>
<string>scale:0.001</string>
<string>haslimits:yes</string>
<string>buttongroup:99</string>
<string>buttongroup:98</string>
</stringlist>
</property>
</widget>
@ -29960,7 +29960,7 @@ border-radius: 5;</string>
<item row="2" column="2">
<widget class="QSlider" name="AltThrRateSlider_2">
<property name="maximum">
<number>10</number>
<number>5</number>
</property>
<property name="singleStep">
<number>1</number>
@ -29969,7 +29969,7 @@ border-radius: 5;</string>
<number>1</number>
</property>
<property name="value">
<number>5</number>
<number>3</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -29985,7 +29985,7 @@ border-radius: 5;</string>
<string>objname:AltitudeHoldSettings</string>
<string>fieldname:ThrottleRate</string>
<string>haslimits:no</string>
<string>scale:0.5</string>
<string>scale:1</string>
<string>buttongroup:99</string>
</stringlist>
</property>
@ -30139,16 +30139,16 @@ border-radius: 5;</string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="decimals">
<number>1</number>
<number>0</number>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
<double>1.000000000000000</double>
</property>
<property name="value">
<double>2.500000000000000</double>
<double>3.000000000000000</double>
</property>
<property name="objrelation" stdset="0">
<stringlist>

4
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -390,13 +390,13 @@ void ConfigTaskWidget::widgetsContentsChanged()
if (binding->widget() == emitter) {
scale = binding->scale();
checkWidgetsLimits(emitter, binding->field(), binding->index(), binding->isLimited(),
getVariantFromWidget(emitter, binding->scale(), binding->units()), binding->scale());
getVariantFromWidget(emitter, scale, binding->units()), scale);
} else {
foreach(ShadowWidgetBinding * shadow, binding->shadows()) {
if (shadow->widget() == emitter) {
scale = shadow->scale();
checkWidgetsLimits(emitter, binding->field(), binding->index(), shadow->isLimited(),
getVariantFromWidget(emitter, shadow->scale(), binding->units()), scale);
getVariantFromWidget(emitter, scale, binding->units()), scale);
}
}
}