Skip to content

Q
qgroundcontrol
Unverified Commit 2da17109 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7739 from DonLakeFlyer/FlyDrag 

Current waypoint is draggable in Fly view
parents aaa79e70 c9cbfa11
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/AnalyzeView/GeoTagController.cc
View file @ 2da17109
...@@ -249,7 +249,7 @@ void GeoTagWorker::run() ...@@ -249,7 +249,7 @@ void GeoTagWorker::run()
for(int i = 0; i < maxIndex; i++) { for(int i = 0; i < maxIndex; i++) {
int imageIndex = _imageIndices[i]; int imageIndex = _imageIndices[i];
if (imageIndex >= _imageList.count()) { if (imageIndex >= _imageList.count()) {
emit error(tr("Geotagging failed. Image requested not present.")); emit error(tr("Geotagging failed. Requesting image #%1, but only %2 images present.").arg(imageIndex).arg(_imageList.count()));
return; return;
} }
QFile fileRead(_imageList.at(_imageIndices[i]).absoluteFilePath()); QFile fileRead(_imageList.at(_imageIndices[i]).absoluteFilePath());
......
src/PlanView/SimpleItemMapVisual.qml
View file @ 2da17109
...@@ -78,7 +78,7 @@ Item { ...@@ -78,7 +78,7 @@ Item {
target: _missionItem target: _missionItem
onIsCurrentItemChanged: { onIsCurrentItemChanged: {
if (_missionItem.isCurrentItem) { if (_missionItem.isCurrentItem && map.planView) {
showDragArea() showDragArea()
} else { } else {
hideDragArea() hideDragArea()
......
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