Skip to content

Commit cd196c8

Browse files
committed
LP-601 Define line (or no line) for all WP modes on map.
1 parent 285fb8b commit cd196c8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

ground/gcs/src/plugins/opmap/modelmapproxy.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ modelMapProxy::overlayType modelMapProxy::overlayTranslate(int type)
8989
case MapDataDelegate::MODE_GOTOENDPOINT:
9090
case MapDataDelegate::MODE_FOLLOWVECTOR:
9191
case MapDataDelegate::MODE_VELOCITY:
92+
case MapDataDelegate::MODE_FIXEDATTITUDE:
9293
case MapDataDelegate::MODE_LAND:
9394
case MapDataDelegate::MODE_AUTOTAKEOFF:
9495
case MapDataDelegate::MODE_BRAKE:
@@ -98,8 +99,12 @@ modelMapProxy::overlayType modelMapProxy::overlayTranslate(int type)
9899
return OVERLAY_CIRCLE_RIGHT;
99100

100101
case MapDataDelegate::MODE_CIRCLELEFT:
101-
default:
102102
return OVERLAY_CIRCLE_LEFT;
103+
104+
case MapDataDelegate::MODE_SETACCESSORY:
105+
case MapDataDelegate::MODE_DISARMALARM:
106+
default:
107+
return OVERLAY_NOLINE;
103108
}
104109
}
105110

ground/gcs/src/plugins/opmap/modelmapproxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
using namespace mapcontrol;
4141
class modelMapProxy : public QObject {
42-
typedef enum { OVERLAY_LINE, OVERLAY_CIRCLE_RIGHT, OVERLAY_CIRCLE_LEFT } overlayType;
42+
typedef enum { OVERLAY_LINE, OVERLAY_CIRCLE_RIGHT, OVERLAY_CIRCLE_LEFT, OVERLAY_NOLINE } overlayType;
4343
Q_OBJECT
4444
public:
4545
explicit modelMapProxy(QObject *parent, OPMapWidget *map, flightDataModel *model, QItemSelectionModel *selectionModel);

0 commit comments

Comments
 (0)