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

Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues

Browse Source 
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
This commit is contained in:
Mike LaBranche 2012-06-06 08:58:18 -07:00
parent 682ab20f94
commit 01820904a2
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ QGroupBox::title {
}</string>
</property>
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="fixedWing">
<property name="enabled">
@ -3048,5 +3048,21 @@ p, li { white-space: pre-wrap; }
</hint>
</hints>
</connection>
<connection>
<sender>mrPitchMixLevel</sender>
<signal>valueChanged(int)</signal>
<receiver>mrPitchMixValue</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>92</x>
<y>222</y>
</hint>
<hint type="destinationlabel">
<x>92</x>
<y>151</y>
</hint>
</hints>
</connection>
</connections>
</ui>

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

@ -242,8 +242,10 @@ void ConfigOutputWidget::sendChannelTest(int index, int value)
/**
Request the current config from the board (RC Output)
*/
void ConfigOutputWidget::refreshWidgetsValues()
void ConfigOutputWidget::refreshWidgetsValues(UAVObject * obj)
{
Q_UNUSED(obj);
bool dirty=isDirty();
// Get Actuator Settings

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

@ -69,7 +69,7 @@ private:
private slots:
void stopTests();
void disableIfNotMe(UAVObject *obj);
virtual void refreshWidgetsValues();
virtual void refreshWidgetsValues(UAVObject * obj=NULL);
void updateObjectsFromWidgets();
void runChannelTests(bool state);
void sendChannelTest(int index, int value);

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

@ -230,7 +230,6 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
// Connect the help pushbutton
connect(m_aircraft->airframeHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
enableControls(false);
refreshWidgetsValues();
addToDirtyMonitor();
@ -609,8 +608,10 @@ void ConfigVehicleTypeWidget::updateCustomThrottle2CurveValue(QList<double> list
/**
Refreshes the current value of the SystemSettings which holds the aircraft type
*/
void ConfigVehicleTypeWidget::refreshWidgetsValues()
void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject * o)
{
Q_UNUSED(o);
if(!allObjectsUpdated())
return;
@ -971,6 +972,9 @@ void ConfigVehicleTypeWidget::addToDirtyMonitor()
addWidget(m_aircraft->multiMotorChannelBox6);
addWidget(m_aircraft->multiMotorChannelBox7);
addWidget(m_aircraft->multiMotorChannelBox8);
addWidget(m_aircraft->mrPitchMixLevel);
addWidget(m_aircraft->mrRollMixLevel);
addWidget(m_aircraft->mrYawMixLevel);
addWidget(m_aircraft->triYawChannelBox);
addWidget(m_aircraft->aircraftType);
addWidget(m_aircraft->fwEngineChannelBox);

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

@ -81,7 +81,7 @@ private:
private slots:
virtual void refreshWidgetsValues();
virtual void refreshWidgetsValues(UAVObject * o=NULL);
virtual void updateObjectsFromWidgets();
void setComboCurrentIndex(QComboBox* box, int index);