Commit 341afe7c authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4972 from DonLakeFlyer/Fixes

Fixes
parents a396b1a6 4fa12460
...@@ -152,8 +152,21 @@ AnalyzePage { ...@@ -152,8 +152,21 @@ AnalyzePage {
var o = logController.model.get(rowIndex) var o = logController.model.get(rowIndex)
if (o) o.selected = true if (o) o.selected = true
}) })
//-- Download them fileDialog.qgcView = logDownloadPage
logController.download() fileDialog.title = qsTr("Select save directory")
fileDialog.selectExisting = true
fileDialog.folder = QGroundControl.settingsManager.appSettings.telemetrySavePath
fileDialog.selectFolder = true
fileDialog.openForLoad()
}
QGCFileDialog {
id: fileDialog
onAcceptedForLoad: {
logController.download(file)
close()
}
} }
} }
......
...@@ -270,7 +270,7 @@ int MissionController::insertSimpleMissionItem(QGeoCoordinate coordinate, int i) ...@@ -270,7 +270,7 @@ int MissionController::insertSimpleMissionItem(QGeoCoordinate coordinate, int i)
newItem->setCommand(MavlinkQmlSingleton::MAV_CMD_NAV_WAYPOINT); newItem->setCommand(MavlinkQmlSingleton::MAV_CMD_NAV_WAYPOINT);
_initVisualItem(newItem); _initVisualItem(newItem);
if (_visualItems->count() == 1) { if (_visualItems->count() == 1) {
newItem->setCommand(MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF); newItem->setCommand(_activeVehicle->vtol() ? MavlinkQmlSingleton::MAV_CMD_NAV_VTOL_TAKEOFF : MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF);
} }
newItem->setDefaultsForCommand(); newItem->setDefaultsForCommand();
if ((MAV_CMD)newItem->command() == MAV_CMD_NAV_WAYPOINT) { if ((MAV_CMD)newItem->command() == MAV_CMD_NAV_WAYPOINT) {
......
...@@ -606,7 +606,7 @@ void QGCApplication::_missingParamsDisplay(void) ...@@ -606,7 +606,7 @@ void QGCApplication::_missingParamsDisplay(void)
} }
_missingParams.clear(); _missingParams.clear();
showMessage(QString("Parameters missing from firmware: %1. You may be running an older version of firmware QGC does not work correctly with or your firmware has a bug in it.").arg(params)); showMessage(QString("Parameters are missing from firmware. You may be running a version of firmware QGC does not work correctly with or your firmware has a bug in it. Missing params: %1").arg(params));
} }
QObject* QGCApplication::_rootQmlObject() QObject* QGCApplication::_rootQmlObject()
......
...@@ -33,7 +33,7 @@ Rectangle { ...@@ -33,7 +33,7 @@ Rectangle {
properties: "opacity" properties: "opacity"
from: 1.0 from: 1.0
to: 0.0 to: 0.0
duration: 1000 duration: 3000
easing.type: Easing.InQuint easing.type: Easing.InQuint
} }
} }
...@@ -33,7 +33,7 @@ Rectangle { ...@@ -33,7 +33,7 @@ Rectangle {
properties: "opacity" properties: "opacity"
from: 1.0 from: 1.0
to: 0.0 to: 0.0
duration: 1000 duration: 3000
easing.type: Easing.InQuint easing.type: Easing.InQuint
} }
} }
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