Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
838d9e92
Commit
838d9e92
authored
Nov 01, 2019
by
olliw42
Browse files
CameraManager: two bugs in CameraPageWidgets, resolves cant-stop-video issue
parent
8918486e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FlightMap/Widgets/CameraPageWidget.qml
View file @
838d9e92
...
...
@@ -45,10 +45,10 @@ Column {
property
bool
_streamingEnabled
:
false
//TODO: determine what it should be, VideoPageWidget.qml does QGroundControl.settingsManager.videoSettings.streamConfigured
property
bool
_hasModes
:
_camera
&&
_camera
.
hasModes
property
bool
_videoRecording
:
_camera
&&
_camera
.
videoStatus
===
QGCCameraControl
.
VIDEO_CAPTURE_STATUS_RUNNING
property
bool
_photoIdle
:
_camera
&&
_camera
.
photoStatus
===
QGCCameraControl
.
PHOTO_CAPTURE_IDLE
property
bool
_photoIdle
:
_camera
&&
(
_camera
.
photoStatus
===
QGCCameraControl
.
PHOTO_CAPTURE_IDLE
||
_camera
.
photoStatus
>=
QGCCameraControl
.
PHOTO_CAPTURE_LAST
)
property
bool
_storageReady
:
_camera
&&
_camera
.
storageStatus
===
QGCCameraControl
.
STORAGE_READY
property
bool
_storageIgnored
:
_camera
&&
_camera
.
storageStatus
===
QGCCameraControl
.
STORAGE_NOT_SUPPORTED
property
bool
_canShoot
:
!
_cameraModeUndefined
&&
!
_videoRecording
&&
_photoIdle
&&
((
_storageReady
&&
_camera
.
storageFree
>
0
)
||
_storageIgnored
)
property
bool
_canShoot
:
!
_cameraModeUndefined
&&
((
_storageReady
&&
_camera
.
storageFree
>
0
)
||
_storageIgnored
)
function
showSettings
()
{
mainWindow
.
showComponentDialog
(
cameraSettings
,
_cameraVideoMode
?
qsTr
(
"
Video Settings
"
)
:
qsTr
(
"
Camera Settings
"
),
70
,
StandardButton
.
Ok
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment