diff options
Diffstat (limited to 'src/datavis3d/engine')
26 files changed, 68 insertions, 74 deletions
diff --git a/src/datavis3d/engine/bars3dshared.cpp b/src/datavis3d/engine/bars3dshared.cpp index 8df8a368..1f2004b3 100644 --- a/src/datavis3d/engine/bars3dshared.cpp +++ b/src/datavis3d/engine/bars3dshared.cpp @@ -75,7 +75,7 @@ #include <QTime> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_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 @@ -2420,4 +2420,4 @@ void Bars3dRenderer::closeZoomMode() m_sceneViewPort = QRect(0, 0, this->width(), this->height()); } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/bars3dshared_p.h b/src/datavis3d/engine/bars3dshared_p.h index 9dc15886..6e309f9e 100644 --- a/src/datavis3d/engine/bars3dshared_p.h +++ b/src/datavis3d/engine/bars3dshared_p.h @@ -67,7 +67,7 @@ class QPoint; class QSizeF; class QOpenGLShaderProgram; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class QDataRow; @@ -86,7 +86,7 @@ class Bars3dModel : public QObject }; -class QTENTERPRISE_DATAVIS3D_EXPORT Bars3dRenderer : public QObject, public QOpenGLFunctions +class QT_DATAVIS3D_EXPORT Bars3dRenderer : public QObject, public QOpenGLFunctions { Q_OBJECT @@ -339,6 +339,6 @@ private: friend class DeclarativeBarsRenderer; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 3c4d30cf..d0edf812 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -62,7 +62,7 @@ public: }; StaticLibInitializer staticLibInitializer; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE Drawer::Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency) : m_theme(theme), @@ -316,4 +316,4 @@ void Drawer::generateLabelItem(LabelItem *item, const QString &text) item->setTextureId(m_textureHelper->create2DTexture(label, true, true)); } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h index e31ab0cb..b19e564c 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> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class ShaderHelper; @@ -103,6 +103,6 @@ private: TextureHelper *m_textureHelper; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/labelitem.cpp b/src/datavis3d/engine/labelitem.cpp index 19051dd7..7c76df5d 100644 --- a/src/datavis3d/engine/labelitem.cpp +++ b/src/datavis3d/engine/labelitem.cpp @@ -41,7 +41,7 @@ #include "labelitem_p.h" -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE LabelItem::LabelItem() : m_size(QSize(0, 0)), @@ -73,4 +73,4 @@ GLuint LabelItem::textureId() return m_textureId; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/labelitem_p.h b/src/datavis3d/engine/labelitem_p.h index 47e480b2..fa73c4c2 100644 --- a/src/datavis3d/engine/labelitem_p.h +++ b/src/datavis3d/engine/labelitem_p.h @@ -56,7 +56,7 @@ #include <QOpenGLFunctions> #include <QSize> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class LabelItem { @@ -74,6 +74,6 @@ private: GLuint m_textureId; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index f4626115..98a39a15 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp @@ -52,7 +52,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class Q3DBars @@ -446,6 +446,8 @@ void Q3DBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColo } /*! + * \property Q3DBars::selectionMode + * * \a mode Set bar selection mode from \c SelectionMode. \c ModeBar by default. * * Sets bar selection mode to be used. @@ -455,11 +457,6 @@ void Q3DBars::setSelectionMode(SelectionMode mode) d_ptr->m_shared->setSelectionMode(mode); } -/*! - * \return \c SelectionMode. - * - * Returns selection mode. - */ SelectionMode Q3DBars::selectionMode() { return d_ptr->m_shared->selectionMode(); @@ -528,6 +525,8 @@ QFont Q3DBars::font() } /*! + * \property Q3DBars::labelTransparency + * * \a transparency Transparency level of labels from \c LabelTransparency. * \c TransparencyFromTheme by default. * @@ -538,11 +537,6 @@ void Q3DBars::setLabelTransparency(LabelTransparency transparency) d_ptr->m_shared->setLabelTransparency(transparency); } -/*! - * \return \c LabelTransparency. - * - * Returns label transparency. - */ LabelTransparency Q3DBars::labelTransparency() { return d_ptr->m_shared->labelTransparency(); @@ -583,6 +577,8 @@ bool Q3DBars::isBackgroundVisible() } /*! + * \property Q3DBars::shadowQuality + * * \a quality Shadow quality from \c ShadowQuality. \c ShadowLow by default. * * Sets shadow quality. @@ -592,11 +588,6 @@ void Q3DBars::setShadowQuality(ShadowQuality quality) d_ptr->m_shared->setShadowQuality(quality); } -/*! - * \return \c ShadowQuality. - * - * Returns shadow quality. - */ ShadowQuality Q3DBars::shadowQuality() { return d_ptr->m_shared->shadowQuality(); @@ -723,4 +714,4 @@ Q3DBarsPrivate::~Q3DBarsPrivate() delete m_shared; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h index 2bddffac..fb4c3198 100644 --- a/src/datavis3d/engine/q3dbars.h +++ b/src/datavis3d/engine/q3dbars.h @@ -48,7 +48,7 @@ #include <QFont> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DBarsPrivate; class QDataItem; @@ -56,9 +56,12 @@ class QDataRow; class QDataSet; class LabelItem; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow +class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow { Q_OBJECT + Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) + Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize) @@ -193,6 +196,6 @@ private: Q_DISABLE_COPY(Q3DBars) }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h index 0b351ab1..38a9b660 100644 --- a/src/datavis3d/engine/q3dbars_p.h +++ b/src/datavis3d/engine/q3dbars_p.h @@ -60,7 +60,7 @@ class QOpenGLPaintDevice; class QPoint; class QSizeF; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DBars; @@ -74,6 +74,6 @@ public: Bars3dRenderer *m_shared; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp index 0a1ca7ff..46c41778 100644 --- a/src/datavis3d/engine/q3dmaps.cpp +++ b/src/datavis3d/engine/q3dmaps.cpp @@ -77,7 +77,7 @@ #include <QTime> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE //#define DISPLAY_FULL_DATA_ON_SELECTION // Append selection value text with row and column labels @@ -1773,4 +1773,4 @@ bool Q3DMapsPrivate::isValid(const QDataItem &item) return retval; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h index 67c8860b..7b82e679 100644 --- a/src/datavis3d/engine/q3dmaps.h +++ b/src/datavis3d/engine/q3dmaps.h @@ -52,7 +52,7 @@ class QOpenGLShaderProgram; class QImage; class QRect; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DMapsPrivate; class QDataItem; @@ -60,7 +60,7 @@ class QDataRow; class QDataSet; class LabelItem; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow +class QT_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow { Q_OBJECT Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) @@ -174,6 +174,6 @@ private: Q_DISABLE_COPY(Q3DMaps); }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/datavis3d/engine/q3dmaps_p.h index 4c94d85e..81932d90 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; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DMaps; class QDataItem; @@ -169,6 +169,6 @@ public: bool m_bgrHasAlpha; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index af975cb1..8af57dce 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp @@ -50,7 +50,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class Q3DWindow @@ -216,4 +216,4 @@ Q3DWindowPrivate::~Q3DWindowPrivate() { } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h index bf7d8f74..3ae67f8b 100644 --- a/src/datavis3d/engine/q3dwindow.h +++ b/src/datavis3d/engine/q3dwindow.h @@ -49,11 +49,11 @@ class QPainter; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindowPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions +class QT_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions { Q_OBJECT @@ -80,6 +80,6 @@ private: friend class Q3DBars; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/datavis3d/engine/q3dwindow_p.h index 4c6c5209..fd489c7e 100644 --- a/src/datavis3d/engine/q3dwindow_p.h +++ b/src/datavis3d/engine/q3dwindow_p.h @@ -57,7 +57,7 @@ class QOpenGLContext; class QOpenGLPaintDevice; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindow; @@ -76,6 +76,6 @@ public: QOpenGLContext *m_context; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem.cpp b/src/datavis3d/engine/qdataitem.cpp index 883c190c..d40e4bc1 100644 --- a/src/datavis3d/engine/qdataitem.cpp +++ b/src/datavis3d/engine/qdataitem.cpp @@ -45,7 +45,7 @@ #include <QPoint> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class QDataItem @@ -227,4 +227,4 @@ QPointF QDataItemPrivate::position() return m_position; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataitem.h b/src/datavis3d/engine/qdataitem.h index 32022fec..f4d10bd1 100644 --- a/src/datavis3d/engine/qdataitem.h +++ b/src/datavis3d/engine/qdataitem.h @@ -50,11 +50,11 @@ class QPoint; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataItem : public QObject +class QT_DATAVIS3D_EXPORT QDataItem : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel) @@ -86,6 +86,6 @@ private: friend class Drawer; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem_p.h b/src/datavis3d/engine/qdataitem_p.h index 6b8a9b83..c660b992 100644 --- a/src/datavis3d/engine/qdataitem_p.h +++ b/src/datavis3d/engine/qdataitem_p.h @@ -61,7 +61,7 @@ #include <QString> #include <QVector3D> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate { @@ -97,6 +97,6 @@ class QDataItemPrivate friend class QDataItem; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow.cpp b/src/datavis3d/engine/qdatarow.cpp index 6bdd6d14..abf16571 100644 --- a/src/datavis3d/engine/qdatarow.cpp +++ b/src/datavis3d/engine/qdatarow.cpp @@ -46,7 +46,7 @@ #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class QDataRow @@ -184,4 +184,4 @@ LabelItem QDataRowPrivate::labelItem() return m_labelItem; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdatarow.h b/src/datavis3d/engine/qdatarow.h index c43cec8c..ca98a47d 100644 --- a/src/datavis3d/engine/qdatarow.h +++ b/src/datavis3d/engine/qdatarow.h @@ -47,12 +47,12 @@ #include <QString> #include <QObject> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataRowPrivate; class QDataItem; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataRow : public QObject +class QT_DATAVIS3D_EXPORT QDataRow : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel) @@ -73,6 +73,6 @@ private: friend class QDataSetPrivate; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow_p.h b/src/datavis3d/engine/qdatarow_p.h index d563fe8a..ded9bcfe 100644 --- a/src/datavis3d/engine/qdatarow_p.h +++ b/src/datavis3d/engine/qdatarow_p.h @@ -58,7 +58,7 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; @@ -86,6 +86,6 @@ private: friend class QDataRow; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset.cpp b/src/datavis3d/engine/qdataset.cpp index 6fd59baf..38d8d0b4 100644 --- a/src/datavis3d/engine/qdataset.cpp +++ b/src/datavis3d/engine/qdataset.cpp @@ -49,7 +49,7 @@ //#include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE const QString empty; @@ -304,4 +304,4 @@ void QDataSetPrivate::updateTextures() } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataset.h b/src/datavis3d/engine/qdataset.h index 99ffe519..336f0200 100644 --- a/src/datavis3d/engine/qdataset.h +++ b/src/datavis3d/engine/qdataset.h @@ -50,11 +50,11 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataSet : public QObject +class QT_DATAVIS3D_EXPORT QDataSet : public QObject { Q_OBJECT @@ -76,6 +76,6 @@ private: friend class Q3DMapsPrivate; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset_p.h b/src/datavis3d/engine/qdataset_p.h index a259aa9a..a7108a57 100644 --- a/src/datavis3d/engine/qdataset_p.h +++ b/src/datavis3d/engine/qdataset_p.h @@ -59,7 +59,7 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate : public QObject { @@ -102,6 +102,6 @@ private: friend class QDataSet; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp index 4a258b67..4d5d3536 100644 --- a/src/datavis3d/engine/theme.cpp +++ b/src/datavis3d/engine/theme.cpp @@ -46,7 +46,7 @@ #include <stdio.h> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE Theme::Theme() : m_baseColor(QColor(Qt::gray)), @@ -295,4 +295,4 @@ void Theme::useTheme(ColorTheme theme) } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/theme_p.h b/src/datavis3d/engine/theme_p.h index 7caeae15..9025fd50 100644 --- a/src/datavis3d/engine/theme_p.h +++ b/src/datavis3d/engine/theme_p.h @@ -58,7 +58,7 @@ class QColor; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Theme { @@ -91,6 +91,6 @@ private: bool m_uniformColor; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif |