diff options
45 files changed, 207 insertions, 119 deletions
diff --git a/src/datavis3d/datavis3d.pro b/src/datavis3d/datavis3d.pro index b4169c4e..63091c55 100644 --- a/src/datavis3d/datavis3d.pro +++ b/src/datavis3d/datavis3d.pro @@ -1,7 +1,7 @@ TARGET = QtDataVis3D QT = core gui opengl #qml -DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY +DEFINES += QTENTERPRISE_DATAVIS3D_LIBRARY QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 299b874c..d642b645 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -62,7 +62,7 @@ public: }; StaticLibInitializer staticLibInitializer; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE Drawer::Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency) : m_theme(theme), @@ -308,4 +308,4 @@ void Drawer::generateLabelItem(LabelItem *item, const QString &text) item->setTextureId(m_textureHelper->create2DTexture(label, true, true)); } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h index 3b6a2c49..5330a4aa 100644 --- a/src/datavis3d/engine/drawer_p.h +++ b/src/datavis3d/engine/drawer_p.h @@ -59,7 +59,7 @@ #include "labelitem_p.h" #include <QFont> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class ShaderHelper; @@ -101,6 +101,6 @@ private: TextureHelper *m_textureHelper; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/labelitem.cpp b/src/datavis3d/engine/labelitem.cpp index 6ce0663c..19051dd7 100644 --- a/src/datavis3d/engine/labelitem.cpp +++ b/src/datavis3d/engine/labelitem.cpp @@ -41,7 +41,7 @@ #include "labelitem_p.h" -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE LabelItem::LabelItem() : m_size(QSize(0, 0)), @@ -73,4 +73,4 @@ GLuint LabelItem::textureId() return m_textureId; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/labelitem_p.h b/src/datavis3d/engine/labelitem_p.h index 49693631..47e480b2 100644 --- a/src/datavis3d/engine/labelitem_p.h +++ b/src/datavis3d/engine/labelitem_p.h @@ -56,7 +56,7 @@ #include <QOpenGLFunctions> #include <QSize> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class LabelItem { @@ -74,6 +74,6 @@ private: GLuint m_textureId; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index 41a52aad..f5939df3 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp @@ -76,7 +76,7 @@ #include <QTime> #endif -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE //#define USE_HAX0R_SELECTION // keep this defined until the "real" method works #define DISPLAY_FULL_DATA_ON_SELECTION // Append selection value text with row and column labels @@ -2309,4 +2309,4 @@ void Q3DBarsPrivate::closeZoomMode() m_sceneViewPort = QRect(0, 0, q_ptr->width(), q_ptr->height()); } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h index 5a93c2da..4425c568 100644 --- a/src/datavis3d/engine/q3dbars.h +++ b/src/datavis3d/engine/q3dbars.h @@ -48,7 +48,7 @@ class QOpenGLShaderProgram; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DBarsPrivate; class QDataItem; @@ -56,7 +56,7 @@ class QDataRow; class QDataSet; class LabelItem; -class QTCOMMERCIALDATAVIS3D_EXPORT Q3DBars : public Q3DWindow +class QTENTERPRISE_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow { Q_OBJECT public: @@ -166,6 +166,6 @@ private: Q_DISABLE_COPY(Q3DBars) }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h index c66e0e33..4a0c10d9 100644 --- a/src/datavis3d/engine/q3dbars_p.h +++ b/src/datavis3d/engine/q3dbars_p.h @@ -62,7 +62,7 @@ class QOpenGLPaintDevice; class QPoint; class QSizeF; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DBars; class QDataItem; @@ -182,6 +182,6 @@ public: bool m_negativeValues; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp index f08a9dda..48c16f1f 100644 --- a/src/datavis3d/engine/q3dmaps.cpp +++ b/src/datavis3d/engine/q3dmaps.cpp @@ -76,7 +76,7 @@ #include <QTime> #endif -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE //#define DISPLAY_FULL_DATA_ON_SELECTION // Append selection value text with row and column labels @@ -1694,4 +1694,4 @@ bool Q3DMapsPrivate::isValid(const QDataItem &item) return retval; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h index d4ba4842..61373b7a 100644 --- a/src/datavis3d/engine/q3dmaps.h +++ b/src/datavis3d/engine/q3dmaps.h @@ -50,7 +50,7 @@ class QOpenGLShaderProgram; class QImage; class QRect; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DMapsPrivate; class QDataItem; @@ -58,7 +58,7 @@ class QDataRow; class QDataSet; class LabelItem; -class QTCOMMERCIALDATAVIS3D_EXPORT Q3DMaps : public Q3DWindow +class QTENTERPRISE_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow { Q_OBJECT public: @@ -165,6 +165,6 @@ private: Q_DISABLE_COPY(Q3DMaps); }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/datavis3d/engine/q3dmaps_p.h index e03c8656..707dabac 100644 --- a/src/datavis3d/engine/q3dmaps_p.h +++ b/src/datavis3d/engine/q3dmaps_p.h @@ -62,7 +62,7 @@ class QOpenGLPaintDevice; class QPoint; class QSizeF; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DMaps; class QDataItem; @@ -170,6 +170,6 @@ public: bool m_bgrHasAlpha; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index a49a1cc4..359947c8 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp @@ -50,7 +50,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE Q3DWindow::Q3DWindow(QWindow *parent) : QWindow(parent), @@ -172,4 +172,4 @@ Q3DWindowPrivate::~Q3DWindowPrivate() { } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h index 9958f7d9..edabcf76 100644 --- a/src/datavis3d/engine/q3dwindow.h +++ b/src/datavis3d/engine/q3dwindow.h @@ -49,11 +49,11 @@ class QPainter; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindowPrivate; -class QTCOMMERCIALDATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions +class QTENTERPRISE_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions { Q_OBJECT public: @@ -81,6 +81,6 @@ private: friend class Q3DBars; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/datavis3d/engine/q3dwindow_p.h index ef786fb3..4c6c5209 100644 --- a/src/datavis3d/engine/q3dwindow_p.h +++ b/src/datavis3d/engine/q3dwindow_p.h @@ -57,7 +57,7 @@ class QOpenGLContext; class QOpenGLPaintDevice; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindow; @@ -76,6 +76,6 @@ public: QOpenGLContext *m_context; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem.cpp b/src/datavis3d/engine/qdataitem.cpp index 14d6c85f..8134fcb5 100644 --- a/src/datavis3d/engine/qdataitem.cpp +++ b/src/datavis3d/engine/qdataitem.cpp @@ -45,17 +45,15 @@ #include <QPoint> #include <QString> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE QDataItem::QDataItem(float value, const QString &label) : d_ptr(new QDataItemPrivate(this, value, label)) { - //qDebug("QDataItem"); } QDataItem::~QDataItem() { - //qDebug("~QDataItem"); } void QDataItem::setLabel(const QString &label, bool prepend) @@ -64,6 +62,11 @@ void QDataItem::setLabel(const QString &label, bool prepend) d_ptr->m_prependLabel = prepend; } +QString QDataItem::label() +{ + return d_ptr->m_labelString; +} + void QDataItem::setValue(float value) { d_ptr->m_value = value; @@ -74,6 +77,11 @@ void QDataItem::setValue(int value) d_ptr->m_value = (float)value; } +float QDataItem::value() +{ + return d_ptr->m_value; +} + void QDataItem::setPosition(const QPointF &position) { d_ptr->m_position = position; @@ -84,6 +92,11 @@ void QDataItem::setPosition(const QPoint &position) d_ptr->m_position = (QPointF)position; } +QPointF QDataItem::position() +{ + return d_ptr->m_position; +} + QDataItemPrivate::QDataItemPrivate(QDataItem *q, float value, const QString &label) : q_ptr(q), m_value(value), @@ -155,4 +168,4 @@ QPointF QDataItemPrivate::position() return m_position; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataitem.h b/src/datavis3d/engine/qdataitem.h index 88d54faf..0106502f 100644 --- a/src/datavis3d/engine/qdataitem.h +++ b/src/datavis3d/engine/qdataitem.h @@ -45,26 +45,37 @@ #include "QtDataVis3D/qdatavis3dglobal.h" #include <QScopedPointer> #include <QString> +#include <QObject> +#include <QPointF> -class QPointF; class QPoint; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate; -class QTCOMMERCIALDATAVIS3D_EXPORT QDataItem +class QTENTERPRISE_DATAVIS3D_EXPORT QDataItem : public QObject { + Q_OBJECT + Q_PROPERTY(QString label READ label WRITE setLabel) + Q_PROPERTY(float value READ value WRITE setValue) + Q_PROPERTY(int value READ value WRITE setValue) + Q_PROPERTY(int value READ value WRITE setValue) + Q_PROPERTY(QPointF position READ position WRITE setPosition) + public: explicit QDataItem(float value = 0.0f, const QString &label = QString()); ~QDataItem(); void setLabel(const QString &label, bool prepend = false); // label for value, unit for example + QString label(); void setValue(float value); void setValue(int value); + float value(); // Has no effect in Q3DBars void setPosition(const QPointF &position); void setPosition(const QPoint &position); + QPointF position(); private: QScopedPointer<QDataItemPrivate> d_ptr; @@ -76,6 +87,6 @@ private: friend class Drawer; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem_p.h b/src/datavis3d/engine/qdataitem_p.h index f14fe175..6b8a9b83 100644 --- a/src/datavis3d/engine/qdataitem_p.h +++ b/src/datavis3d/engine/qdataitem_p.h @@ -55,12 +55,13 @@ #include "qdatavis3dglobal.h" #include "qdataitem.h" #include "labelitem_p.h" + #include <QOpenGLFunctions> #include <QSize> #include <QString> #include <QVector3D> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate { @@ -96,6 +97,6 @@ class QDataItemPrivate friend class QDataItem; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow.cpp b/src/datavis3d/engine/qdatarow.cpp index f4a9e984..79bc48e1 100644 --- a/src/datavis3d/engine/qdatarow.cpp +++ b/src/datavis3d/engine/qdatarow.cpp @@ -46,17 +46,15 @@ #include <QString> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE QDataRow::QDataRow(const QString &label) : d_ptr(new QDataRowPrivate(this, label)) { - //qDebug("QDataRow"); } QDataRow::~QDataRow() { - //qDebug("~QDataRow"); } void QDataRow::setLabel(const QString &label) @@ -64,6 +62,11 @@ void QDataRow::setLabel(const QString &label) d_ptr->m_label = label; } +QString QDataRow::label() +{ + return d_ptr->m_label; +} + void QDataRow::addItem(QDataItem *item) { d_ptr->m_row.prepend(item); @@ -147,4 +150,4 @@ LabelItem QDataRowPrivate::labelItem() return m_labelItem; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdatarow.h b/src/datavis3d/engine/qdatarow.h index 766ae541..2cdccfb5 100644 --- a/src/datavis3d/engine/qdatarow.h +++ b/src/datavis3d/engine/qdatarow.h @@ -45,20 +45,25 @@ #include "QtDataVis3D/qdatavis3dglobal.h" #include <QScopedPointer> #include <QString> +#include <QObject> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataRowPrivate; class QDataItem; -class QTCOMMERCIALDATAVIS3D_EXPORT QDataRow +class QTENTERPRISE_DATAVIS3D_EXPORT QDataRow : public QObject { + Q_OBJECT + Q_PROPERTY(QString label READ label WRITE setLabel) + public: explicit QDataRow(const QString &label = QString()); ~QDataRow(); void setLabel(const QString &label); // label for value, unit for example - void addItem(QDataItem *item); + QString label(); + Q_INVOKABLE void addItem(QDataItem *item); private: QScopedPointer<QDataRowPrivate> d_ptr; @@ -69,6 +74,6 @@ private: friend class QDataSetPrivate; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow_p.h b/src/datavis3d/engine/qdatarow_p.h index 3a1adeee..d563fe8a 100644 --- a/src/datavis3d/engine/qdatarow_p.h +++ b/src/datavis3d/engine/qdatarow_p.h @@ -58,7 +58,7 @@ #include <QVector> #include <QString> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; @@ -86,6 +86,6 @@ private: friend class QDataRow; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset.cpp b/src/datavis3d/engine/qdataset.cpp index 5af920d2..ab892127 100644 --- a/src/datavis3d/engine/qdataset.cpp +++ b/src/datavis3d/engine/qdataset.cpp @@ -49,7 +49,7 @@ //#include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE const QString empty; @@ -268,4 +268,4 @@ void QDataSetPrivate::updateTextures() } } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataset.h b/src/datavis3d/engine/qdataset.h index 118d3df9..02269a27 100644 --- a/src/datavis3d/engine/qdataset.h +++ b/src/datavis3d/engine/qdataset.h @@ -50,12 +50,14 @@ #include <QVector> #include <QString> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate; -class QTCOMMERCIALDATAVIS3D_EXPORT QDataSet +class QTENTERPRISE_DATAVIS3D_EXPORT QDataSet : public QObject { + Q_OBJECT + public: explicit QDataSet(); ~QDataSet(); @@ -75,6 +77,6 @@ private: friend class Q3DMapsPrivate; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset_p.h b/src/datavis3d/engine/qdataset_p.h index 90dc5329..a259aa9a 100644 --- a/src/datavis3d/engine/qdataset_p.h +++ b/src/datavis3d/engine/qdataset_p.h @@ -59,7 +59,7 @@ #include <QVector> #include <QString> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate : public QObject { @@ -102,6 +102,6 @@ private: friend class QDataSet; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp index 9032497e..4a258b67 100644 --- a/src/datavis3d/engine/theme.cpp +++ b/src/datavis3d/engine/theme.cpp @@ -46,7 +46,7 @@ #include <stdio.h> #endif -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE Theme::Theme() : m_baseColor(QColor(Qt::gray)), @@ -295,4 +295,4 @@ void Theme::useTheme(ColorTheme theme) } } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/theme_p.h b/src/datavis3d/engine/theme_p.h index d55e9a33..9ed97e6b 100644 --- a/src/datavis3d/engine/theme_p.h +++ b/src/datavis3d/engine/theme_p.h @@ -58,7 +58,7 @@ class QColor; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Theme { @@ -92,6 +92,6 @@ private: bool m_uniformColor; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index 528180b3..7e135937 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h @@ -25,47 +25,47 @@ //#define ROTATE_ZOOM_SELECTION -#define QTCOMMERCIALDATAVIS3D_VERSION_STR "0.0.1" +#define QTENTERPRISE_DATAVIS3D_VERSION_STR "0.0.1" /* - QTCOMMERCIALDATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. + QTENTERPRISE_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QTCOMMERCIALDATAVIS3D_VERSION 0x000001 +#define QTENTERPRISE_DATAVIS3D_VERSION 0x000001 /* - can be used like #if (QTCOMMERCIALDATAVIS3D_VERSION >= QTCOMMERCIALDATAVIS3D_VERSION_CHECK(1, 1, 0)) + can be used like #if (QTENTERPRISE_DATAVIS3D_VERSION >= QTENTERPRISE_DATAVIS3D_VERSION_CHECK(1, 1, 0)) */ -#define QTCOMMERCIALDATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +#define QTENTERPRISE_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_EXPORT Q_DECL_EXPORT +#if defined(QTENTERPRISE_DATAVIS3D_LIBRARY) +# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_EXPORT #else -# define QTCOMMERCIALDATAVIS3D_EXPORT Q_DECL_IMPORT +# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_IMPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT +#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTENTERPRISE_DATAVIS3D_LIBRARY) +# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT +#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTENTERPRISE_DATAVIS3D_LIBRARY) +# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT #else -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT +# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT #endif -#ifdef QTCOMMERCIALDATAVIS3D_STATICLIB -# undef QTCOMMERCIALDATAVIS3D_EXPORT -# undef QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT -# define QTCOMMERCIALDATAVIS3D_EXPORT -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT +#ifdef QTENTERPRISE_DATAVIS3D_STATICLIB +# undef QTENTERPRISE_DATAVIS3D_EXPORT +# undef QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT +# define QTENTERPRISE_DATAVIS3D_EXPORT +# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT #endif -#define QTCOMMERCIALDATAVIS3D_NAMESPACE QtDataVis3D +#define QTENTERPRISE_DATAVIS3D_NAMESPACE QtDataVis3D -#ifdef QTCOMMERCIALDATAVIS3D_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE namespace QTCOMMERCIALDATAVIS3D_NAMESPACE { -# define QTCOMMERCIALDATAVIS3D_END_NAMESPACE } -# define QTCOMMERCIALDATAVIS3D_USE_NAMESPACE using namespace QTCOMMERCIALDATAVIS3D_NAMESPACE; +#ifdef QTENTERPRISE_DATAVIS3D_NAMESPACE +# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE namespace QTENTERPRISE_DATAVIS3D_NAMESPACE { +# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE } +# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE using namespace QTENTERPRISE_DATAVIS3D_NAMESPACE; #else -# define QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_END_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_USE_NAMESPACE +# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE +# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE #endif #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG) diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/datavis3d/global/qdatavis3namespace.h index c73d494b..4d1d7afc 100644 --- a/src/datavis3d/global/qdatavis3namespace.h +++ b/src/datavis3d/global/qdatavis3namespace.h @@ -46,7 +46,7 @@ #include <QOpenGLFunctions> #include <QVector3D> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE // Constants used in several files const GLfloat m_pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679f; @@ -142,6 +142,6 @@ enum ShadowQuality { ShadowHigh = 5 }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/datavis3d/utils/camerahelper.cpp index 28b857c9..4d59132f 100644 --- a/src/datavis3d/utils/camerahelper.cpp +++ b/src/datavis3d/utils/camerahelper.cpp @@ -45,7 +45,7 @@ #include <QMatrix4x4> #include <QVector3D> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE // Initial camera position QVector3D m_position = QVector3D(0, 0.25, 3); @@ -307,4 +307,4 @@ void CameraHelper::setCameraPreset(CameraPreset preset) } } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/datavis3d/utils/camerahelper_p.h index 77041175..21b6ccac 100644 --- a/src/datavis3d/utils/camerahelper_p.h +++ b/src/datavis3d/utils/camerahelper_p.h @@ -61,7 +61,7 @@ class QVector3D; class QPoint; class QPointF; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class CameraHelper { @@ -89,6 +89,6 @@ class CameraHelper static void setCameraPreset(CameraPreset preset); }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/meshloader.cpp b/src/datavis3d/utils/meshloader.cpp index 0e818a92..0bb780ce 100644 --- a/src/datavis3d/utils/meshloader.cpp +++ b/src/datavis3d/utils/meshloader.cpp @@ -49,7 +49,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE QString slashTag = QStringLiteral("/"); @@ -145,4 +145,4 @@ bool MeshLoader::loadOBJ(const QString &path, return true; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/meshloader_p.h b/src/datavis3d/utils/meshloader_p.h index 514ae5c6..88ab89b3 100644 --- a/src/datavis3d/utils/meshloader_p.h +++ b/src/datavis3d/utils/meshloader_p.h @@ -57,7 +57,7 @@ class QVector2D; class QVector3D; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class MeshLoader { @@ -69,6 +69,6 @@ class MeshLoader // TODO: add loaders for other formats? }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/datavis3d/utils/objecthelper.cpp index 6659a187..eaae52be 100644 --- a/src/datavis3d/utils/objecthelper.cpp +++ b/src/datavis3d/utils/objecthelper.cpp @@ -45,7 +45,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile), @@ -162,4 +162,4 @@ GLuint ObjectHelper::indexCount() return m_indexCount; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/datavis3d/utils/objecthelper_p.h index f3e342ba..6cac8770 100644 --- a/src/datavis3d/utils/objecthelper_p.h +++ b/src/datavis3d/utils/objecthelper_p.h @@ -55,7 +55,7 @@ #include "qdatavis3dglobal.h" #include <QOpenGLFunctions> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class ObjectHelper: protected QOpenGLFunctions { @@ -86,6 +86,6 @@ class ObjectHelper: protected QOpenGLFunctions GLboolean m_meshDataLoaded; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/shaderhelper.cpp b/src/datavis3d/utils/shaderhelper.cpp index a66b6a00..c8a92dae 100644 --- a/src/datavis3d/utils/shaderhelper.cpp +++ b/src/datavis3d/utils/shaderhelper.cpp @@ -43,7 +43,7 @@ #include <QOpenGLShader> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE ShaderHelper::ShaderHelper(QObject *parent, const QString &vertexShader, @@ -249,4 +249,4 @@ GLuint ShaderHelper::normalAtt() return m_normalAttr; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/shaderhelper_p.h b/src/datavis3d/utils/shaderhelper_p.h index 83e8b981..55d075de 100644 --- a/src/datavis3d/utils/shaderhelper_p.h +++ b/src/datavis3d/utils/shaderhelper_p.h @@ -57,7 +57,7 @@ class QOpenGLShaderProgram; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class ShaderHelper { @@ -128,6 +128,6 @@ class ShaderHelper GLboolean m_initialized; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/datavis3d/utils/texturehelper.cpp index 5f46c700..cb08b17c 100644 --- a/src/datavis3d/utils/texturehelper.cpp +++ b/src/datavis3d/utils/texturehelper.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE TextureHelper::TextureHelper() { @@ -396,4 +396,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture } } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/datavis3d/utils/texturehelper_p.h index 4ea5ada3..e848f063 100644 --- a/src/datavis3d/utils/texturehelper_p.h +++ b/src/datavis3d/utils/texturehelper_p.h @@ -56,7 +56,7 @@ #include <QOpenGLFunctions> #include <QRgb> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class TextureHelper : protected QOpenGLFunctions { @@ -87,6 +87,6 @@ class TextureHelper : protected QOpenGLFunctions friend class Q3DMapsPrivate; }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/utils.cpp b/src/datavis3d/utils/utils.cpp index 56d1e2b1..7acca185 100644 --- a/src/datavis3d/utils/utils.cpp +++ b/src/datavis3d/utils/utils.cpp @@ -51,7 +51,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE #define NUM_IN_POWER(y, x) for (;y<x;y<<=1) #define MIN_POWER 32 @@ -254,4 +254,4 @@ QVector3D Utils::getSelection(QPoint mousepos, int height) return selectedColor; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/utils_p.h b/src/datavis3d/utils/utils_p.h index b3487a24..f809dad7 100644 --- a/src/datavis3d/utils/utils_p.h +++ b/src/datavis3d/utils/utils_p.h @@ -63,7 +63,7 @@ class QString; class QPoint; class QImage; -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class Utils { @@ -80,6 +80,6 @@ class Utils static QVector3D getSelection(QPoint mousepos, int height); }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/vertexindexer.cpp b/src/datavis3d/utils/vertexindexer.cpp index 7e5a863f..c1dfb1aa 100644 --- a/src/datavis3d/utils/vertexindexer.cpp +++ b/src/datavis3d/utils/vertexindexer.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE int unique_vertices = 0; @@ -173,4 +173,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/vertexindexer_p.h b/src/datavis3d/utils/vertexindexer_p.h index 3ee908af..cced863b 100644 --- a/src/datavis3d/utils/vertexindexer_p.h +++ b/src/datavis3d/utils/vertexindexer_p.h @@ -58,7 +58,7 @@ #include <QVector2D> #include <QVector3D> -QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE class VertexIndexer { @@ -106,6 +106,6 @@ class VertexIndexer unsigned short &result); }; -QTCOMMERCIALDATAVIS3D_END_NAMESPACE +QTENTERPRISE_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3dqml2/datavis3dqml2.pro b/src/datavis3dqml2/datavis3dqml2.pro index 3964f099..7f42e45d 100644 --- a/src/datavis3dqml2/datavis3dqml2.pro +++ b/src/datavis3dqml2/datavis3dqml2.pro @@ -7,14 +7,28 @@ TARGET = $$qtLibraryTarget($$TARGET) uri = com.digia.QtDataVis3D # Input +INCLUDEPATH += ../datavis3d/engine + SOURCES += \ datavis3dqml2_plugin.cpp \ datavisview.cpp + #declarative3dbars.cpp \ + #declarative3dmaps.cpp \ + #declarativedataitem.cpp \ + #declarativedatarow.cpp \ + #declarativedataset.cpp + HEADERS += \ datavis3dqml2_plugin.h \ datavisview.h + #declarative3dbars.h \ + #declarative3dmaps.h \ + #declarativedataitem.h \ + #declarativedatarow.h \ + #declarativedataset.h + OTHER_FILES = qmldir !equals(_PRO_FILE_PWD_, $$OUT_PWD) { diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.cpp b/src/datavis3dqml2/datavis3dqml2_plugin.cpp index 9f40b5f7..12f6f3f1 100644 --- a/src/datavis3dqml2/datavis3dqml2_plugin.cpp +++ b/src/datavis3dqml2/datavis3dqml2_plugin.cpp @@ -44,10 +44,20 @@ #include <qqml.h> +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE + void Datavis3dqml2Plugin::registerTypes(const char *uri) { // @uri com.digia.QtDataVis3D qmlRegisterType<DataVisView>(uri, 1, 0, "DataVisView"); +// qmlRegisterType<Q3DBars>(uri, 1, 0, "3DBars"); +// qmlRegisterType<Q3DMaps>(uri, 1, 0, "3DMaps"); + qmlRegisterType<QDataItem>(uri, 1, 0, "DataItem"); + qmlRegisterType<QDataRow>(uri, 1, 0, "DataRow"); +// qmlRegisterType<QDataSet>(uri, 1, 0, "DataSet"); } +#include "moc_datavis3dqml2_plugin.cpp" + +QTENTERPRISE_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.h b/src/datavis3dqml2/datavis3dqml2_plugin.h index 2447660f..17b7703b 100644 --- a/src/datavis3dqml2/datavis3dqml2_plugin.h +++ b/src/datavis3dqml2/datavis3dqml2_plugin.h @@ -42,8 +42,35 @@ #ifndef DATAVIS3DQML2_PLUGIN_H #define DATAVIS3DQML2_PLUGIN_H +#include "QtDataVis3D/qdatavis3dglobal.h" +#include "q3dbars.h" +#include "q3dmaps.h" +#include "qdataitem.h" +#include "qdatarow.h" +#include "qdataset.h" + +//#include "declarative3dbars.h" +//#include "declarative3dmaps.h" +//#include "declarativedataitem.h" +//#include "declarativedatarow.h" +//#include "declarativedataset.h" + #include <QQmlExtensionPlugin> +QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE + +//Q_DECLARE_METATYPE(Declarative3DBars *) +//Q_DECLARE_METATYPE(Declarative3DMaps *) +//Q_DECLARE_METATYPE(DeclarativeDataItem *) +//Q_DECLARE_METATYPE(DeclarativeDataRow *) +//Q_DECLARE_METATYPE(DeclarativeDataSet *) + +Q_DECLARE_METATYPE(Q3DBars *) +Q_DECLARE_METATYPE(Q3DMaps *) +Q_DECLARE_METATYPE(QDataItem *) +Q_DECLARE_METATYPE(QDataRow *) +Q_DECLARE_METATYPE(QDataSet *) + class Datavis3dqml2Plugin : public QQmlExtensionPlugin { Q_OBJECT @@ -53,5 +80,7 @@ public: void registerTypes(const char *uri); }; +QTENTERPRISE_DATAVIS3D_END_NAMESPACE + #endif // DATAVIS3DQML2_PLUGIN_H diff --git a/src/src.pro b/src/src.pro index d25722eb..d6bef647 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += datavis3d \ - datavis3dqml2 +SUBDIRS += datavis3d #\ + #datavis3dqml2 |