rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

GCS - OPMap - allow different colors for overlays.

Browse Source 
This is so we can use a different color for each kind
of route ex:error destination, jump destination, next destination
This commit is contained in:
PT_Dreamer 2012-06-24 19:57:02 +01:00
parent 2b9ad9dcb9
commit e34fc5be71
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
View File

@ -110,11 +110,11 @@ namespace mapcontrol
return NULL; return NULL;
return new WayPointLine(from,to,map,color); return new WayPointLine(from,to,map,color);
} }
WayPointLine * OPMapWidget::WPLineCreate(HomeItem *from, WayPointItem *to) WayPointLine * OPMapWidget::WPLineCreate(HomeItem *from, WayPointItem *to,QColor color)
{ {
if(!from|!to) if(!from|!to)
return NULL; return NULL;
return new WayPointLine(from,to,map); return new WayPointLine(from,to,map,color);
} }
WayPointCircle * OPMapWidget::WPCircleCreate(WayPointItem *center, WayPointItem *radius, bool clockwise,QColor color) WayPointCircle * OPMapWidget::WPCircleCreate(WayPointItem *center, WayPointItem *radius, bool clockwise,QColor color)
{ {
@ -123,11 +123,11 @@ namespace mapcontrol
return new WayPointCircle(center,radius,clockwise,map,color); return new WayPointCircle(center,radius,clockwise,map,color);
} }
WayPointCircle *OPMapWidget::WPCircleCreate(HomeItem *center, WayPointItem *radius, bool clockwise) WayPointCircle *OPMapWidget::WPCircleCreate(HomeItem *center, WayPointItem *radius, bool clockwise,QColor color)
{ {
if(!center|!radius) if(!center|!radius)
return NULL; return NULL;
return new WayPointCircle(center,radius,clockwise,map); return new WayPointCircle(center,radius,clockwise,map,color);
} }
void OPMapWidget::SetShowUAV(const bool &value) void OPMapWidget::SetShowUAV(const bool &value)
{ {

4
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
View File

@ -363,9 +363,9 @@ namespace mapcontrol
void SetShowDiagnostics(bool const& value); void SetShowDiagnostics(bool const& value);
void SetUavPic(QString UAVPic); void SetUavPic(QString UAVPic);
WayPointLine * WPLineCreate(WayPointItem *from,WayPointItem *to, QColor color); WayPointLine * WPLineCreate(WayPointItem *from,WayPointItem *to, QColor color);
WayPointLine * WPLineCreate(HomeItem *from,WayPointItem *to); WayPointLine * WPLineCreate(HomeItem *from,WayPointItem *to, QColor color);
WayPointCircle *WPCircleCreate(WayPointItem *center, WayPointItem *radius,bool clockwise,QColor color); WayPointCircle *WPCircleCreate(WayPointItem *center, WayPointItem *radius,bool clockwise,QColor color);
WayPointCircle *WPCircleCreate(HomeItem *center, WayPointItem *radius,bool clockwise); WayPointCircle *WPCircleCreate(HomeItem *center, WayPointItem *radius,bool clockwise,QColor color);
void deleteAllOverlays(); void deleteAllOverlays();
void WPSetVisibleAll(bool value); void WPSetVisibleAll(bool value);
WayPointItem *magicWPCreate(); WayPointItem *magicWPCreate();