Skip to content

Q
qgroundcontrol
Commit 2b1967c0 authored by pixhawk's avatar pixhawk
Browse files
Options

Merge branch 'experimental' of pixhawk.ethz.ch:qgroundcontrol into experimental

parents e9883bfb cb6e40f0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/ui/HSIDisplay.cc
View file @ 2b1967c0
...@@ -678,7 +678,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter) ...@@ -678,7 +678,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter)
{ {
if (uas) if (uas)
{ {
const QVector<Waypoint*>& list = uas->getWaypointManager().getWaypointList(); const QVector<Waypoint*>& list = uas->getWaypointManager()->getWaypointList();
// for (int i = 0; i < list.size(); i++) // for (int i = 0; i < list.size(); i++)
// { // {
// QPointF in(list.at(i)->getX(), list.at(i)->getY()); // QPointF in(list.at(i)->getX(), list.at(i)->getY());
......
src/ui/uas/UASView.cc
View file @ 2b1967c0
...@@ -83,7 +83,7 @@ UASView::UASView(UASInterface* uas, QWidget *parent) : ...@@ -83,7 +83,7 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
connect(uas, SIGNAL(loadChanged(UASInterface*, double)), this, SLOT(updateLoad(UASInterface*, double))); connect(uas, SIGNAL(loadChanged(UASInterface*, double)), this, SLOT(updateLoad(UASInterface*, double)));
connect(uas, SIGNAL(heartbeatTimeout()), this, SLOT(heartbeatTimeout())); connect(uas, SIGNAL(heartbeatTimeout()), this, SLOT(heartbeatTimeout()));
connect(uas, SIGNAL(waypointSelected(int,int)), this, SLOT(selectWaypoint(int,int))); connect(uas, SIGNAL(waypointSelected(int,int)), this, SLOT(selectWaypoint(int,int)));
connect(&(uas->getWaypointManager()), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(currentWaypointUpdated(quint16))); connect(uas->getWaypointManager(), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(currentWaypointUpdated(quint16)));
connect(uas, SIGNAL(systemTypeSet(UASInterface*,uint)), this, SLOT(setSystemType(UASInterface*,uint))); connect(uas, SIGNAL(systemTypeSet(UASInterface*,uint)), this, SLOT(setSystemType(UASInterface*,uint)));
connect(UASManager::instance(), SIGNAL(activeUASStatusChanged(UASInterface*,bool)), this, SLOT(updateActiveUAS(UASInterface*,bool))); connect(UASManager::instance(), SIGNAL(activeUASStatusChanged(UASInterface*,bool)), this, SLOT(updateActiveUAS(UASInterface*,bool)));
......
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