Browse Source

Merge pull request #5053 from DonLakeFlyer/FlightTesting

Fixes from flight testing
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
6e1232db8e
  1. 5
      src/FlightDisplay/FlightDisplayView.qml
  2. 4
      src/MissionManager/CameraSection.FactMetaData.json
  3. 4
      src/MissionManager/MissionController.cc
  4. 2
      src/PlanView/PlanToolBar.qml

5
src/FlightDisplay/FlightDisplayView.qml

@ -167,11 +167,8 @@ QGCView { @@ -167,11 +167,8 @@ QGCView {
message: qsTr("Do you want to remove the mission from the vehicle?")
function accept() {
_missionController.removeAllFromVehicle()
_geoFenceController.removeAllFromVehicle()
_rallyPointController.removeAllFromVehicle()
_planMasterController.removeAllFromVehicle()
hideDialog()
}
}
}

4
src/MissionManager/CameraSection.FactMetaData.json

@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
"shortDescription": "Gimbal yaw rotation.",
"type": "double",
"units": "deg",
"min": 0.0,
"max": 360.0,
"min": -180.0,
"max": 180.0,
"decimalPlaces": 0,
"defaultValue": 0
}

4
src/MissionManager/MissionController.cc

@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate @@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate
CameraSection* cameraSection = settingsItem->cameraSection();
if (!cameraSection->specifyGimbal()) {
cameraSection->setSpecifyGimbal(true);
cameraSection->gimbalYaw()->setRawValue(-90.0);
cameraSection->gimbalPitch()->setRawValue(-90.0);
}
}
} else if (itemName == _fwLandingMissionItemName) {
@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index) @@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index)
if (_controllerVehicle->firmwarePlugin()->hasGimbal(_controllerVehicle, rollSupported, pitchSupported, yawSupported) && pitchSupported) {
MissionSettingsItem* settingsItem = _visualItems->value<MissionSettingsItem*>(0);
CameraSection* cameraSection = settingsItem->cameraSection();
if (cameraSection->specifyGimbal() && cameraSection->gimbalYaw()->rawValue().toDouble() == -90.0 && cameraSection->gimbalPitch()->rawValue().toDouble() == 0.0) {
if (cameraSection->specifyGimbal() && cameraSection->gimbalPitch()->rawValue().toDouble() == -90.0 && cameraSection->gimbalYaw()->rawValue().toDouble() == 0.0) {
cameraSection->setSpecifyGimbal(false);
}
}

2
src/PlanView/PlanToolBar.qml

@ -132,7 +132,7 @@ Rectangle { @@ -132,7 +132,7 @@ Rectangle {
id: progressBar
anchors.left: parent.left
anchors.bottom: parent.bottom
height: 2
height: 4
width: _controllerProgressPct * parent.width
color: qgcPal.colorGreen
visible: false

Loading…
Cancel
Save