Commit e313f6c4 authored by pixhawk's avatar pixhawk

Renumbering works, need clear plan on naming / numbers, but this is conceptual only

parent 82acad45
...@@ -298,6 +298,7 @@ void QGCMapWidget::updateWaypoint(int uas, Waypoint* wp) ...@@ -298,6 +298,7 @@ void QGCMapWidget::updateWaypoint(int uas, Waypoint* wp)
// Create icon for new WP // Create icon for new WP
mapcontrol::WayPointItem* icon = WPCreate(internals::PointLatLng(wp->getLatitude(), wp->getLongitude()), wp->getAltitude(), wp->getDescription()); mapcontrol::WayPointItem* icon = WPCreate(internals::PointLatLng(wp->getLatitude(), wp->getLongitude()), wp->getAltitude(), wp->getDescription());
icon->SetHeading(wp->getYaw()); icon->SetHeading(wp->getYaw());
icon->SetNumber(wpindex);
// Update maps to allow inverse data association // Update maps to allow inverse data association
waypointsToIcons.insert(wp, icon); waypointsToIcons.insert(wp, icon);
iconsToWaypoints.insert(icon, wp); iconsToWaypoints.insert(icon, wp);
...@@ -314,7 +315,7 @@ void QGCMapWidget::updateWaypoint(int uas, Waypoint* wp) ...@@ -314,7 +315,7 @@ void QGCMapWidget::updateWaypoint(int uas, Waypoint* wp)
icon->SetCoord(internals::PointLatLng(wp->getLatitude(), wp->getLongitude())); icon->SetCoord(internals::PointLatLng(wp->getLatitude(), wp->getLongitude()));
icon->SetAltitude(wp->getAltitude()); icon->SetAltitude(wp->getAltitude());
icon->SetHeading(wp->getYaw()); icon->SetHeading(wp->getYaw());
icon->SetNumber(wp->getId()); icon->SetNumber(wpindex);
// Re-enable signals again // Re-enable signals again
this->blockSignals(false); this->blockSignals(false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment