Implemented QTestTouch functions.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
parent
af37aaf259
commit
49ba9c9cd5
4 changed files with 179 additions and 3 deletions
|
|
@ -2,6 +2,7 @@ project(QtTest)
|
||||||
|
|
||||||
set(QtTest_SRC
|
set(QtTest_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@
|
||||||
<rejection class="QTest" function-name="toString<ushort>"/>
|
<rejection class="QTest" function-name="toString<ushort>"/>
|
||||||
|
|
||||||
<rejection class="QTest" function-name="compare_helper"/>
|
<rejection class="QTest" function-name="compare_helper"/>
|
||||||
|
<rejection class="QTest" function-name="touchEvent"/>
|
||||||
|
|
||||||
<namespace-type name="QTest">
|
<namespace-type name="QTest">
|
||||||
<enum-type name="AttributeIndex"/>
|
<enum-type name="AttributeIndex"/>
|
||||||
|
|
@ -64,10 +65,36 @@
|
||||||
<include file-name="QtTest" location="global"/>
|
<include file-name="QtTest" location="global"/>
|
||||||
</extra-includes>
|
</extra-includes>
|
||||||
<!--<modify-function signature="qCompare<char>(char">-->
|
<!--<modify-function signature="qCompare<char>(char">-->
|
||||||
|
<rejection class="QTouchEventSequence"/>
|
||||||
|
<object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" >
|
||||||
|
<modify-function signature="press(int, const QPoint&, QWidget*)">
|
||||||
|
<modify-argument index="return">
|
||||||
|
<define-ownership class="target" owner="default"/>
|
||||||
|
</modify-argument>
|
||||||
|
</modify-function>
|
||||||
|
<modify-function signature="move(int, const QPoint&, QWidget*)">
|
||||||
|
<modify-argument index="return">
|
||||||
|
<define-ownership class="target" owner="default"/>
|
||||||
|
</modify-argument>
|
||||||
|
</modify-function>
|
||||||
|
<modify-function signature="release(int, const QPoint&, QWidget*)">
|
||||||
|
<modify-argument index="return">
|
||||||
|
<define-ownership class="target" owner="default"/>
|
||||||
|
</modify-argument>
|
||||||
|
</modify-function>
|
||||||
|
<modify-function signature="stationary(int)">
|
||||||
|
<modify-argument index="return">
|
||||||
|
<define-ownership class="target" owner="default"/>
|
||||||
|
</modify-argument>
|
||||||
|
</modify-function>
|
||||||
|
</object-type>
|
||||||
|
<modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent">
|
||||||
|
<modify-argument index="return">
|
||||||
|
<define-ownership class="target" owner="target"/>
|
||||||
|
</modify-argument>
|
||||||
|
</modify-function>
|
||||||
</namespace-type>
|
</namespace-type>
|
||||||
|
|
||||||
<rejection class="QTouchEventSequence"/>
|
|
||||||
|
|
||||||
<rejection class="QSignalSpy"/>
|
<rejection class="QSignalSpy"/>
|
||||||
<rejection class="QTestEventList"/>
|
<rejection class="QTestEventList"/>
|
||||||
</typesystem>
|
</typesystem>
|
||||||
|
|
|
||||||
|
|
@ -334,7 +334,7 @@ QT_END_HEADER
|
||||||
#undef qdoc
|
#undef qdoc
|
||||||
#endif
|
#endif
|
||||||
#include <QtGui/QtGui>
|
#include <QtGui/QtGui>
|
||||||
#include "qpytextobject.h"
|
#include "qpytextobject.h" // PySide class
|
||||||
#if @ENABLE_X11@
|
#if @ENABLE_X11@
|
||||||
#include <QtGui/QX11Info>
|
#include <QtGui/QX11Info>
|
||||||
#include <QtGui/QX11EmbedContainer>
|
#include <QtGui/QX11EmbedContainer>
|
||||||
|
|
@ -365,6 +365,7 @@ QT_END_HEADER
|
||||||
|
|
||||||
#if @QT_QTTEST_FOUND@
|
#if @QT_QTTEST_FOUND@
|
||||||
# include <QtTest/QtTest>
|
# include <QtTest/QtTest>
|
||||||
|
# include "pysideqtesttouch.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Phonon
|
// Phonon
|
||||||
|
|
|
||||||
147
PySide/pysideqtesttouch.h
Normal file
147
PySide/pysideqtesttouch.h
Normal file
|
|
@ -0,0 +1,147 @@
|
||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** 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 QtTest module of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** Commercial Usage
|
||||||
|
** Licensees holding valid Qt Commercial licenses may use this file in
|
||||||
|
** accordance with the Qt Commercial License Agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Nokia.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, 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.
|
||||||
|
**
|
||||||
|
** If you have questions regarding the use of this file, please contact
|
||||||
|
** Nokia at qt-info@nokia.com.
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef PYSIDEQTESTTOUCH_H
|
||||||
|
#define PYSIDEQTESTTOUCH_H
|
||||||
|
|
||||||
|
#include <QtTest/qtest_global.h>
|
||||||
|
#include <QtTest/qtestassert.h>
|
||||||
|
#include <QtTest/qtestsystem.h>
|
||||||
|
#include <QtTest/qtestspontaneevent.h>
|
||||||
|
#include <QtTest/qtesttouch.h>
|
||||||
|
|
||||||
|
#include <QtCore/qmap.h>
|
||||||
|
#include <QtGui/qevent.h>
|
||||||
|
#include <QtGui/qwidget.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
namespace QTest
|
||||||
|
{
|
||||||
|
|
||||||
|
class PySideQTouchEventSequence
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
~PySideQTouchEventSequence()
|
||||||
|
{
|
||||||
|
commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
PySideQTouchEventSequence* press(int touchId, const QPoint &pt, QWidget *widget = 0)
|
||||||
|
{
|
||||||
|
QTouchEvent::TouchPoint &p = point(touchId);
|
||||||
|
p.setScreenPos(mapToScreen(widget, pt));
|
||||||
|
p.setState(Qt::TouchPointPressed);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
PySideQTouchEventSequence* move(int touchId, const QPoint &pt, QWidget *widget = 0)
|
||||||
|
{
|
||||||
|
QTouchEvent::TouchPoint &p = point(touchId);
|
||||||
|
p.setScreenPos(mapToScreen(widget, pt));
|
||||||
|
p.setState(Qt::TouchPointMoved);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
PySideQTouchEventSequence* release(int touchId, const QPoint &pt, QWidget *widget = 0)
|
||||||
|
{
|
||||||
|
QTouchEvent::TouchPoint &p = point(touchId);
|
||||||
|
p.setScreenPos(mapToScreen(widget, pt));
|
||||||
|
p.setState(Qt::TouchPointReleased);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
PySideQTouchEventSequence* stationary(int touchId)
|
||||||
|
{
|
||||||
|
QTouchEvent::TouchPoint &p = point(touchId);
|
||||||
|
p.setState(Qt::TouchPointStationary);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
void commit()
|
||||||
|
{
|
||||||
|
qt_translateRawTouchEvent(targetWidget, deviceType, points.values());
|
||||||
|
targetWidget = 0;
|
||||||
|
points.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
PySideQTouchEventSequence(QWidget *widget, QTouchEvent::DeviceType aDeviceType)
|
||||||
|
: targetWidget(widget), deviceType(aDeviceType)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
PySideQTouchEventSequence(const PySideQTouchEventSequence &v);
|
||||||
|
|
||||||
|
void operator=(const PySideQTouchEventSequence&);
|
||||||
|
|
||||||
|
QTouchEvent::TouchPoint &point(int touchId)
|
||||||
|
{
|
||||||
|
if (!points.contains(touchId))
|
||||||
|
points[touchId] = QTouchEvent::TouchPoint(touchId);
|
||||||
|
return points[touchId];
|
||||||
|
}
|
||||||
|
|
||||||
|
QPoint mapToScreen(QWidget *widget, const QPoint &pt)
|
||||||
|
{
|
||||||
|
if (widget)
|
||||||
|
return widget->mapToGlobal(pt);
|
||||||
|
return targetWidget ? targetWidget->mapToGlobal(pt) : pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMap<int, QTouchEvent::TouchPoint> points;
|
||||||
|
QWidget *targetWidget;
|
||||||
|
QTouchEvent::DeviceType deviceType;
|
||||||
|
friend PySideQTouchEventSequence* generateTouchEvent(QWidget *, QTouchEvent::DeviceType);
|
||||||
|
};
|
||||||
|
|
||||||
|
inline
|
||||||
|
PySideQTouchEventSequence* generateTouchEvent(QWidget *widget = 0,
|
||||||
|
QTouchEvent::DeviceType deviceType = QTouchEvent::TouchScreen)
|
||||||
|
{
|
||||||
|
return new PySideQTouchEventSequence(widget, deviceType);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#endif // PYSIDEQTESTTOUCH_H
|
||||||
Loading…
Add table
Add a link
Reference in a new issue