Two more small patches. P.S.: The shiboken patch needed to compile your binding with the pyside beta2 will land on mainline soon and will be part of beta3 for sure.
Regards On Wednesday 29 December 2010 08:15:04 机械唯物主义 : linjunhalida wrote: > looks like ~QwtPlotItem() is implemented in cpp file.. > I don't know what is wrong.. > > here is the source file: > http://qwt.sourceforge.net/qwt__plot__item_8h-source.html > > 2010/12/29 机械唯物主义 : linjunhalida <[email protected]>: > > Hello, I'm creating pyside-qwt binding, here is the project: > > http://gitorious.org/pysideqwt#more > > > > I'm new in shiboken, and everything is fine.... at first. > > > > here is the issue: QwtPlotItem is a virtual Class like this: > > > > class QWT_EXPORT QwtPlotItem: public QwtLegendItemManager > > { > > explicit QwtPlotItem(const QwtText &title = QwtText()); > > virtual ~QwtPlotItem(); > > .... > > } > > > > after I create PySideQwt.so, I run this python code: > > > > class MyItem(QwtPlotItem): > > pass > > > > and I got : > > > > TypeError: Error when calling the metaclass bases > > type 'PySideQwt.QwtPlotItem' is not an acceptable base type > > > > sould I create a ~QwtPlotItem(){} ? > > _______________________________________________ > PySide mailing list > [email protected] > http://lists.openbossa.org/listinfo/pyside -- Hugo Parente Lima INdT - Instituto Nokia de Tecnologia
From 92b6a76cba7b5ade9608485caa60dcb0e280bbf5 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima <[email protected]> Date: Wed, 29 Dec 2010 08:51:27 -0200 Subject: [PATCH 1/2] Fix compilation and remove unneeded cmake files in tests dir. --- qwt/CMakeLists.txt | 2 +- tests/CTestTestfile.cmake | 8 -------- tests/cmake_install.cmake | 34 ---------------------------------- 3 files changed, 1 insertions(+), 43 deletions(-) delete mode 100644 tests/CTestTestfile.cmake delete mode 100644 tests/cmake_install.cmake diff --git a/qwt/CMakeLists.txt b/qwt/CMakeLists.txt index 3b28a56..832b4e4 100644 --- a/qwt/CMakeLists.txt +++ b/qwt/CMakeLists.txt @@ -31,7 +31,7 @@ set(qwt_SRC # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtdoubleinterval_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtdoublerange_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtdyngridlayout_wrapper.cpp - # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwteventpattern_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwteventpattern_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwteventpattern_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwteventpattern_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtintervaldata_wrapper.cpp diff --git a/tests/CTestTestfile.cmake b/tests/CTestTestfile.cmake deleted file mode 100644 index 52aa4c0..0000000 --- a/tests/CTestTestfile.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# CMake generated Testfile for -# Source directory: /home/halida/data/workspace/pyside/PySideQwt/tests -# Build directory: /home/halida/data/workspace/pyside/PySideQwt/tests -# -# This file includes the relevent testing commands required for -# testing this directory and lists subdirectories to be tested as well. -ADD_TEST(qwt "/usr/bin/python2.6" "/home/halida/data/workspace/pyside/PySideQwt/tests/qwt_test.py") -SET_TESTS_PROPERTIES(qwt PROPERTIES ENVIRONMENT "PYTHONPATH=/home/halida/data/workspace/pyside/PySideQwt/qwt:/data/workspace/pyside/pkg/pyside-sandbox/lib/python2.6/site-packages;LD_LIBRARY_PATH=/home/halida/data/workspace/pyside/PySideQwt/../qwt-5.2:/data/workspace/pyside/pkg/pyside-sandbox//lib:") diff --git a/tests/cmake_install.cmake b/tests/cmake_install.cmake deleted file mode 100644 index 2eea5b8..0000000 --- a/tests/cmake_install.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Install script for directory: /home/halida/data/workspace/pyside/PySideQwt/tests - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -# Install shared libraries without execute permission? -IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - SET(CMAKE_INSTALL_SO_NO_EXE "1") -ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - -- 1.7.3.3
From c24b02691028f147c3a19fcc994ef9b681a15fa9 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima <[email protected]> Date: Wed, 29 Dec 2010 09:19:09 -0200 Subject: [PATCH 2/2] Remove files generated by the build proccess from git. --- CTestTestfile.cmake | 8 --- qwt/CMakeLists.txt | 4 +- qwt/CTestTestfile.cmake | 6 --- qwt/PySideQwt/qwtplot_wrapper.h | 80 ---------------------------------- qwt/PySideQwt/qwtplotcurve_wrapper.h | 24 ---------- qwt/PySideQwt/qwtplotitem_wrapper.h | 22 --------- qwt/_module_wrapper.cpp | 58 ------------------------ qwt/_python.h | 63 -------------------------- qwt/cmake_install.cmake | 34 -------------- qwt/typesystem_qwt.xml | 8 ++- 10 files changed, 7 insertions(+), 300 deletions(-) delete mode 100644 CTestTestfile.cmake delete mode 100644 qwt/CTestTestfile.cmake delete mode 100644 qwt/PySideQwt/qwtplot_wrapper.h delete mode 100644 qwt/PySideQwt/qwtplotcurve_wrapper.h delete mode 100644 qwt/PySideQwt/qwtplotitem_wrapper.h delete mode 100644 qwt/_module_wrapper.cpp delete mode 100644 qwt/_python.h delete mode 100644 qwt/cmake_install.cmake diff --git a/CTestTestfile.cmake b/CTestTestfile.cmake deleted file mode 100644 index c7e51d2..0000000 --- a/CTestTestfile.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# CMake generated Testfile for -# Source directory: /home/halida/data/workspace/pyside/PySideQwt -# Build directory: /home/halida/data/workspace/pyside/PySideQwt -# -# This file includes the relevent testing commands required for -# testing this directory and lists subdirectories to be tested as well. -SUBDIRS(qwt) -SUBDIRS(tests) diff --git a/qwt/CMakeLists.txt b/qwt/CMakeLists.txt index 832b4e4..5121bd5 100644 --- a/qwt/CMakeLists.txt +++ b/qwt/CMakeLists.txt @@ -36,9 +36,9 @@ set(qwt_SRC # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwteventpattern_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtintervaldata_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtknob_wrapper.cpp - # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlegend_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlegend_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlegenditem_wrapper.cpp - # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlegenditemmanager_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlegenditemmanager_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlinearcolormap_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlinearscaleengine_wrapper.cpp # ${CMAKE_CURRENT_BINARY_DIR}/PySideQwt/qwtlog10scaleengine_wrapper.cpp diff --git a/qwt/CTestTestfile.cmake b/qwt/CTestTestfile.cmake deleted file mode 100644 index 442c5c9..0000000 --- a/qwt/CTestTestfile.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# CMake generated Testfile for -# Source directory: /home/halida/data/workspace/pyside/PySideQwt/qwt -# Build directory: /home/halida/data/workspace/pyside/PySideQwt/qwt -# -# This file includes the relevent testing commands required for -# testing this directory and lists subdirectories to be tested as well. diff --git a/qwt/PySideQwt/qwtplot_wrapper.h b/qwt/PySideQwt/qwtplot_wrapper.h deleted file mode 100644 index 72ca180..0000000 --- a/qwt/PySideQwt/qwtplot_wrapper.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef SBK_QWTPLOTWRAPPER_H -#define SBK_QWTPLOTWRAPPER_H - -#define protected public - -#include <shiboken.h> - -#include <qwt_plot.h> - -namespace PySide { class DynamicQMetaObject; } - -class QwtPlotWrapper : public QwtPlot -{ -public: - QwtPlotWrapper(QWidget * arg__1 = 0); - virtual void actionEvent(QActionEvent * arg__1); - virtual void changeEvent(QEvent * arg__1); - virtual void childEvent(QChildEvent * arg__1); - virtual void clear(); - virtual void closeEvent(QCloseEvent * arg__1); - virtual void connectNotify(const char * signal); - virtual void contextMenuEvent(QContextMenuEvent * arg__1); - virtual void customEvent(QEvent * arg__1); - virtual int devType() const; - virtual void disconnectNotify(const char * signal); - virtual void dragEnterEvent(QDragEnterEvent * arg__1); - virtual void dragLeaveEvent(QDragLeaveEvent * arg__1); - virtual void dragMoveEvent(QDragMoveEvent * arg__1); - virtual void drawCanvas(QPainter * arg__1); - virtual void dropEvent(QDropEvent * arg__1); - virtual void enterEvent(QEvent * arg__1); - virtual bool event(QEvent * arg__1); - virtual bool eventFilter(QObject * arg__1, QEvent * arg__2); - virtual void focusInEvent(QFocusEvent * arg__1); - virtual bool focusNextPrevChild(bool next); - virtual void focusOutEvent(QFocusEvent * arg__1); - virtual int heightForWidth(int arg__1) const; - virtual void hideEvent(QHideEvent * arg__1); - virtual void inputMethodEvent(QInputMethodEvent * arg__1); - virtual QVariant inputMethodQuery(Qt::InputMethodQuery arg__1) const; - virtual void keyPressEvent(QKeyEvent * arg__1); - virtual void keyReleaseEvent(QKeyEvent * arg__1); - virtual void languageChange(); - virtual void leaveEvent(QEvent * arg__1); - virtual void legendItemChecked(bool arg__1); - virtual void legendItemClicked(); - virtual const QMetaObject * metaObject() const; - virtual int metric(QPaintDevice::PaintDeviceMetric arg__1) const; - virtual QSize minimumSizeHint() const; - virtual void mouseDoubleClickEvent(QMouseEvent * arg__1); - virtual void mouseMoveEvent(QMouseEvent * arg__1); - virtual void mousePressEvent(QMouseEvent * arg__1); - virtual void mouseReleaseEvent(QMouseEvent * arg__1); - virtual void moveEvent(QMoveEvent * arg__1); - virtual QPaintEngine * paintEngine() const; - virtual void paintEvent(QPaintEvent * arg__1); - virtual void polish(); - virtual void printLegend(QPainter * arg__1, const QRect & arg__2) const; - virtual void printLegendItem(QPainter * arg__1, const QWidget * arg__2, const QRect & arg__3) const; - virtual void printScale(QPainter * arg__1, int axisId, int startDist, int endDist, int baseDist, const QRect & arg__6) const; - virtual void printTitle(QPainter * arg__1, const QRect & arg__2) const; - virtual void replot(); - virtual void resizeEvent(QResizeEvent * e); - virtual void setVisible(bool visible); - virtual void showEvent(QShowEvent * arg__1); - virtual QSize sizeHint() const; - virtual void tabletEvent(QTabletEvent * arg__1); - virtual void timerEvent(QTimerEvent * arg__1); - virtual void updateLayout(); - virtual void updateTabOrder(); - virtual void wheelEvent(QWheelEvent * arg__1); - virtual ~QwtPlotWrapper(); -public: - virtual int qt_metacall(QMetaObject::Call call, int id, void** args); -private: - mutable PySide::DynamicQMetaObject* m_metaObject; -}; - -#endif // SBK_QWTPLOTWRAPPER_H - diff --git a/qwt/PySideQwt/qwtplotcurve_wrapper.h b/qwt/PySideQwt/qwtplotcurve_wrapper.h deleted file mode 100644 index a11e0db..0000000 --- a/qwt/PySideQwt/qwtplotcurve_wrapper.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SBK_QWTPLOTCURVEWRAPPER_H -#define SBK_QWTPLOTCURVEWRAPPER_H - -#define protected public - -#include <shiboken.h> - -#include <qwt_plot_curve.h> - -class QwtPlotCurveWrapper : public QwtPlotCurve -{ -public: - QwtPlotCurveWrapper(); - QwtPlotCurveWrapper(const QString & title); - virtual QRectF boundingRect() const; - virtual void itemChanged(); - virtual QWidget * legendItem() const; - virtual int rtti() const; - virtual void setVisible(bool arg__1); - virtual ~QwtPlotCurveWrapper(); -}; - -#endif // SBK_QWTPLOTCURVEWRAPPER_H - diff --git a/qwt/PySideQwt/qwtplotitem_wrapper.h b/qwt/PySideQwt/qwtplotitem_wrapper.h deleted file mode 100644 index e8fea61..0000000 --- a/qwt/PySideQwt/qwtplotitem_wrapper.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef SBK_QWTPLOTITEMWRAPPER_H -#define SBK_QWTPLOTITEMWRAPPER_H - -#define protected public - -#include <shiboken.h> - -#include <qwt_plot_item.h> - -class QwtPlotItemWrapper : public QwtPlotItem -{ -public: - virtual QRectF boundingRect() const; - virtual void itemChanged(); - virtual QWidget * legendItem() const; - virtual int rtti() const; - virtual void setVisible(bool arg__1); - virtual ~QwtPlotItemWrapper(); -}; - -#endif // SBK_QWTPLOTITEMWRAPPER_H - diff --git a/qwt/_module_wrapper.cpp b/qwt/_module_wrapper.cpp deleted file mode 100644 index ce89382..0000000 --- a/qwt/_module_wrapper.cpp +++ /dev/null @@ -1,58 +0,0 @@ - -#include <Python.h> -#include <shiboken.h> -#include <algorithm> -#include "_python.h" - - - -// Extra includes - -// Global functions ------------------------------------------------------------ - -static PyMethodDef _methods[] = { - {0} // Sentinel -}; - -// Classes initialization functions ------------------------------------------------------------ - -PyTypeObject** SbkTypes; - -PyTypeObject** SbkPySide_QtCoreTypes; - -// Module initialization ------------------------------------------------------------ - -#if defined _WIN32 || defined __CYGWIN__ - #define SBK_EXPORT_MODULE __declspec(dllexport) -#elif __GNUC__ >= 4 - #define SBK_EXPORT_MODULE __attribute__ ((visibility("default"))) -#else - #define SBK_EXPORT_MODULE -#endif - -extern "C" SBK_EXPORT_MODULE void init() -{ - if (!Shiboken::importModule("PySide.QtCore", &SbkPySide_QtCoreTypes)) { - PyErr_SetString(PyExc_ImportError,"could not import PySide.QtCore"); - return; - } - - Shiboken::init(); - PyObject* module = Py_InitModule("", _methods); - - // Create a CObject containing the API pointer array's address - static PyTypeObject* cppApi[SBK__IDX_COUNT]; - SbkTypes = cppApi; - PyObject* cppApiObject = PyCObject_FromVoidPtr(reinterpret_cast<void*>(cppApi), 0); - PyModule_AddObject(module, "_Cpp_Api", cppApiObject); - - // Initialize classes in the type system - - // Register primitive types on TypeResolver - - if (PyErr_Occurred()) { - PyErr_Print(); - Py_FatalError("can't initialize module "); - } -} - diff --git a/qwt/_python.h b/qwt/_python.h deleted file mode 100644 index 5a99024..0000000 --- a/qwt/_python.h +++ /dev/null @@ -1,63 +0,0 @@ - - -#ifndef SBK__PYTHON_H -#define SBK__PYTHON_H - -//workaround to access protected functions -#define protected public - -#include <Python.h> -#include <conversions.h> -#include <sbkenum.h> -#include <basewrapper.h> -#include <bindingmanager.h> -#include <memory> - -#include <pysidesignal.h> -// Module Includes -#include <pyside_qtcore_python.h> - -// Binded library includes -// Conversion Includes - Primitive Types -#include <QString> -#include <signalmanager.h> -#include <typeresolver.h> -#include <QtConcurrentFilter> -#include <QTextDocument> - -// Conversion Includes - Container Types -#include <QList> -#include <QMap> -#include <QStack> -#include <QMultiMap> -#include <QVector> -#include <QPair> -#include <pysideconversions.h> -#include <QSet> -#include <qqueue.h> -#include <QStringList> -#include <qlinkedlist.h> - -// Type indices -#define SBK__IDX_COUNT 0 - -// This variable stores all python types exported by this module -extern PyTypeObject** SbkTypes; - -// Macros for type check - -namespace Shiboken -{ - -// PyType functions, to get the PyObjectType for a type T - -// Generated converters declarations ---------------------------------- - -} // namespace Shiboken - -// User defined converters -------------------------------------------- -// Generated converters implemantations ------------------------------- - - -#endif // SBK__PYTHON_H - diff --git a/qwt/cmake_install.cmake b/qwt/cmake_install.cmake deleted file mode 100644 index aa9ce35..0000000 --- a/qwt/cmake_install.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Install script for directory: /home/halida/data/workspace/pyside/PySideQwt/qwt - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -# Install shared libraries without execute permission? -IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - SET(CMAKE_INSTALL_SO_NO_EXE "1") -ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - diff --git a/qwt/typesystem_qwt.xml b/qwt/typesystem_qwt.xml index 50c3616..0f3c66c 100644 --- a/qwt/typesystem_qwt.xml +++ b/qwt/typesystem_qwt.xml @@ -4,7 +4,7 @@ <load-typesystem name="typesystem_gui_common.xml" generate="no" /> <object-type name="QwtPlot"> - <enum-type name="Axis" /> + <enum-type name="Axis" /> <enum-type name="LegendPosition" /> </object-type> @@ -52,9 +52,11 @@ <!-- <object-type name="QwtEventPattern" /> --> <!-- <object-type name="QwtIntervalData" /> --> <!-- <object-type name="QwtKnob" /> --> - <!-- <object-type name="QwtLegend" /> --> + <object-type name="QwtLegend"> + <enum-type name="LegendDisplayPolicy" /> + </object-type> <!-- <object-type name="QwtLegendItem" /> --> - <!-- <object-type name="QwtLegendItemManager" /> --> + <object-type name="QwtLegendItemManager" /> <!-- <object-type name="QwtLinearColorMap" /> --> <!-- <object-type name="QwtLinearScaleEngine" /> --> <!-- <object-type name="QwtLog10ScaleEngine" /> --> -- 1.7.3.3
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ PySide mailing list [email protected] http://lists.openbossa.org/listinfo/pyside
