Merge pull request #2173 from mavlink/flightgear_simplified

Remove Flightgear and JSBSim and only leave options which work

src/ui/QGCHilConfiguration.cc

@@ -114,17 +114,19 @@ void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index)
             connect(xplane, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
         }
     }
-    else if (4)
-    {
-        // Ensure the sim exists and is disabled
-        _vehicle->uas()->enableHilJSBSim(false, "");
-        QGCHilJSBSimConfiguration* hfgconf = new QGCHilJSBSimConfiguration(_vehicle, this);
-        hfgconf->show();
-        ui->simulatorConfigurationLayout->addWidget(hfgconf);
-        QGCJSBSimLink* jsb = dynamic_cast<QGCJSBSimLink*>(_vehicle->uas()->getHILSimulation());
-        if (jsb)
-        {
-            connect(jsb, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
-        }
-    }
+// Disabling JSB Sim since its not well maintained,
+// but as refactoring is pending we're not ditching the code yet
+//    else if (4)
+//    {
+//        // Ensure the sim exists and is disabled
+//        _vehicle->uas()->enableHilJSBSim(false, "");
+//        QGCHilJSBSimConfiguration* hfgconf = new QGCHilJSBSimConfiguration(_vehicle, this);
+//        hfgconf->show();
+//        ui->simulatorConfigurationLayout->addWidget(hfgconf);
+//        QGCJSBSimLink* jsb = dynamic_cast<QGCJSBSimLink*>(_vehicle->uas()->getHILSimulation());
+//        if (jsb)
+//        {
+//            connect(jsb, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
+//        }
+//    }
 }

src/ui/QGCHilConfiguration.ui

@@ -52,11 +52,6 @@
        <string>X-Plane 9</string>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string>JSBSim</string>
-      </property>
-     </item>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
@@ -69,7 +64,7 @@
    <item row="2" column="0" colspan="2">
     <widget class="QLabel" name="statusLabel">
      <property name="text">
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>

src/ui/QGCHilFlightGearConfiguration.cc

@@ -29,18 +29,18 @@ QGCHilFlightGearConfiguration::QGCHilFlightGearConfiguration(Vehicle* vehicle, Q
     QStringList items;
     if (_vehicle->vehicleType() == MAV_TYPE_FIXED_WING)
     {
-        items << "EasyStar";
+        /*items << "EasyStar";*/
         items << "Rascal110-JSBSim";
-        items << "c172p";
+        /*items << "c172p";
         items << "YardStik";
-        items << "Malolo1";
+        items << "Malolo1";*/
         _mavSettingsSubGroup = _mavSettingsSubGroupFixedWing;
     }
-    else if (_vehicle->vehicleType() == MAV_TYPE_QUADROTOR)
+    /*else if (_vehicle->vehicleType() == MAV_TYPE_QUADROTOR)
     {
         items << "arducopter";
         _mavSettingsSubGroup = _mavSettingsSubGroupQuadRotor;
-    }
+    }*/
     else
     {
         // FIXME: Should disable all input, won't work. Show error message in the status label thing.