From c616ebf9719e6c27d53a96e42adfc26157f23b64 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Tue, 22 Nov 2011 14:37:34 +0100 Subject: [PATCH] updated the looks of Onboard Waypoints window, when no UAV is present. Updated mission Save and Load to use version 120 --- src/uas/UASWaypointManager.cc | 4 ++-- src/ui/UnconnectedUASInfoWidget.cc | 2 +- src/ui/UnconnectedUASInfoWidget.ui | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc index a38b882ef8..e37bd25df5 100644 --- a/src/uas/UASWaypointManager.cc +++ b/src/uas/UASWaypointManager.cc @@ -451,7 +451,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile) QTextStream out(&file); //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++) { @@ -477,7 +477,7 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile) 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.")); } diff --git a/src/ui/UnconnectedUASInfoWidget.cc b/src/ui/UnconnectedUASInfoWidget.cc index 1781b63ee9..84b8e5ae1a 100644 --- a/src/ui/UnconnectedUASInfoWidget.cc +++ b/src/ui/UnconnectedUASInfoWidget.cc @@ -5,7 +5,7 @@ UnconnectedUASInfoWidget::UnconnectedUASInfoWidget(QWidget *parent) : QGroupBox(parent), ui(new Ui::UnconnectedUASInfoWidget) { - ui->setupUi(this); + ui->setupUi(this); } UnconnectedUASInfoWidget::~UnconnectedUASInfoWidget() diff --git a/src/ui/UnconnectedUASInfoWidget.ui b/src/ui/UnconnectedUASInfoWidget.ui index 880f715360..b87164620b 100644 --- a/src/ui/UnconnectedUASInfoWidget.ui +++ b/src/ui/UnconnectedUASInfoWidget.ui @@ -13,6 +13,9 @@ + + border:0; + @@ -45,7 +48,7 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt; font-weight:600; color:#b5b5b5;">NO UAS</span></p></td></tr></table></body></html> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt; font-weight:600; color:#b5b5b5;">NO UAV</span></p></td></tr></table></body></html> -- GitLab