Commit f3779eff authored by guijarro's avatar guijarro
Browse files

fixed bug with qttools compilation: added #include <qvariant.h>

in sip file for QtXEmbedClient and QtXEmbedController

added qttools compilation in setup.py
parent d5d25bcb
......@@ -27,6 +27,7 @@ public:
class QtXEmbedClient : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
......@@ -57,6 +58,7 @@ protected:
class QtXEmbedContainer : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
public:
......
%Import qt/qtmod.sip
%Module qttools 0
%Doc
<h1>Class qttools</h1>
<p>
This class is use to access to variable and fonction which is not wrap in qt module
</p>
%End
class qttools
{
%TypeHeaderCode
#include <qttools_qttools.h>
%End
public:
static bool get_qt_resolve_symlinks();
static void set_qt_resolve_symlinks(bool);
};
class QtXEmbedClient : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
public:
QtXEmbedClient(QWidget* = 0, const char * = 0);
~QtXEmbedClient();
void embedInto(WId);
WId containerWinId() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void embedded();
void containerClosed();
void error(int);
protected:
bool eventFilter(QObject *, QEvent *);
void setEmbedded();
};
class QtXEmbedContainer : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
public:
QtXEmbedContainer(QWidget* = 0,const char * = 0);
~QtXEmbedContainer();
void embed(WId,bool = true);
void discardClient();
WId clientWinId() const;
QSize minimumSizeHint() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void clientIsEmbedded();
void clientClosed();
void error(int);
protected:
bool eventFilter(QObject *, QEvent *);
void resizeEvent(QResizeEvent *);
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
bool isEmbedded() const;
void moveInputToProxy();
void acceptClient(WId);
void rejectClient(WId);
void checkGrab();
WId topLevelParentWinId() const;
};
class QubImage : QImage
{
%TypeHeaderCode
#include <qubimage.h>
%End
public:
enum rawType {RGB555,RGB565};
QubImage();
QubImage(const QImage &);
QubImage(const QubImage &);
explicit QubImage(rawType,int ,int ,const char *);
void highlightImage(int ,int ,int ,int );
void unhighlightImage(int ,int ,int ,int );
void erase(int,int,int,int);
void setGray(int,int,int,int);
QubImage copy () const;
QubImage copy ( int, int , int, int , int = 0 ) const;
QubImage copy ( const QRect & r ) const;
};
class BgrImageMmap
{
%TypeHeaderCode
#include "qttools_mmap.h"
%End
public:
BgrImageMmap(const char *aFilePath);
~BgrImageMmap();
int getImageCount();
QImage getNewImage();
};
......@@ -71,6 +71,14 @@ mar345_module = Extension(name = "Qub.CTools/mar345",
extra_link_args = extra_link_args,
include_dirs = ['Qub/CTools/mar345',numpy.get_include()])
qttools_module = Extension(name = "Qub.CTools/qttools",
sources = ["Qub/CTools/qttools/%s.sip" % (QT3 and "qttools_qt3" or "qttools_qt4")]+glob.glob('Qub/CTools/qttools/qttools*cpp'),
extra_compile_args = extra_compile_args,
extra_link_args = extra_link_args+['-l'+qt_lib],
include_dirs = ['Qub/CTools/qttools',numpy.get_include(), qt_inc_dir],
library_dirs = [qt_lib_dir])
pixmaptools_module = Extension(name = "Qub.CTools/pixmaptools",
sources = ["Qub/CTools/pixmaptools/%s.sip" % (QT3 and "pixmaptools_qt3" or "pixmaptools_qt4")]+glob.glob('Qub/CTools/pixmaptools/pixmaptools_*.cpp'),
extra_compile_args = extra_compile_args,
......@@ -84,6 +92,6 @@ setup(name = "Qub",version = "1.0",
author="Sebastien Petitdemange, BCU(Bliss), ESRF",
packages = ["Qub", "Qub.CTools", "Qub.Data", "Qub.Data.Plug", "Qub.Data.Source", "Qub.Data.StreamIO", "Qub.Data.Scale", "Qub.Data.Class", "Qub.Icons", "Qub.Objects", "Qub.Objects.Mosaic", "Qub.Plugins", "Qub.Print", "Qub.Tools", "Qub.Widget", "Qub.Widget.DataSource", "Qub.Widget.Graph"],
package_data = {"Qub.Icons":["IconsLibrary/*"]},
ext_modules=[polygone_module,dataresize_module,sps_module,mar345_module,pixmaptools_module],
ext_modules=[polygone_module,dataresize_module,mar345_module,pixmaptools_module, qttools_module],
cmdclass={'build_ext': my_own_build_ext})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment