QML Camera element redesign.
Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
committed by
Qt by Nokia
Qt by Nokia
parent
47a5dd4371
commit
1913f164dc
204
src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
Normal file
204
src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
Normal file
@@ -0,0 +1,204 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qdeclarativecamera_p.h"
|
||||
#include "qdeclarativecameraimageprocessing_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QDeclarativeCameraImageProcessing::QDeclarativeCameraImageProcessing(QCamera *camera, QObject *parent) :
|
||||
QObject(parent)
|
||||
{
|
||||
m_imageProcessing = camera->imageProcessing();
|
||||
}
|
||||
|
||||
QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty enumeration CameraImageProcessing::whiteBalanceMode
|
||||
|
||||
\table
|
||||
\header \o Value \o Description
|
||||
\row \o WhiteBalanceManual \o Manual white balance. In this mode the manual white balance property value is used.
|
||||
\row \o WhiteBalanceAuto \o Auto white balance mode.
|
||||
\row \o WhiteBalanceSunlight \o Sunlight white balance mode.
|
||||
\row \o WhiteBalanceCloudy \o Cloudy white balance mode.
|
||||
\row \o WhiteBalanceShade \o Shade white balance mode.
|
||||
\row \o WhiteBalanceTungsten \o Tungsten white balance mode.
|
||||
\row \o WhiteBalanceFluorescent \o Fluorescent white balance mode.
|
||||
\row \o WhiteBalanceFlash \o Flash white balance mode.
|
||||
\row \o WhiteBalanceSunset \o Sunset white balance mode.
|
||||
\row \o WhiteBalanceVendor \o Vendor defined white balance mode.
|
||||
\endtable
|
||||
|
||||
\sa manualWhiteBalance
|
||||
*/
|
||||
/*!
|
||||
\property QDeclarativeCameraImageProcessing::whiteBalanceMode
|
||||
|
||||
\sa WhiteBalanceMode
|
||||
*/
|
||||
QDeclarativeCameraImageProcessing::WhiteBalanceMode QDeclarativeCameraImageProcessing::whiteBalanceMode() const
|
||||
{
|
||||
return WhiteBalanceMode(m_imageProcessing->whiteBalanceMode());
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setWhiteBalanceMode(QDeclarativeCameraImageProcessing::WhiteBalanceMode mode) const
|
||||
{
|
||||
if (whiteBalanceMode() != mode) {
|
||||
m_imageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceMode(mode));
|
||||
emit whiteBalanceModeChanged(whiteBalanceMode());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty int CameraImageProcessing::manualWhiteBalance
|
||||
|
||||
The color temperature used when in manual white balance mode (WhiteBalanceManual).
|
||||
|
||||
\sa whiteBalanceMode
|
||||
*/
|
||||
int QDeclarativeCameraImageProcessing::manualWhiteBalance() const
|
||||
{
|
||||
return m_imageProcessing->manualWhiteBalance();
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setManualWhiteBalance(int colorTemp) const
|
||||
{
|
||||
if (manualWhiteBalance() != colorTemp) {
|
||||
m_imageProcessing->setManualWhiteBalance(colorTemp);
|
||||
emit manualWhiteBalanceChanged(manualWhiteBalance());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty int CameraImageProcessing::contrast
|
||||
|
||||
Image contrast.
|
||||
Valid contrast values range between -100 and 100, the default is 0.
|
||||
*/
|
||||
int QDeclarativeCameraImageProcessing::contrast() const
|
||||
{
|
||||
return m_imageProcessing->contrast();
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setContrast(int value)
|
||||
{
|
||||
if (value != contrast()) {
|
||||
m_imageProcessing->setContrast(value);
|
||||
emit contrastChanged(contrast());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty int CameraImageProcessing::saturation
|
||||
|
||||
Image saturation.
|
||||
Valid saturation values range between -100 and 100, the default is 0.
|
||||
*/
|
||||
int QDeclarativeCameraImageProcessing::saturation() const
|
||||
{
|
||||
return m_imageProcessing->saturation();
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setSaturation(int value)
|
||||
{
|
||||
if (value != saturation()) {
|
||||
m_imageProcessing->setSaturation(value);
|
||||
emit saturationChanged(saturation());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty int CameraImageProcessing::sharpeningLevel
|
||||
|
||||
Level of sharpening applied to image.
|
||||
|
||||
Valid sharpening level values range between -1 for default sharpening level,
|
||||
0 for sharpening disabled and 100 for maximum sharpening applied.
|
||||
*/
|
||||
int QDeclarativeCameraImageProcessing::sharpeningLevel() const
|
||||
{
|
||||
return m_imageProcessing->sharpeningLevel();
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setSharpeningLevel(int value)
|
||||
{
|
||||
if (value != sharpeningLevel()) {
|
||||
m_imageProcessing->setSharpeningLevel(value);
|
||||
emit sharpeningLevelChanged(sharpeningLevel());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty int CameraImageProcessing::denoisingLevel
|
||||
|
||||
Level of denoising applied to image.
|
||||
|
||||
Valid denoising level values range between -1 for default denoising level,
|
||||
0 for denoising disabled and 100 for maximum denoising applied.
|
||||
*/
|
||||
int QDeclarativeCameraImageProcessing::denoisingLevel() const
|
||||
{
|
||||
return m_imageProcessing->denoisingLevel();
|
||||
}
|
||||
|
||||
void QDeclarativeCameraImageProcessing::setDenoisingLevel(int value)
|
||||
{
|
||||
if (value != denoisingLevel()) {
|
||||
m_imageProcessing->setDenoisingLevel(value);
|
||||
emit denoisingLevelChanged(denoisingLevel());
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlsignal Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
|
||||
*/
|
||||
|
||||
/*!
|
||||
\qmlsignal Camera::manualWhiteBalanceChanged(int)
|
||||
*/
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qdeclarativecameraimageprocessing_p.cpp"
|
||||
Reference in New Issue
Block a user