Skip to content
Snippets Groups Projects
Commit c616ebf9 authored by pixhawk's avatar pixhawk
Browse files

updated the looks of Onboard Waypoints window, when no UAV is present. Updated...

updated the looks of Onboard Waypoints window, when no UAV is present. Updated mission Save and Load to use version 120
parent 3d5d9f06
No related branches found
No related tags found
No related merge requests found
...@@ -451,7 +451,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile) ...@@ -451,7 +451,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile)
QTextStream out(&file); QTextStream out(&file);
//write the waypoint list version to the first line for compatibility check //write the waypoint list version to the first line for compatibility check
out << "QGC WPL 110\r\n"; out << "QGC WPL 120\r\n";
for (int i = 0; i < waypointsEditable.size(); i++) for (int i = 0; i < waypointsEditable.size(); i++)
{ {
...@@ -477,7 +477,7 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile) ...@@ -477,7 +477,7 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile)
const QStringList &version = in.readLine().split(" "); const QStringList &version = in.readLine().split(" ");
if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "110")) if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "120"))
{ {
emit updateStatusString(tr("The waypoint file is not compatible with the current version of QGroundControl.")); emit updateStatusString(tr("The waypoint file is not compatible with the current version of QGroundControl."));
} }
......
...@@ -5,7 +5,7 @@ UnconnectedUASInfoWidget::UnconnectedUASInfoWidget(QWidget *parent) : ...@@ -5,7 +5,7 @@ UnconnectedUASInfoWidget::UnconnectedUASInfoWidget(QWidget *parent) :
QGroupBox(parent), QGroupBox(parent),
ui(new Ui::UnconnectedUASInfoWidget) ui(new Ui::UnconnectedUASInfoWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
} }
UnconnectedUASInfoWidget::~UnconnectedUASInfoWidget() UnconnectedUASInfoWidget::~UnconnectedUASInfoWidget()
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<property name="styleSheet">
<string notr="true">border:0;</string>
</property>
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
...@@ -45,7 +48,7 @@ p, li { white-space: pre-wrap; } ...@@ -45,7 +48,7 @@ p, li { white-space: pre-wrap; }
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt; &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt; &lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt; &lt;td style=&quot;border: none;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#b5b5b5;&quot;&gt;NO UAS&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#b5b5b5;&quot;&gt;NO UAV&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment