Implemented support to QEasingCurve.setCustomType.
fixes bug #725. Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
parent
923d007ab9
commit
cceea0af84
4 changed files with 174 additions and 9 deletions
120
PySide/QtCore/glue/qeasingcurve_glue.cpp
Normal file
120
PySide/QtCore/glue/qeasingcurve_glue.cpp
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
#include <Python.h>
|
||||
#include <shiboken.h>
|
||||
#include <pysideweakref.h>
|
||||
#include <QEasingCurve>
|
||||
|
||||
#include "glue/qeasingcurve_glue.h"
|
||||
|
||||
#define __ECF_ATT_NAME__ "__ecf__"
|
||||
#define MAX_CUSTOM_FUNCTIONS 10
|
||||
|
||||
static void deleteData(void* data);
|
||||
|
||||
struct CustomFunctionsData
|
||||
{
|
||||
static CustomFunctionsData m_list[MAX_CUSTOM_FUNCTIONS];
|
||||
|
||||
PySideEasingCurveFunctor* m_obj;
|
||||
QEasingCurve::EasingFunction m_func;
|
||||
};
|
||||
|
||||
CustomFunctionsData CustomFunctionsData::m_list[MAX_CUSTOM_FUNCTIONS];
|
||||
|
||||
template<int N>
|
||||
struct CustomFunctions
|
||||
{
|
||||
static void init()
|
||||
{
|
||||
CustomFunctionsData data;
|
||||
data.m_obj = 0;
|
||||
data.m_func = &CustomFunctions<N>::callback;
|
||||
CustomFunctionsData::m_list[N] = data;
|
||||
|
||||
CustomFunctions<N-1>::init();
|
||||
}
|
||||
|
||||
static qreal callback(qreal v)
|
||||
{
|
||||
return (*CustomFunctionsData::m_list[N].m_obj)(v);
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct CustomFunctions<0>
|
||||
{
|
||||
static void init()
|
||||
{
|
||||
CustomFunctionsData data;
|
||||
data.m_obj = 0;
|
||||
data.m_func = &CustomFunctions<0>::callback;
|
||||
CustomFunctionsData::m_list[0] = data;
|
||||
}
|
||||
|
||||
static qreal callback(qreal v)
|
||||
{
|
||||
return (*CustomFunctionsData::m_list[0].m_obj)(v);
|
||||
}
|
||||
};
|
||||
|
||||
void deleteData(void* data)
|
||||
{
|
||||
delete (PySideEasingCurveFunctor*)(data);
|
||||
}
|
||||
|
||||
void PySideEasingCurveFunctor::init()
|
||||
{
|
||||
CustomFunctions<MAX_CUSTOM_FUNCTIONS>::init();
|
||||
}
|
||||
|
||||
QEasingCurve::EasingFunction PySideEasingCurveFunctor::createCustomFuntion(PyObject* parent, PyObject* pyFunc)
|
||||
{
|
||||
for(int i=0; i < MAX_CUSTOM_FUNCTIONS; i++) {
|
||||
CustomFunctionsData& data = CustomFunctionsData::m_list[i];
|
||||
if (data.m_obj == 0) {
|
||||
data.m_obj = new PySideEasingCurveFunctor(i, parent, pyFunc);
|
||||
return data.m_func;
|
||||
}
|
||||
}
|
||||
//PyErr_Format(PyExc_RuntimeError, "PySide only supports %d custom functions simultaneously.", MAX_CUSTOM_FUNCTIONS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
PySideEasingCurveFunctor::~PySideEasingCurveFunctor()
|
||||
{
|
||||
|
||||
CustomFunctionsData::m_list[m_index].m_obj = 0;
|
||||
PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, Py_None);
|
||||
}
|
||||
|
||||
qreal PySideEasingCurveFunctor::operator()(qreal progress)
|
||||
{
|
||||
Shiboken::GilState state;
|
||||
PyObject* args = Py_BuildValue("(f)", progress);
|
||||
PyObject* result = PyObject_CallObject(m_func, args);
|
||||
qreal cppResult = 0.0;
|
||||
if (result) {
|
||||
cppResult = Shiboken::Converter<qreal>::toCpp(result);
|
||||
Py_DECREF(result);
|
||||
}
|
||||
Py_DECREF(args);
|
||||
return cppResult;
|
||||
}
|
||||
|
||||
PyObject* PySideEasingCurveFunctor::callable()
|
||||
{
|
||||
Py_INCREF(m_func);
|
||||
return m_func;
|
||||
}
|
||||
|
||||
PyObject* PySideEasingCurveFunctor::callable(PyObject* parent)
|
||||
{
|
||||
return PyObject_GetAttrString(parent, __ECF_ATT_NAME__);
|
||||
}
|
||||
|
||||
PySideEasingCurveFunctor::PySideEasingCurveFunctor(int index, PyObject* parent, PyObject* pyFunc)
|
||||
: m_parent(parent), m_func(pyFunc), m_index(index)
|
||||
{
|
||||
PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, m_func);
|
||||
PySide::WeakRef::create(m_parent, deleteData, this);
|
||||
}
|
||||
|
||||
27
PySide/QtCore/glue/qeasingcurve_glue.h
Normal file
27
PySide/QtCore/glue/qeasingcurve_glue.h
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
#ifndef __QEASINGCURVE_GLUE__
|
||||
#define __QEASINGCURVE_GLUE__
|
||||
|
||||
#include <Python.h>
|
||||
#include <QEasingCurve>
|
||||
|
||||
class PySideEasingCurveFunctor
|
||||
{
|
||||
public:
|
||||
static void init();
|
||||
static QEasingCurve::EasingFunction createCustomFuntion(PyObject* parent, PyObject* pyFunc);
|
||||
|
||||
qreal operator()(qreal progress);
|
||||
|
||||
PyObject* callable(); //Return New reference
|
||||
static PyObject* callable(PyObject* parent); //Return New reference
|
||||
|
||||
~PySideEasingCurveFunctor();
|
||||
private:
|
||||
PyObject* m_parent;
|
||||
PyObject* m_func;
|
||||
int m_index;
|
||||
|
||||
PySideEasingCurveFunctor(int index, PyObject* parent, PyObject *pyFunc);
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue