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
e1a936e7
Commit
e1a936e7
authored
Jul 19, 2017
by
Gus Grubba
Browse files
Remove test URL
parent
5a39cfd4
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Camera/QGCCameraControl.cc
View file @
e1a936e7
...
...
@@ -115,14 +115,7 @@ QGCCameraControl::QGCCameraControl(const mavlink_camera_information_t *info, Veh
,
_cameraMode
(
CAMERA_MODE_UNDEFINED
)
,
_video_status
(
VIDEO_CAPTURE_STATUS_UNDEFINED
)
{
memcpy
(
&
_info
,
&
info
,
sizeof
(
mavlink_camera_information_t
));
connect
(
this
,
&
QGCCameraControl
::
dataReady
,
this
,
&
QGCCameraControl
::
_dataReady
);
if
(
1
/*_info.cam_definition_uri[0]*/
)
{
//-- Process camera definition file
_httpRequest
(
"http://www.grubba.com/e90.xml"
);
}
else
{
_initWhenReady
();
}
_processCameraInfo
(
info
);
}
//-----------------------------------------------------------------------------
...
...
@@ -139,6 +132,21 @@ QGCCameraControl::~QGCCameraControl()
}
}
//-----------------------------------------------------------------------------
void
QGCCameraControl
::
_processCameraInfo
(
const
mavlink_camera_information_t
*
info
)
{
memcpy
(
&
_info
,
&
info
,
sizeof
(
mavlink_camera_information_t
));
connect
(
this
,
&
QGCCameraControl
::
dataReady
,
this
,
&
QGCCameraControl
::
_dataReady
);
if
(
_info
.
cam_definition_uri
[
0
])
{
//-- Process camera definition file
const
char
*
url
=
(
const
char
*
)
info
->
cam_definition_uri
;
_httpRequest
(
url
);
}
else
{
_initWhenReady
();
}
}
//-----------------------------------------------------------------------------
void
QGCCameraControl
::
_initWhenReady
()
...
...
src/Camera/QGCCameraControl.h
View file @
e1a936e7
...
...
@@ -155,6 +155,7 @@ signals:
protected:
virtual
void
_setVideoStatus
(
VideoStatus
status
);
virtual
void
_setCameraMode
(
CameraMode
mode
);
virtual
void
_processCameraInfo
(
const
mavlink_camera_information_t
*
info
);
private
slots
:
void
_initWhenReady
();
...
...
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