slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved zoom related properties out of QCameraFocusControl

Browse Source 
Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-24 10:56:52 +10:00
committed by Qt by Nokia
parent 817fb006c7
commit 155c48b97e
11 changed files with 539 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/multimedia/controls/qcamerafocuscontrol.cpp
View File

@@ -111,40 +111,6 @@ QCameraFocusControl::~QCameraFocusControl()
Returns true if focus \a mode is supported.
*/
/*!
\fn qreal QCameraFocusControl::maximumOpticalZoom() const
Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported.
*/
/*!
\fn qreal QCameraFocusControl::maximumDigitalZoom() const
Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported.
*/
/*!
\fn qreal QCameraFocusControl::opticalZoom() const
Return the current optical zoom value.
*/
/*!
\fn qreal QCameraFocusControl::digitalZoom() const
Return the current digital zoom value.
*/
/*!
\fn void QCameraFocusControl::zoomTo(qreal optical, qreal digital)
Sets \a optical and \a digital zoom values.
*/
/*!
\fn QCameraFocusControl::focusPointMode() const
@@ -190,34 +156,6 @@ QCameraFocusControl::~QCameraFocusControl()
Returns the list of zones, the camera is using for focusing or focused on.
*/
/*!
\fn void QCameraFocusControl::opticalZoomChanged(qreal zoom)
Signal emitted when the optical \a zoom value changed.
*/
/*!
\fn void QCameraFocusControl::digitalZoomChanged(qreal zoom)
Signal emitted when the digital \a zoom value changed.
*/
/*!
\fn void QCameraFocusControl::maximumOpticalZoomChanged(qreal zoom)
Signal emitted when the maximum supported optical \a zoom value changed.
*/
/*!
\fn void QCameraFocusControl::maximumDigitalZoomChanged(qreal zoom)
Signal emitted when the maximum supported digital \a zoom value changed.
The maximum supported zoom value can depend on other camera settings,
like capture mode or resolution.
*/
/*!
\fn QCameraFocusControl::focusZonesChanged()
@@ -228,6 +166,32 @@ QCameraFocusControl::~QCameraFocusControl()
\sa QCameraFocusControl::focusZones()
*/
/*!
\fn QCameraFocusControl::focusModeChanged
Signal is emitted when the focus mode is chaged,
usually in result of QCameraFocusControl::setFocusMode call or capture mode changes.
\sa QCameraFocusControl::focusMode QCameraFocusControl::setFocusMode
*/
/*!
\fn QCameraFocusControl::focusPointModeChanged
Signal is emitted when the focus point mode is chaged,
usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes.
\sa QCameraFocusControl::focusPointMode QCameraFocusControl::setFocusPointMode
*/
/*!
\fn QCameraFocusControl::customFocusPointChanged
Signal is emitted when the custom focus point is changed.
\sa QCameraFocusControl::customFocusPoint QCameraFocusControl::setCustomFocusPoint
*/
#include "moc_qcamerafocuscontrol.cpp"