Browse Source

Merge pull request #7174 from DonLakeFlyer/WaypointsOnly

Plan: Tweaks to custom build waypoints only mode
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
commit
dff88c803f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/PlanView/MissionSettingsEditor.qml
  2. 2
      src/PlanView/PlanView.qml

2
src/PlanView/MissionSettingsEditor.qml

@ -36,7 +36,7 @@ Rectangle { @@ -36,7 +36,7 @@ Rectangle {
property var _fileExtension: QGroundControl.settingsManager.appSettings.missionFileExtension
property var _appSettings: QGroundControl.settingsManager.appSettings
property bool _waypointsOnlyMode: QGroundControl.corePlugin.options.missionWaypointsOnly
property bool _showCameraSection: (!_waypointsOnlyMode || QGroundControl.corePlugin.showAdvancedUI) && !_missionVehicle.apmFirmware
property bool _showCameraSection: (_waypointsOnlyMode || QGroundControl.corePlugin.showAdvancedUI) && !_missionVehicle.apmFirmware
property bool _simpleMissionStart: QGroundControl.corePlugin.options.showSimpleMissionStart
property bool _showFlightSpeed: !_missionVehicle.vtol && !_simpleMissionStart && !_missionVehicle.apmFirmware

2
src/PlanView/PlanView.qml

@ -588,7 +588,7 @@ QGCView { @@ -588,7 +588,7 @@ QGCView {
rotateImage: [ masterController.syncInProgress, false, false, false, false, false, false ]
animateImage: [ masterController.dirty, false, false, false, false, false, false ]
buttonEnabled: [ !masterController.syncInProgress, true, true, true, true, true, true ]
buttonVisible: [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ]
buttonVisible: [ true, true, false/*_waypointsOnlyMode*/, true, true, _showZoom, _showZoom ]
maxHeight: mapScale.y - toolStrip.y
property bool _showZoom: !ScreenTools.isMobile

Loading…
Cancel
Save