rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-178 Remove QString()

Browse Source
This commit is contained in:
Laurent Lalanne 2015-11-29 20:18:27 +01:00
parent 6a11bbb6fd
commit ba86b78031
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -382,7 +382,6 @@ void ConfigFixedWingWidget::refreshWidgetsValues(QString frameType)
setComboCurrentIndex(m_aircraft->rcOutputChannelBoxFw3_2, fixed.Accessory2_2); setComboCurrentIndex(m_aircraft->rcOutputChannelBoxFw3_2, fixed.Accessory2_2);
setComboCurrentIndex(m_aircraft->rcOutputChannelBoxFw4_2, fixed.Accessory3_2); setComboCurrentIndex(m_aircraft->rcOutputChannelBoxFw4_2, fixed.Accessory3_2);
updateRcCurvesUsed(); updateRcCurvesUsed();
// Get mixing values for GUI sliders (values stored onboard) // Get mixing values for GUI sliders (values stored onboard)
@ -701,7 +700,7 @@ void ConfigFixedWingWidget::setupRcOutputs(QList<QString> rcOutputList)
GUIConfigDataUnion configData = getConfigData(); GUIConfigDataUnion configData = getConfigData();
resetRcOutputs(&configData); resetRcOutputs(&configData);
UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject(QString("MixerSettings"))); UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject("MixerSettings"));
Q_ASSERT(mixer); Q_ASSERT(mixer);
int curveAccessory0 = m_aircraft->rcOutputCurveBoxFw1->currentIndex(); int curveAccessory0 = m_aircraft->rcOutputCurveBoxFw1->currentIndex();
@ -713,7 +712,7 @@ void ConfigFixedWingWidget::setupRcOutputs(QList<QString> rcOutputList)
int index = rcList.takeFirst()->currentIndex(); int index = rcList.takeFirst()->currentIndex();
int index2 = rcList2.takeFirst()->currentIndex(); int index2 = rcList2.takeFirst()->currentIndex();
if (rc_output == QString("Accessory0")) { if (rc_output == "Accessory0") {
// First output for Accessory0 // First output for Accessory0
configData.fixedwing.Accessory0 = index; configData.fixedwing.Accessory0 = index;
if (index) { if (index) {
@ -734,7 +733,7 @@ void ConfigFixedWingWidget::setupRcOutputs(QList<QString> rcOutputList)
setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127); setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127);
} }
} }
} else if (rc_output == QString("Accessory1")) { } else if (rc_output == "Accessory1") {
configData.fixedwing.Accessory1 = index; configData.fixedwing.Accessory1 = index;
configData.fixedwing.Accessory1_2 = index2; configData.fixedwing.Accessory1_2 = index2;
if (index) { if (index) {
@ -753,7 +752,7 @@ void ConfigFixedWingWidget::setupRcOutputs(QList<QString> rcOutputList)
setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127); setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127);
} }
} }
} else if (rc_output == QString("Accessory2")) { } else if (rc_output == "Accessory2") {
configData.fixedwing.Accessory2 = index; configData.fixedwing.Accessory2 = index;
configData.fixedwing.Accessory2_2 = index2; configData.fixedwing.Accessory2_2 = index2;
if (index) { if (index) {
@ -772,7 +771,7 @@ void ConfigFixedWingWidget::setupRcOutputs(QList<QString> rcOutputList)
setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127); setMixerVectorValue(mixer, index2 - 1, VehicleConfig::MIXERVECTOR_THROTTLECURVE1, 127);
} }
} }
} else if (rc_output == QString("Accessory3")) { } else if (rc_output == "Accessory3") {
configData.fixedwing.Accessory3 = index; configData.fixedwing.Accessory3 = index;
configData.fixedwing.Accessory3_2 = index2; configData.fixedwing.Accessory3_2 = index2;
if (index) { if (index) {