Commit e8e2feb7 authored by DonLakeFlyer's avatar DonLakeFlyer

Fix relative and absolute altitudes

parent a2785ab0
...@@ -277,7 +277,7 @@ void MissionController::convertToKMLDocument(QDomDocument& document) ...@@ -277,7 +277,7 @@ void MissionController::convertToKMLDocument(QDomDocument& document)
return; return;
} }
float altitude = missionJson[_jsonPlannedHomePositionKey].toArray()[2].toDouble(); float homeAltitude = missionJson[_jsonPlannedHomePositionKey].toArray()[2].toDouble();
QString coord; QString coord;
QStringList coords; QStringList coords;
...@@ -292,11 +292,12 @@ void MissionController::convertToKMLDocument(QDomDocument& document) ...@@ -292,11 +292,12 @@ void MissionController::convertToKMLDocument(QDomDocument& document)
qgcApp()->toolbox()->missionCommandTree()->getUIInfo(_controllerVehicle, item->command()); qgcApp()->toolbox()->missionCommandTree()->getUIInfo(_controllerVehicle, item->command());
if (uiInfo && uiInfo->specifiesCoordinate() && !uiInfo->isStandaloneCoordinate()) { if (uiInfo && uiInfo->specifiesCoordinate() && !uiInfo->isStandaloneCoordinate()) {
double amslAltitude = item->param7() + (item->frame() == MAV_FRAME_GLOBAL ? 0 : homeAltitude);
coord = QString::number(item->param6(),'f',7) \ coord = QString::number(item->param6(),'f',7) \
+ "," \ + "," \
+ QString::number(item->param5(),'f',7) \ + QString::number(item->param5(),'f',7) \
+ "," \ + "," \
+ QString::number(item->param7() + altitude,'f',2); + QString::number(amslAltitude,'f',2);
coords.append(coord); coords.append(coord);
} }
} }
......
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