Skip to content

Q
qgroundcontrol
Commit 39edb2ef authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge pull request #2173 from mavlink/flightgear_simplified 

Remove Flightgear and JSBSim and only leave options which work
parents 2cd9ce2d 351e33cf
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
src/ui/QGCHilConfiguration.cc
View file @ 39edb2ef
...@@ -114,17 +114,19 @@ void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index) ...@@ -114,17 +114,19 @@ void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index)
connect(xplane, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString))); connect(xplane, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
} }
} }
else if (4) // Disabling JSB Sim since its not well maintained,
{ // but as refactoring is pending we're not ditching the code yet
// Ensure the sim exists and is disabled // else if (4)
_vehicle->uas()->enableHilJSBSim(false, ""); // {
QGCHilJSBSimConfiguration* hfgconf = new QGCHilJSBSimConfiguration(_vehicle, this); // // Ensure the sim exists and is disabled
hfgconf->show(); // _vehicle->uas()->enableHilJSBSim(false, "");
ui->simulatorConfigurationLayout->addWidget(hfgconf); // QGCHilJSBSimConfiguration* hfgconf = new QGCHilJSBSimConfiguration(_vehicle, this);
QGCJSBSimLink* jsb = dynamic_cast<QGCJSBSimLink*>(_vehicle->uas()->getHILSimulation()); // hfgconf->show();
if (jsb) // ui->simulatorConfigurationLayout->addWidget(hfgconf);
{ // QGCJSBSimLink* jsb = dynamic_cast<QGCJSBSimLink*>(_vehicle->uas()->getHILSimulation());
connect(jsb, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString))); // if (jsb)
} // {
} // connect(jsb, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
// }
// }
} }
src/ui/QGCHilConfiguration.ui
View file @ 39edb2ef
...@@ -52,11 +52,6 @@ ...@@ -52,11 +52,6 @@
<string>X-Plane 9</string> <string>X-Plane 9</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>JSBSim</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
...@@ -69,7 +64,7 @@ ...@@ -69,7 +64,7 @@
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="statusLabel"> <widget class="QLabel" name="statusLabel">
<property name="text"> <property name="text">
<string></string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
......
src/ui/QGCHilFlightGearConfiguration.cc
View file @ 39edb2ef
...@@ -29,18 +29,18 @@ QGCHilFlightGearConfiguration::QGCHilFlightGearConfiguration(Vehicle* vehicle, Q ...@@ -29,18 +29,18 @@ QGCHilFlightGearConfiguration::QGCHilFlightGearConfiguration(Vehicle* vehicle, Q
QStringList items; QStringList items;
if (_vehicle->vehicleType() == MAV_TYPE_FIXED_WING) if (_vehicle->vehicleType() == MAV_TYPE_FIXED_WING)
{ {
items << "EasyStar"; /*items << "EasyStar";*/
items << "Rascal110-JSBSim"; items << "Rascal110-JSBSim";
items << "c172p"; /*items << "c172p";
items << "YardStik"; items << "YardStik";
items << "Malolo1"; items << "Malolo1";*/
_mavSettingsSubGroup = _mavSettingsSubGroupFixedWing; _mavSettingsSubGroup = _mavSettingsSubGroupFixedWing;
} }
else if (_vehicle->vehicleType() == MAV_TYPE_QUADROTOR) /*else if (_vehicle->vehicleType() == MAV_TYPE_QUADROTOR)
{ {
items << "arducopter"; items << "arducopter";
_mavSettingsSubGroup = _mavSettingsSubGroupQuadRotor; _mavSettingsSubGroup = _mavSettingsSubGroupQuadRotor;
} }*/
else else
{ {
// FIXME: Should disable all input, won't work. Show error message in the status label thing. // FIXME: Should disable all input, won't work. Show error message in the status label thing.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment