Skip to content

Commit 3f4d7f0

Browse files
karalb1f5soh
authored andcommitted
Merged in karalb/librepilot/LP-606_Ground_vehicle_fix (pull request #525)
LP-606 Add missing setComboCurrentIndex Approved-by: Lalanne Laurent <f5soh@free.fr> Approved-by: Alessio Morale <alessiomorale@gmail.com>
2 parents e846b30 + 1c5a878 commit 3f4d7f0

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ void ConfigGroundVehicleWidget::setupUI(QString frameType)
150150
initMixerCurves(frameType);
151151

152152
if (frameType == "GroundVehicleBoat" || frameType == "Boat (Turnable)") {
153+
setComboCurrentIndex(m_aircraft->groundVehicleType, m_aircraft->groundVehicleType->findText("Boat (Turnable)"));
153154
// Boat
154155
m_vehicleImg->setElementId("boat");
155156

@@ -185,11 +186,13 @@ void ConfigGroundVehicleWidget::setupUI(QString frameType)
185186
bool isBoat = frameType.contains("Boat");
186187

187188
if (isBoat) {
189+
setComboCurrentIndex(m_aircraft->groundVehicleType, m_aircraft->groundVehicleType->findText("Boat (Differential)"));
188190
// Boat differential
189191
m_vehicleImg->setElementId("boat_diff");
190192
m_aircraft->gvSteering1Label->setText("First rudder");
191193
m_aircraft->gvSteering2Label->setText("Second rudder");
192194
} else {
195+
setComboCurrentIndex(m_aircraft->groundVehicleType, m_aircraft->groundVehicleType->findText("Tank (Differential)"));
193196
// Tank
194197
m_vehicleImg->setElementId("tank");
195198
m_aircraft->gvSteering1Label->setText("Front steering");
@@ -227,6 +230,7 @@ void ConfigGroundVehicleWidget::setupUI(QString frameType)
227230
m_aircraft->groundVehicleThrottle2->initLinearCurve(5, 0.8, 0.0);
228231
}
229232
} else if (frameType == "GroundVehicleMotorcycle" || frameType == "Motorcycle") {
233+
setComboCurrentIndex(m_aircraft->groundVehicleType, m_aircraft->groundVehicleType->findText("Motorcycle"));
230234
// Motorcycle
231235
m_vehicleImg->setElementId("motorbike");
232236

@@ -257,7 +261,8 @@ void ConfigGroundVehicleWidget::setupUI(QString frameType)
257261
m_aircraft->groundVehicleThrottle2->initLinearCurve(5, 1.0, 0.0);
258262
m_aircraft->groundVehicleThrottle1->initLinearCurve(5, 1.0, 0.0);
259263
}
260-
} else {
264+
} else if (frameType == "GroundVehicleCar" || frameType == "Car (Turnable)") {
265+
setComboCurrentIndex(m_aircraft->groundVehicleType, m_aircraft->groundVehicleType->findText("Car (Turnable)"));
261266
// Car
262267
m_vehicleImg->setElementId("car");
263268

0 commit comments

Comments
 (0)