Commit 4f51bf9a authored by James Goppert's avatar James Goppert

Added stop button for flightgear hil.

parent 09fc4c2d
...@@ -41,3 +41,8 @@ void QGCHilFlightGearConfiguration::on_startButton_clicked() ...@@ -41,3 +41,8 @@ void QGCHilFlightGearConfiguration::on_startButton_clicked()
options.append(" --aircraft=" + ui->aircraftComboBox->currentText()); options.append(" --aircraft=" + ui->aircraftComboBox->currentText());
mav->enableHilFlightGear(true, options); mav->enableHilFlightGear(true, options);
} }
void QGCHilFlightGearConfiguration::on_stopButton_clicked()
{
mav->stopHil();
}
...@@ -24,6 +24,7 @@ protected: ...@@ -24,6 +24,7 @@ protected:
private slots: private slots:
void on_startButton_clicked(); void on_startButton_clicked();
void on_stopButton_clicked();
private: private:
Ui::QGCHilFlightGearConfiguration *ui; Ui::QGCHilFlightGearConfiguration *ui;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>190</width> <width>237</width>
<height>246</height> <height>204</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -25,26 +25,13 @@ ...@@ -25,26 +25,13 @@
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowminimumheight="0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout" rowminimumheight="0,0,0,0,0,0,0,0">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="5" column="0">
<widget class="QPushButton" name="startButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="aircraftPlaintextInfoLabel"> <widget class="QLabel" name="aircraftPlaintextInfoLabel">
<property name="text"> <property name="text">
...@@ -52,7 +39,7 @@ ...@@ -52,7 +39,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" colspan="2">
<widget class="QComboBox" name="aircraftComboBox"> <widget class="QComboBox" name="aircraftComboBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -72,7 +59,7 @@ ...@@ -72,7 +59,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0" colspan="2">
<widget class="QPlainTextEdit" name="optionsPlainTextEdit"> <widget class="QPlainTextEdit" name="optionsPlainTextEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
...@@ -81,7 +68,27 @@ ...@@ -81,7 +68,27 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="plainText"> <property name="plainText">
<string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --notrim --prop:/engines/engine/running=true</string> <string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --prop:/engines/engine/running=true</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="startButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="stopButton">
<property name="text">
<string>Stop</string>
</property> </property>
</widget> </widget>
</item> </item>
......
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