zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix crash when acceptance in pixels == 0

QGC4.4
Anton Babushkin 12 years ago
parent
bd2da1d28b
commit
ff5a3fe3d1
1 changed files with 6 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/ui/map/Waypoint2DIcon.cc

10
src/ui/map/Waypoint2DIcon.cc
Unescape View File

@ -291,10 +291,12 @@ void Waypoint2DIcon::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
redPen.setWidth(1); redPen.setWidth(1);
painter->setPen(redPen); painter->setPen(redPen);
const int acceptance = map->metersToPixels(waypoint->getAcceptanceRadius(), Coord()); const int acceptance = map->metersToPixels(waypoint->getAcceptanceRadius(), Coord());
painter->setPen(penBlack); if (acceptance > 0) {
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance); painter->setPen(penBlack);
painter->setPen(redPen); painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance); painter->setPen(redPen);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
}
} }
if ((waypoint) && ((waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_UNLIM) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TIME) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TURNS))) if ((waypoint) && ((waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_UNLIM) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TIME) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TURNS)))
{ {

Write Preview
Loading…
Cancel
Save