From 474010ff064016bda8d628824701687724ed41eb Mon Sep 17 00:00:00 2001 From: pixhawk Date: Sat, 3 Jul 2010 17:52:11 +0200 Subject: [PATCH] added rounding --- src/ui/WaypointList.cc | 9 +++------ src/ui/WaypointView.ui | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc index 42c8cd5..74da7f1 100644 --- a/src/ui/WaypointList.cc +++ b/src/ui/WaypointList.cc @@ -93,10 +93,7 @@ WaypointList::~WaypointList() void WaypointList::updateStatusLabel(const QString &string) { - if (this->uas) - { - m_ui->statusLabel->setText(string); - } + m_ui->statusLabel->setText(string); } void WaypointList::updateLocalPosition(UASInterface* uas, double x, double y, double z, quint64 usec) @@ -229,11 +226,11 @@ void WaypointList::addCurrentPositonWaypoint() if (waypoints.size() > 0) { Waypoint *last = waypoints.at(waypoints.size()-1); - addWaypoint(new Waypoint(waypoints.size(), mavX, mavY, mavZ, mavYaw, last->getAutoContinue(), false, last->getOrbit(), last->getHoldTime())); + addWaypoint(new Waypoint(waypoints.size(), (float)(qRound(mavX*100))/100.f, (float)(qRound(mavY*100))/100.f, (float)(qRound(mavZ*100))/100.f, (float)(qRound(mavYaw*100))/100.f, last->getAutoContinue(), false, last->getOrbit(), last->getHoldTime())); } else { - addWaypoint(new Waypoint(waypoints.size(), mavX, mavY, mavZ, mavYaw, true, true, 0.15, 2000)); + addWaypoint(new Waypoint(waypoints.size(), (float)(qRound(mavX*100))/100.f, (float)(qRound(mavY*100))/100.f, (float)(qRound(mavZ*100))/100.f, (float)(qRound(mavYaw*100))/100.f, true, true, 0.15, 2000)); } } diff --git a/src/ui/WaypointView.ui b/src/ui/WaypointView.ui index 97f8013..d7e3375 100644 --- a/src/ui/WaypointView.ui +++ b/src/ui/WaypointView.ui @@ -281,8 +281,11 @@ QProgressBar::chunk#thrustBar { ° + + -180 + - 359 + 180 10