Commit 91892eb3 authored by lm's avatar lm

Minor edits

parent ddefe971
...@@ -15,10 +15,12 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) : ...@@ -15,10 +15,12 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
void QGCWaypointListMulti::systemDeleted(QObject* uas) void QGCWaypointListMulti::systemDeleted(QObject* uas)
{ {
UASInterface* mav = dynamic_cast<UASInterface*>(uas); UASInterface* mav = dynamic_cast<UASInterface*>(uas);
if (mav) { if (mav)
{
int id = mav->getUASID(); int id = mav->getUASID();
WaypointList* list = lists.value(id, NULL); WaypointList* list = lists.value(id, NULL);
if (list) { if (list)
{
delete list; delete list;
lists.remove(id); lists.remove(id);
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="editTab"> <widget class="QWidget" name="editTab">
<attribute name="title"> <attribute name="title">
......
...@@ -145,11 +145,11 @@ void WaypointViewOnlyView::updateValues() ...@@ -145,11 +145,11 @@ void WaypointViewOnlyView::updateValues()
{ {
if (wp->getParam1()>0) if (wp->getParam1()>0)
{ {
m_ui->displayBar->setText(QString("Go to (%1, %2, %3) and wait there for %4 sec; yaw: %5; rad: %6").arg(wp->getX()).arg(wp->getY()).arg(wp->getZ()).arg(wp->getParam1()).arg(wp->getParam4()).arg(wp->getParam2())); m_ui->displayBar->setText(QString("Go to <b>(%1, %2, %3)</b> and wait there for %4 sec; yaw: %5; rad: %6").arg(wp->getX()).arg(wp->getY()).arg(wp->getZ()).arg(wp->getParam1()).arg(wp->getParam4()).arg(wp->getParam2()));
} }
else else
{ {
m_ui->displayBar->setText(QString("Go to (%1, %2, %3); yaw: %4; rad: %5").arg(wp->getX()).arg(wp->getY()).arg(wp->getZ()).arg(wp->getParam4()).arg(wp->getParam2())); m_ui->displayBar->setText(QString("Go to <b>(%1, %2, %3)</b>; yaw: %4; rad: %5").arg(wp->getX()).arg(wp->getY()).arg(wp->getZ()).arg(wp->getParam4()).arg(wp->getParam2()));
} }
break; break;
} }
......
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