Skip to content

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

Merge pull request #5929 from DonLakeFlyer/BugFixes 

Bug fixes
parents cbdebe0a ec55c049
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 52 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 73d856d5
...@@ -167,10 +167,10 @@ SetupPage { ...@@ -167,10 +167,10 @@ SetupPage {
columns: 3 columns: 3
Image { Image {
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg" source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg"
Layout.rowSpan: 3 Layout.rowSpan: 4
Layout.maximumWidth: _imageWidth Layout.maximumWidth: _imageWidth
Layout.maximumHeight: _imageHeight Layout.maximumHeight: _imageHeight
width: _imageWidth width: _imageWidth
...@@ -204,6 +204,15 @@ SetupPage { ...@@ -204,6 +204,15 @@ SetupPage {
fact: controller.getParameterFact(-1, "BAT_CRIT_THR") fact: controller.getParameterFact(-1, "BAT_CRIT_THR")
Layout.minimumWidth: _editFieldWidth Layout.minimumWidth: _editFieldWidth
} }
QGCLabel {
text: qsTr("Battery Emergency Level:")
Layout.fillWidth: true
}
FactTextField {
fact: controller.getParameterFact(-1, "BAT_EMERGEN_THR")
Layout.minimumWidth: _editFieldWidth
}
} }
Item { width: 1; height: _margins; Layout.columnSpan: 3 } Item { width: 1; height: _margins; Layout.columnSpan: 3 }
......
src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
View file @ 73d856d5
...@@ -71,11 +71,15 @@ Rectangle { ...@@ -71,11 +71,15 @@ Rectangle {
drag.maximumY: itemDragger.parent.height - parent.height drag.maximumY: itemDragger.parent.height - parent.height
preventStealing: true preventStealing: true
onClicked: itemDragger.clicked() onClicked: {
focus = true
itemDragger.clicked()
}
property bool dragActive: drag.active property bool dragActive: drag.active
onDragActiveChanged: { onDragActiveChanged: {
if (dragActive) { if (dragActive) {
focus = true
if (!_dragStartSignalled) { if (!_dragStartSignalled) {
_dragStartSignalled = true _dragStartSignalled = true
dragStart() dragStart()
......
src/PlanView/SurveyItemEditor.qml
View file @ 73d856d5
...@@ -409,7 +409,7 @@ Rectangle { ...@@ -409,7 +409,7 @@ Rectangle {
FactCheckBox { FactCheckBox {
text: qsTr("Take images in turnarounds") text: qsTr("Take images in turnarounds")
fact: missionItem.cameraTriggerInTurnaround fact: missionItem.cameraTriggerInTurnaround
enabled: !missionItem.hoverAndCapture.rawValue enabled: missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true
} }
SectionHeader { SectionHeader {
...@@ -605,7 +605,7 @@ Rectangle { ...@@ -605,7 +605,7 @@ Rectangle {
FactCheckBox { FactCheckBox {
text: qsTr("Take images in turnarounds") text: qsTr("Take images in turnarounds")
fact: missionItem.cameraTriggerInTurnaround fact: missionItem.cameraTriggerInTurnaround
enabled: !missionItem.hoverAndCapture.rawValue enabled: missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
......
src/QmlControls/MissionItemIndexLabel.qml
View file @ 73d856d5
...@@ -116,6 +116,9 @@ Canvas { ...@@ -116,6 +116,9 @@ Canvas {
QGCMouseArea { QGCMouseArea {
fillItem: parent fillItem: parent
onClicked: parent.clicked() onClicked: {
focus = true
parent.clicked()
}
} }
} }
src/VehicleSetup/FirmwareUpgradeController.cc
View file @ 73d856d5
...@@ -301,24 +301,6 @@ void FirmwareUpgradeController::_initFirmwareHash() ...@@ -301,24 +301,6 @@ void FirmwareUpgradeController::_initFirmwareHash()
{ AutoPilotStackAPM, DeveloperFirmware, RoverFirmware, "http://gumstix-aerocore.s3.amazonaws.com/Rover/latest/PX4/APMrover2-v2.px4"} { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware, "http://gumstix-aerocore.s3.amazonaws.com/Rover/latest/PX4/APMrover2-v2.px4"}
}; };
/////////////////////////////// FMUV1 firmwares ///////////////////////////////////////////
FirmwareToUrlElement_t rgPX4FMUV1FirmwareArray[] = {
{ AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/px4fmu-v1_default.px4"},
{ AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/px4fmu-v1_default.px4"},
{ AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/px4fmu-v1_default.px4"},
{ AutoPilotStackAPM, StableFirmware, CopterFirmware, "http://firmware.ardupilot.org/Copter/stable/PX4/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, StableFirmware, HeliFirmware, "http://firmware.ardupilot.org/Copter/stable/PX4-heli/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, StableFirmware, PlaneFirmware, "http://firmware.ardupilot.org/Plane/stable/PX4/ArduPlane-v1.px4"},
{ AutoPilotStackAPM, StableFirmware, RoverFirmware, "http://firmware.ardupilot.org/Rover/stable/PX4/APMrover2-v1.px4"},
{ AutoPilotStackAPM, BetaFirmware, CopterFirmware, "http://firmware.ardupilot.org/Copter/beta/PX4/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, BetaFirmware, HeliFirmware, "http://firmware.ardupilot.org/Copter/beta/PX4-heli/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, BetaFirmware, PlaneFirmware, "http://firmware.ardupilot.org/Plane/beta/PX4/ArduPlane-v1.px4"},
{ AutoPilotStackAPM, BetaFirmware, RoverFirmware, "http://firmware.ardupilot.org/Rover/beta/PX4/APMrover2-v1.px4"},
{ AutoPilotStackAPM, DeveloperFirmware, CopterFirmware, "http://firmware.ardupilot.org/Copter/latest/PX4/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, DeveloperFirmware, HeliFirmware, "http://firmware.ardupilot.org/Copter/latest/PX4-heli/ArduCopter-v1.px4"},
{ AutoPilotStackAPM, DeveloperFirmware, PlaneFirmware, "http://firmware.ardupilot.org/Plane/latest/PX4/ArduPlane-v1.px4"},
{ AutoPilotStackAPM, DeveloperFirmware, RoverFirmware, "http://firmware.ardupilot.org/Rover/latest/PX4/APMrover2-v1.px4"}
};
//////////////////////////////////// AUAVX2_1 firmwares ////////////////////////////////////////////////// //////////////////////////////////// AUAVX2_1 firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t rgAUAVX2_1FirmwareArray[] = { FirmwareToUrlElement_t rgAUAVX2_1FirmwareArray[] = {
{ AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/auav-x21_default.px4"}, { AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/auav-x21_default.px4"},
...@@ -414,12 +396,6 @@ void FirmwareUpgradeController::_initFirmwareHash() ...@@ -414,12 +396,6 @@ void FirmwareUpgradeController::_initFirmwareHash()
_rgAeroCoreFirmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); _rgAeroCoreFirmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
} }
size = sizeof(rgPX4FMUV1FirmwareArray)/sizeof(rgPX4FMUV1FirmwareArray[0]);
for (int i = 0; i < size; i++) {
const FirmwareToUrlElement_t& element = rgPX4FMUV1FirmwareArray[i];
_rgPX4FMUV1Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
}
size = sizeof(rgAUAVX2_1FirmwareArray)/sizeof(rgAUAVX2_1FirmwareArray[0]); size = sizeof(rgAUAVX2_1FirmwareArray)/sizeof(rgAUAVX2_1FirmwareArray[0]);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
const FirmwareToUrlElement_t& element = rgAUAVX2_1FirmwareArray[i]; const FirmwareToUrlElement_t& element = rgAUAVX2_1FirmwareArray[i];
...@@ -479,8 +455,6 @@ void FirmwareUpgradeController::_bootloaderSyncFailed(void) ...@@ -479,8 +455,6 @@ void FirmwareUpgradeController::_bootloaderSyncFailed(void)
QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeController::_firmwareHashForBoardId(int boardId) QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeController::_firmwareHashForBoardId(int boardId)
{ {
switch (boardId) { switch (boardId) {
case Bootloader::boardIDPX4FMUV1:
return &_rgPX4FMUV1Firmware;
case Bootloader::boardIDPX4Flow: case Bootloader::boardIDPX4Flow:
return &_rgPX4FLowFirmware; return &_rgPX4FLowFirmware;
case Bootloader::boardIDPX4FMUV2: case Bootloader::boardIDPX4FMUV2:
......
src/VehicleSetup/FirmwareUpgradeController.h
View file @ 73d856d5
...@@ -206,7 +206,6 @@ private: ...@@ -206,7 +206,6 @@ private:
QHash<FirmwareIdentifier, QString> _rgPX4FMUV3Firmware; QHash<FirmwareIdentifier, QString> _rgPX4FMUV3Firmware;
QHash<FirmwareIdentifier, QString> _rgPX4FMUV2Firmware; QHash<FirmwareIdentifier, QString> _rgPX4FMUV2Firmware;
QHash<FirmwareIdentifier, QString> _rgAeroCoreFirmware; QHash<FirmwareIdentifier, QString> _rgAeroCoreFirmware;
QHash<FirmwareIdentifier, QString> _rgPX4FMUV1Firmware;
QHash<FirmwareIdentifier, QString> _rgAUAVX2_1Firmware; QHash<FirmwareIdentifier, QString> _rgAUAVX2_1Firmware;
QHash<FirmwareIdentifier, QString> _rgMindPXFMUV2Firmware; QHash<FirmwareIdentifier, QString> _rgMindPXFMUV2Firmware;
QHash<FirmwareIdentifier, QString> _rgTAPV1Firmware; QHash<FirmwareIdentifier, QString> _rgTAPV1Firmware;
......
src/ui/preferences/GeneralSettings.qml
View file @ 73d856d5
...@@ -41,6 +41,9 @@ QGCView { ...@@ -41,6 +41,9 @@ QGCView {
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 30 property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 30
property Fact _mapProvider: QGroundControl.settingsManager.flightMapSettings.mapProvider property Fact _mapProvider: QGroundControl.settingsManager.flightMapSettings.mapProvider
property Fact _mapType: QGroundControl.settingsManager.flightMapSettings.mapType property Fact _mapType: QGroundControl.settingsManager.flightMapSettings.mapType
property real _panelWidth: _qgcView.width * _internalWidthRatio
readonly property real _internalWidthRatio: 0.8
readonly property string _requiresRestart: qsTr("(Requires Restart)") readonly property string _requiresRestart: qsTr("(Requires Restart)")
...@@ -63,7 +66,7 @@ QGCView { ...@@ -63,7 +66,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Units //-- Units
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: unitLabel.height height: unitLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -76,7 +79,7 @@ QGCView { ...@@ -76,7 +79,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: unitsCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: unitsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -115,7 +118,7 @@ QGCView { ...@@ -115,7 +118,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Miscellaneous //-- Miscellaneous
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: miscLabel.height height: miscLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -128,7 +131,7 @@ QGCView { ...@@ -128,7 +131,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: miscCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: miscCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -359,7 +362,7 @@ QGCView { ...@@ -359,7 +362,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Save path //-- Save path
Row { RowLayout {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
visible: _savePath.visible && !ScreenTools.isMobile visible: _savePath.visible && !ScreenTools.isMobile
...@@ -368,8 +371,10 @@ QGCView { ...@@ -368,8 +371,10 @@ QGCView {
text: qsTr("File Save Path:") text: qsTr("File Save Path:")
} }
QGCLabel { QGCLabel {
anchors.baseline: savePathBrowse.baseline anchors.baseline: savePathBrowse.baseline
text: _savePath.rawValue === "" ? qsTr("<not set>") : _savePath.value Layout.maximumWidth: _panelWidth * 0.5
elide: Text.ElideMiddle
text: _savePath.rawValue === "" ? qsTr("<not set>") : _savePath.value
} }
QGCButton { QGCButton {
id: savePathBrowse id: savePathBrowse
...@@ -394,7 +399,7 @@ QGCView { ...@@ -394,7 +399,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- RTK GPS //-- RTK GPS
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: unitLabel.height height: unitLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -407,7 +412,7 @@ QGCView { ...@@ -407,7 +412,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: rtkGrid.height + (ScreenTools.defaultFontPixelHeight * 2) height: rtkGrid.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -438,7 +443,7 @@ QGCView { ...@@ -438,7 +443,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Autoconnect settings //-- Autoconnect settings
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: autoConnectLabel.height height: autoConnectLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -451,7 +456,7 @@ QGCView { ...@@ -451,7 +456,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: autoConnectCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: autoConnectCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -490,7 +495,7 @@ QGCView { ...@@ -490,7 +495,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Video Source //-- Video Source
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: videoLabel.height height: videoLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -503,7 +508,7 @@ QGCView { ...@@ -503,7 +508,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: videoCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: videoCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -605,7 +610,7 @@ QGCView { ...@@ -605,7 +610,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Video Source //-- Video Source
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: videoRecLabel.height height: videoRecLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -618,7 +623,7 @@ QGCView { ...@@ -618,7 +623,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: videoRecCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: videoRecCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -676,7 +681,7 @@ QGCView { ...@@ -676,7 +681,7 @@ QGCView {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Custom Brand Image //-- Custom Brand Image
Item { Item {
width: _qgcView.width * 0.8 width: _panelWidth
height: userBrandImageLabel.height height: userBrandImageLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -689,7 +694,7 @@ QGCView { ...@@ -689,7 +694,7 @@ QGCView {
} }
Rectangle { Rectangle {
height: userBrandImageCol.height + (ScreenTools.defaultFontPixelHeight * 2) height: userBrandImageCol.height + (ScreenTools.defaultFontPixelHeight * 2)
width: _qgcView.width * 0.8 width: _panelWidth
color: qgcPal.windowShade color: qgcPal.windowShade
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
......
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