Unverified Commit 2a6b2b9e authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5891 from patrickelectric/remove_alt

VisualMissionItem: Remove terrain altitude information for sub and boat
parents d1580378 0d989e60
...@@ -38,11 +38,15 @@ VisualMissionItem::VisualMissionItem(Vehicle* vehicle, QObject* parent) ...@@ -38,11 +38,15 @@ VisualMissionItem::VisualMissionItem(Vehicle* vehicle, QObject* parent)
, _lastLatTerrainQuery (0) , _lastLatTerrainQuery (0)
, _lastLonTerrainQuery (0) , _lastLonTerrainQuery (0)
{ {
// Don't get terrain altitude information for submarines or boards
if (_vehicle->vehicleType() != MAV_TYPE_SUBMARINE && _vehicle->vehicleType() != MAV_TYPE_SURFACE_BOAT) {
_updateTerrainTimer.setInterval(500); _updateTerrainTimer.setInterval(500);
_updateTerrainTimer.setSingleShot(true); _updateTerrainTimer.setSingleShot(true);
connect(&_updateTerrainTimer, &QTimer::timeout, this, &VisualMissionItem::_reallyUpdateTerrainAltitude); connect(&_updateTerrainTimer, &QTimer::timeout, this, &VisualMissionItem::_reallyUpdateTerrainAltitude);
connect(this, &VisualMissionItem::coordinateChanged, this, &VisualMissionItem::_updateTerrainAltitude); connect(this, &VisualMissionItem::coordinateChanged, this, &VisualMissionItem::_updateTerrainAltitude);
}
} }
VisualMissionItem::VisualMissionItem(const VisualMissionItem& other, QObject* parent) VisualMissionItem::VisualMissionItem(const VisualMissionItem& other, QObject* parent)
...@@ -58,7 +62,11 @@ VisualMissionItem::VisualMissionItem(const VisualMissionItem& other, QObject* pa ...@@ -58,7 +62,11 @@ VisualMissionItem::VisualMissionItem(const VisualMissionItem& other, QObject* pa
, _distance (0.0) , _distance (0.0)
{ {
*this = other; *this = other;
// Don't get terrain altitude information for submarines or boards
if (_vehicle->vehicleType() != MAV_TYPE_SUBMARINE && _vehicle->vehicleType() != MAV_TYPE_SURFACE_BOAT) {
connect(this, &VisualMissionItem::coordinateChanged, this, &VisualMissionItem::_updateTerrainAltitude); connect(this, &VisualMissionItem::coordinateChanged, this, &VisualMissionItem::_updateTerrainAltitude);
}
} }
const VisualMissionItem& VisualMissionItem::operator=(const VisualMissionItem& other) const VisualMissionItem& VisualMissionItem::operator=(const VisualMissionItem& other)
......
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