Browse Source

Fixed bug in collecting global waypoints from the autopilot

QGC4.4
Mariano Lizarraga 15 years ago
parent
commit
d22409fdb4
  1. 14
      src/ui/MapWidget.cc
  2. 2
      src/ui/MapWidget.h

14
src/ui/MapWidget.cc

@ -407,6 +407,7 @@ void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordina @@ -407,6 +407,7 @@ void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordina
void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
{
if (!wpExists(coordinate)){
// Create waypoint name
QString str;
@ -425,6 +426,8 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate) @@ -425,6 +426,8 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
{
tempCirclePoint = new Waypoint2DIcon(coordinate.x(), coordinate.y(), 20, str, qmapcontrol::Point::Middle);
}
mc->layer("Waypoints")->addGeometry(tempCirclePoint);
Point* tempPoint = new Point(coordinate.x(), coordinate.y(),str);
@ -436,11 +439,22 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate) @@ -436,11 +439,22 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
// Refresh the screen
mc->updateRequestNew();
}
//// // emit signal mouse was clicked
// emit captureMapCoordinateClick(coordinate);
}
int MapWidget::wpExists(const QPointF coordinate){
for (int i = 0; i < wps.size(); i++){
if (wps.at(i)->latitude() == coordinate.y() &&
wps.at(i)->longitude()== coordinate.x()){
return 1;
}
}
return 0;
}
void MapWidget::captureGeometryClick(Geometry* geom, QPoint point)
{

2
src/ui/MapWidget.h

@ -144,7 +144,7 @@ private: @@ -144,7 +144,7 @@ private:
QHash <QString, qmapcontrol::Point*> wpIndex;
qmapcontrol::LineString* path;
QPen* pointPen;
int wpExists(const QPointF coordinate);
bool waypointIsDrag;

Loading…
Cancel
Save