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

OP-1668 Fixed widget updates.

Browse Source
This commit is contained in:
m_thread 2015-01-27 15:05:59 +01:00
parent 4f7344121e
commit 73954dadea
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/openpilotgcs/src/plugins/config/airframe_custom.ui
View File

@ -82,9 +82,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The source of Curve 1 will always be Throttle</string>
</property>
<item>
<property name="text">
<string>Thrust</string>
<string>Throttle</string>
</property>
</item>
</widget>
@ -173,11 +176,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Thrust</string>
</property>
</item>
</widget>
</item>
</layout>

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

@ -191,9 +191,9 @@ void ConfigVehicleTypeWidget::switchAirframeType(int index)
Note: The default behavior of ConfigTaskWidget is bypassed.
Therefore no automatic synchronization of UAV Objects to UI is done.
*/
void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *o)
void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *object)
{
Q_UNUSED(o);
ConfigTaskWidget::refreshWidgetsValues(object);
if (!allObjectsUpdated()) {
return;
@ -248,7 +248,6 @@ void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *o)
m_aircraft->nameEdit->setText(name);
updateFeedForwardUI();
setDirty(dirty);
}
@ -306,6 +305,7 @@ void ConfigVehicleTypeWidget::updateObjectsFromWidgets()
// call refreshWidgetsValues() to reflect actual saved values
refreshWidgetsValues();
ConfigTaskWidget::updateObjectsFromWidgets();
updateFeedForwardUI();
}

2
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
View File

@ -69,7 +69,7 @@ public:
~ConfigVehicleTypeWidget();
protected slots:
virtual void refreshWidgetsValues(UAVObject *o = NULL);
virtual void refreshWidgetsValues(UAVObject *object = NULL);
virtual void updateObjectsFromWidgets();
private: