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

GCS - OPMap - Handle magic waypoint as special case with

Browse Source 
different picture. This is not used now but can be needed in
the future
This commit is contained in:
PT_Dreamer 2012-06-24 19:55:23 +01:00
parent 5216835e18
commit 2b9ad9dcb9
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
View File

@ -33,6 +33,7 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord,int const& altitu
{ {
text=0; text=0;
numberI=0; numberI=0;
isMagic=false;
picture.load(QString::fromUtf8(":/markers/images/marker.png")); picture.load(QString::fromUtf8(":/markers/images/marker.png"));
number=WayPointItem::snumber; number=WayPointItem::snumber;
++WayPointItem::snumber; ++WayPointItem::snumber;
@ -69,11 +70,13 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
myType=relative; myType=relative;
if(magicwaypoint) if(magicwaypoint)
{ {
isMagic=true;
picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker3.png")); picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker3.png"));
number=-1; number=-1;
} }
else else
{ {
isMagic=false;
number=WayPointItem::snumber; number=WayPointItem::snumber;
++WayPointItem::snumber; ++WayPointItem::snumber;
} }
@ -107,6 +110,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
{ {
text=0; text=0;
numberI=0; numberI=0;
isMagic=false;
picture.load(QString::fromUtf8(":/markers/images/marker.png")); picture.load(QString::fromUtf8(":/markers/images/marker.png"));
number=WayPointItem::snumber; number=WayPointItem::snumber;
++WayPointItem::snumber; ++WayPointItem::snumber;
@ -153,6 +157,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
myType=relative; myType=relative;
text=0; text=0;
numberI=0; numberI=0;
isMagic=false;
picture.load(QString::fromUtf8(":/markers/images/marker.png")); picture.load(QString::fromUtf8(":/markers/images/marker.png"));
number=WayPointItem::snumber; number=WayPointItem::snumber;
++WayPointItem::snumber; ++WayPointItem::snumber;
@ -266,6 +271,11 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
void WayPointItem::setRelativeCoord(distBearingAltitude value) void WayPointItem::setRelativeCoord(distBearingAltitude value)
{ {
qDebug()<<"SET RELATIVE0";
if(value.altitudeRelative==relativeCoord.altitudeRelative
&& value.bearing==relativeCoord.bearing && value.distance==relativeCoord.distance)
return;
qDebug()<<"SET RELATIVE1";
relativeCoord=value; relativeCoord=value;
if(myHome) if(myHome)
{ {
@ -273,12 +283,17 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
} }
RefreshPos(); RefreshPos();
RefreshToolTip(); RefreshToolTip();
emit WPValuesChanged(this);
this->update(); this->update();
} }
void WayPointItem::SetCoord(const internals::PointLatLng &value) void WayPointItem::SetCoord(const internals::PointLatLng &value)
{ {
if(this->WPType()==relative) qDebug()<<"SET ABSOLUTE0";
// if(this->WPType()==relative)
// return;
if(Coord()==value)
return; return;
qDebug()<<"SET ABSOLUTE1";
bool abs_coord=false; bool abs_coord=false;
bool rel_coord=false; bool rel_coord=false;
if(coord!=value) if(coord!=value)
@ -298,6 +313,8 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
} }
void WayPointItem::SetDescription(const QString &value) void WayPointItem::SetDescription(const QString &value)
{ {
if(description==value)
return;
description=value; description=value;
RefreshToolTip(); RefreshToolTip();
emit WPValuesChanged(this); emit WPValuesChanged(this);
@ -319,10 +336,20 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
emit WPValuesChanged(this); emit WPValuesChanged(this);
if(value) if(value)
picture.load(QString::fromUtf8(":/markers/images/bigMarkerGreen.png")); picture.load(QString::fromUtf8(":/markers/images/bigMarkerGreen.png"));
else if(this->flags() & QGraphicsItem::ItemIsMovable==QGraphicsItem::ItemIsMovable) else
{
if(!isMagic)
{
if(this->flags() & QGraphicsItem::ItemIsMovable==QGraphicsItem::ItemIsMovable)
picture.load(QString::fromUtf8(":/markers/images/marker.png")); picture.load(QString::fromUtf8(":/markers/images/marker.png"));
else else
picture.load(QString::fromUtf8(":/markers/images/waypoint_marker2.png")); picture.load(QString::fromUtf8(":/markers/images/waypoint_marker2.png"));
}
else
{
picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker3.png"));
}
}
this->update(); this->update();
} }
@ -439,7 +466,12 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
void WayPointItem::setFlag(QGraphicsItem::GraphicsItemFlag flag, bool enabled) void WayPointItem::setFlag(QGraphicsItem::GraphicsItemFlag flag, bool enabled)
{ {
if(flag==QGraphicsItem::ItemIsMovable) if(isMagic)
{
QGraphicsItem::setFlag(flag,enabled);
return;
}
else if(flag==QGraphicsItem::ItemIsMovable)
{ {
if(enabled) if(enabled)
picture.load(QString::fromUtf8(":/markers/images/marker.png")); picture.load(QString::fromUtf8(":/markers/images/marker.png"));

2
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
View File

@ -181,7 +181,7 @@ private:
float altitude; float altitude;
MapGraphicItem* map; MapGraphicItem* map;
int number; int number;
bool isMagic;
QGraphicsSimpleTextItem* text; QGraphicsSimpleTextItem* text;
QGraphicsRectItem* textBG; QGraphicsRectItem* textBG;