From 03a6fa33bce2459d12e906ab3c01a37d66a74942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 2 Oct 2013 11:42:39 +0300 Subject: Refactored LabelTransparency and ShadowQuality Task-number: QTRD-2362 Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890 Reviewed-by: Miikka Heikkinen --- ...tdatavisualization-qml-abstractdeclarative.qdoc | 4 +- .../engine/abstract3dcontroller.cpp | 20 +++--- .../engine/abstract3dcontroller_p.h | 12 ++-- .../engine/abstract3drenderer.cpp | 14 ++-- .../engine/abstract3drenderer_p.h | 4 +- src/datavisualization/engine/bars3drenderer.cpp | 64 +++++++++--------- src/datavisualization/engine/drawer.cpp | 10 +-- src/datavisualization/engine/drawer_p.h | 6 +- src/datavisualization/engine/q3dbars.cpp | 16 ++--- src/datavisualization/engine/q3dbars.h | 8 +-- src/datavisualization/engine/q3dscatter.cpp | 16 ++--- src/datavisualization/engine/q3dscatter.h | 8 +-- src/datavisualization/engine/q3dsurface.cpp | 16 ++--- src/datavisualization/engine/q3dsurface.h | 8 +-- src/datavisualization/engine/scatter3drenderer.cpp | 68 +++++++++---------- src/datavisualization/engine/selectionpointer.cpp | 2 +- src/datavisualization/engine/selectionpointer_p.h | 2 +- src/datavisualization/engine/surface3drenderer.cpp | 78 +++++++++++----------- src/datavisualization/engine/surface3drenderer_p.h | 2 +- .../global/qdatavisualizationenums.h | 30 ++++----- .../global/qtdatavisualizationenums.qdoc | 30 ++++----- src/datavisualization/utils/utils.cpp | 14 ++-- src/datavisualization/utils/utils_p.h | 2 +- src/datavisualizationqml2/abstractdeclarative.cpp | 8 +-- src/datavisualizationqml2/abstractdeclarative_p.h | 8 +-- 25 files changed, 225 insertions(+), 225 deletions(-) (limited to 'src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index b1138db5..300a31b6 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -38,8 +38,8 @@ Active selection mode in the visualization. */ /*! - \qmlproperty AbstractGraph3D.LabelTransparency AbstractGraph3D::labelTransparency - Label transparency. + \qmlproperty AbstractGraph3D.LabelStyle AbstractGraph3D::labelStyle + Label style. */ /*! diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index fb4d7744..d5a45beb 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -40,8 +40,8 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) : m_theme(), m_font(QFont(QStringLiteral("Arial"))), m_selectionMode(QDataVis::ModeItem), - m_shadowQuality(QDataVis::ShadowMedium), - m_labelTransparency(QDataVis::TransparencyNoBackground), + m_shadowQuality(QDataVis::ShadowQualityMedium), + m_labelStyle(QDataVis::LabelStyleTransparent), m_isBackgroundEnabled(true), m_isGridEnabled(true), m_scene(new Q3DScene()), @@ -112,9 +112,9 @@ void Abstract3DController::synchDataToRenderer() m_changeTracker.fontChanged = false; } - if (m_changeTracker.labelTransparencyChanged) { - m_renderer->updateLabelTransparency(m_labelTransparency); - m_changeTracker.labelTransparencyChanged = false; + if (m_changeTracker.labelStyleChanged) { + m_renderer->updateLabelStyle(m_labelStyle); + m_changeTracker.labelStyleChanged = false; } if (m_changeTracker.shadowQualityChanged) { @@ -737,17 +737,17 @@ QDataVis::ShadowQuality Abstract3DController::shadowQuality() return m_shadowQuality; } -void Abstract3DController::setLabelTransparency(QDataVis::LabelTransparency transparency) +void Abstract3DController::setLabelStyle(QDataVis::LabelStyle style) { - m_labelTransparency = transparency; + m_labelStyle = style; - m_changeTracker.labelTransparencyChanged = true; + m_changeTracker.labelStyleChanged = true; emitNeedRender(); } -QDataVis::LabelTransparency Abstract3DController::labelTransparency() +QDataVis::LabelStyle Abstract3DController::labelStyle() { - return m_labelTransparency; + return m_labelStyle; } void Abstract3DController::setBackgroundEnabled(bool enable) diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 3ccd12f5..c857d5f1 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -52,7 +52,7 @@ struct Abstract3DChangeBitField { bool zoomLevelChanged : 1; bool themeChanged : 1; bool fontChanged : 1; - bool labelTransparencyChanged : 1; + bool labelStyleChanged : 1; bool boundingRectChanged : 1; bool sizeChanged : 1; bool shadowQualityChanged : 1; @@ -87,7 +87,7 @@ struct Abstract3DChangeBitField { zoomLevelChanged(true), themeChanged(true), fontChanged(true), - labelTransparencyChanged(true), + labelStyleChanged(true), boundingRectChanged(true), sizeChanged(true), shadowQualityChanged(true), @@ -150,7 +150,7 @@ private: QFont m_font; QDataVis::SelectionMode m_selectionMode; QDataVis::ShadowQuality m_shadowQuality; - QDataVis::LabelTransparency m_labelTransparency; + QDataVis::LabelStyle m_labelStyle; bool m_isBackgroundEnabled; bool m_isGridEnabled; QString m_objFile; @@ -270,9 +270,9 @@ public: virtual void setShadowQuality(QDataVis::ShadowQuality quality); virtual QDataVis::ShadowQuality shadowQuality(); - // Label transparency adjustment - virtual void setLabelTransparency(QDataVis::LabelTransparency transparency); - virtual QDataVis::LabelTransparency labelTransparency(); + // Label style adjustment + virtual void setLabelStyle(QDataVis::LabelStyle style); + virtual QDataVis::LabelStyle labelStyle(); // Enable or disable background mesh virtual void setBackgroundEnabled(bool enable); diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 4a23a1a5..6c180cc6 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -32,10 +32,10 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) m_hasNegativeValues(false), m_cachedTheme(), m_cachedFont(QFont(QStringLiteral("Arial"))), - m_cachedLabelTransparency(QDataVis::TransparencyFromTheme), - m_drawer(new Drawer(m_cachedTheme, m_cachedFont, m_cachedLabelTransparency)), + m_cachedLabelStyle(QDataVis::LabelStyleFromTheme), + m_drawer(new Drawer(m_cachedTheme, m_cachedFont, m_cachedLabelStyle)), m_cachedBoundingRect(QRect(0,0,0,0)), - m_cachedShadowQuality(QDataVis::ShadowMedium), + m_cachedShadowQuality(QDataVis::ShadowQualityMedium), m_autoScaleAdjustment(1.0f), m_cachedSelectionMode(QDataVis::ModeNone), m_cachedIsGridEnabled(false), @@ -162,7 +162,7 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene) void Abstract3DRenderer::handleShadowQualityChange() { #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { if (!m_cachedTheme.m_uniformColor) { initShaders(QStringLiteral(":/shaders/vertexShadow"), QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY")); @@ -202,10 +202,10 @@ void Abstract3DRenderer::updateFont(const QFont &font) m_drawer->setFont(font); } -void Abstract3DRenderer::updateLabelTransparency(QDataVis::LabelTransparency transparency) +void Abstract3DRenderer::updateLabelStyle(QDataVis::LabelStyle style) { - m_cachedLabelTransparency = transparency; - m_drawer->setTransparency(transparency); + m_cachedLabelStyle = style; + m_drawer->setStyle(style); } void Abstract3DRenderer::updateMeshFileName(const QString &objFileName) diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 7925b8ad..1c61ac07 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -57,7 +57,7 @@ protected: bool m_hasNegativeValues; Theme m_cachedTheme; QFont m_cachedFont; - QDataVis::LabelTransparency m_cachedLabelTransparency; + QDataVis::LabelStyle m_cachedLabelStyle; Drawer *m_drawer; QRect m_cachedBoundingRect; QDataVis::ShadowQuality m_cachedShadowQuality; @@ -97,7 +97,7 @@ public: virtual void updateTheme(Theme theme); virtual void updateFont(const QFont &font); - virtual void updateLabelTransparency(QDataVis::LabelTransparency transparency); + virtual void updateLabelStyle(QDataVis::LabelStyle style); virtual void updateSelectionMode(QDataVis::SelectionMode newMode); virtual void updateGridEnabled(bool enable); virtual void updateBackgroundEnabled(bool enable); diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index b0e07d70..ed178aa1 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -517,7 +517,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) QMatrix4x4 depthProjectionMatrix; #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone && !m_cachedIsSlicingActivated) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone && !m_cachedIsSlicingActivated) { // Render scene into a depth texture for using with shadow mapping // Enable drawing to depth framebuffer glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer); @@ -892,7 +892,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_barShader->setUniformValue(m_barShader->ambientS(), m_cachedTheme.m_ambientStrength); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader); m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix); @@ -964,7 +964,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_cachedTheme.m_ambientStrength * 2.0f); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(), m_shadowQualityToShader); @@ -1039,7 +1039,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1088,7 +1088,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1147,7 +1147,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1199,7 +1199,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1567,27 +1567,27 @@ void Bars3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality) { m_cachedShadowQuality = quality; switch (quality) { - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: m_shadowQualityToShader = 33.3f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: m_shadowQualityToShader = 100.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: m_shadowQualityToShader = 200.0f; m_shadowQualityMultiplier = 5; break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: m_shadowQualityToShader = 7.5f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: m_shadowQualityToShader = 10.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: m_shadowQualityToShader = 15.0f; m_shadowQualityMultiplier = 4; break; @@ -1791,41 +1791,41 @@ void Bars3DRenderer::updateDepthBuffer() m_depthTexture = 0; } - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(), m_depthFrameBuffer, m_shadowQualityMultiplier); if (!m_depthTexture) { switch (m_cachedShadowQuality) { - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: qWarning("Creating high quality shadows failed. Changing to medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowMedium); - updateShadowQuality(QDataVis::ShadowMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityMedium); + updateShadowQuality(QDataVis::ShadowQualityMedium); break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: qWarning("Creating medium quality shadows failed. Changing to low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowLow); - updateShadowQuality(QDataVis::ShadowLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityLow); + updateShadowQuality(QDataVis::ShadowQualityLow); break; - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: qWarning("Creating low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: qWarning("Creating soft high quality shadows failed. Changing to soft medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftMedium); - updateShadowQuality(QDataVis::ShadowSoftMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + updateShadowQuality(QDataVis::ShadowQualitySoftMedium); break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: qWarning("Creating soft medium quality shadows failed. Changing to soft low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftLow); - updateShadowQuality(QDataVis::ShadowSoftLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftLow); + updateShadowQuality(QDataVis::ShadowQualitySoftLow); break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: qWarning("Creating soft low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; default: // You'll never get here diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index 941feb00..57fa5eb4 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -41,10 +41,10 @@ StaticLibInitializer staticLibInitializer; QT_DATAVISUALIZATION_BEGIN_NAMESPACE -Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency) +Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelStyle style) : m_theme(theme), m_font(font), - m_transparency(transparency), + m_style(style), m_textureHelper(0) { } @@ -84,9 +84,9 @@ QFont Drawer::font() const return m_font; } -void Drawer::setTransparency(QDataVis::LabelTransparency transparency) +void Drawer::setStyle(QDataVis::LabelStyle style) { - m_transparency = transparency; + m_style = style; emit drawerChanged(); } @@ -354,7 +354,7 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL text, m_theme.m_textBackgroundColor, m_theme.m_textColor, - m_transparency, + m_style, m_theme.m_labelBorders, widestLabel); diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index 3de3f92f..89a4ce8c 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -63,7 +63,7 @@ public: }; public: - explicit Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency); + explicit Drawer(const Theme &theme, const QFont &font, QDataVis::LabelStyle style); ~Drawer(); void initializeOpenGL(); @@ -72,7 +72,7 @@ public: Theme theme() const; void setFont(const QFont &font); QFont font() const; - void setTransparency(QDataVis::LabelTransparency transparency); + void setStyle(QDataVis::LabelStyle style); void drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLuint textureId = 0, GLuint depthTextureId = 0); @@ -95,7 +95,7 @@ Q_SIGNALS: private: Theme m_theme; QFont m_font; - QDataVis::LabelTransparency m_transparency; + QDataVis::LabelStyle m_style; TextureHelper *m_textureHelper; }; diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 0efd076e..f31897c3 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -363,19 +363,19 @@ QFont Q3DBars::font() const } /*! - * \property Q3DBars::labelTransparency + * \property Q3DBars::labelStyle * - * Sets label \a transparency to one of \c QDataVis::LabelTransparency. It is preset to - * \c QDataVis::TransparencyFromTheme by default. + * Sets label \a style to one of \c QDataVis::LabelStyle. It is preset to + * \c QDataVis::LabelStyleFromTheme by default. */ -void Q3DBars::setLabelTransparency(QDataVis::LabelTransparency transparency) +void Q3DBars::setLabelStyle(QDataVis::LabelStyle style) { - d_ptr->m_shared->setLabelTransparency(transparency); + d_ptr->m_shared->setLabelStyle(style); } -QDataVis::LabelTransparency Q3DBars::labelTransparency() const +QDataVis::LabelStyle Q3DBars::labelStyle() const { - return d_ptr->m_shared->labelTransparency(); + return d_ptr->m_shared->labelStyle(); } /*! @@ -429,7 +429,7 @@ QPoint Q3DBars::selectedBarPos() const * \property Q3DBars::shadowQuality * * Sets shadow \a quality to one of \c QDataVis::ShadowQuality. It is preset to - * \c QDataVis::ShadowMedium by default. + * \c QDataVis::ShadowQualityMedium by default. * * \note If setting QDataVis::ShadowQuality of a certain level fails, a level is lowered * until it is successful and shadowQualityChanged signal is emitted for each time the change is diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 957c69b8..b62ebd32 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -35,7 +35,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow { Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) - Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) Q_PROPERTY(qreal barThickness READ barThickness WRITE setBarThickness) @@ -48,7 +48,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow Q_PROPERTY(QPoint selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged) Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) - Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) + Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) public: @@ -85,8 +85,8 @@ public: void setFont(const QFont &font); QFont font() const; - void setLabelTransparency(QDataVis::LabelTransparency transparency); - QDataVis::LabelTransparency labelTransparency() const; + void setLabelStyle(QDataVis::LabelStyle style); + QDataVis::LabelStyle labelStyle() const; void setGridVisible(bool visible); bool isGridVisible() const; diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index c7359c55..f2a12a12 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -302,19 +302,19 @@ QFont Q3DScatter::font() const } /*! - * \property Q3DScatter::labelTransparency + * \property Q3DScatter::labelStyle * - * Sets label \a transparency to one of \c QDataVis::LabelTransparency. It is preset to - * \c QDataVis::TransparencyFromTheme by default. + * Sets label \a style to one of \c QDataVis::LabelStyle. It is preset to + * \c QDataVis::LabelStyleFromTheme by default. */ -void Q3DScatter::setLabelTransparency(QDataVis::LabelTransparency transparency) +void Q3DScatter::setLabelStyle(QDataVis::LabelStyle style) { - d_ptr->m_shared->setLabelTransparency(transparency); + d_ptr->m_shared->setLabelStyle(style); } -QDataVis::LabelTransparency Q3DScatter::labelTransparency() const +QDataVis::LabelStyle Q3DScatter::labelStyle() const { - return d_ptr->m_shared->labelTransparency(); + return d_ptr->m_shared->labelStyle(); } /*! @@ -367,7 +367,7 @@ int Q3DScatter::selectedItemIndex() const * \property Q3DScatter::shadowQuality * * Sets shadow \a quality to one of \c QDataVis::ShadowQuality. It is preset to - * \c QDataVis::ShadowMedium by default. + * \c QDataVis::ShadowQualityMedium by default. * * \note If setting QDataVis::ShadowQuality of a certain level fails, a level is lowered * until it is successful and shadowQualityChanged signal is emitted for each time the change is diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index 3799c325..137ccafb 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -35,7 +35,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public Q3DWindow { Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) - Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName) @@ -45,7 +45,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public Q3DWindow Q_PROPERTY(int selectedItemIndex READ selectedItemIndex WRITE setSelectedItemIndex NOTIFY selectedItemIndexChanged) Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) - Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) + Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) public: @@ -73,8 +73,8 @@ public: void setFont(const QFont &font); QFont font() const; - void setLabelTransparency(QDataVis::LabelTransparency transparency); - QDataVis::LabelTransparency labelTransparency() const; + void setLabelStyle(QDataVis::LabelStyle style); + QDataVis::LabelStyle labelStyle() const; void setGridVisible(bool visible); bool isGridVisible() const; diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index c809fedc..9fa81358 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -222,7 +222,7 @@ QDataVis::Theme Q3DSurface::theme() const * \property Q3DSurface::shadowQuality * * Sets shadow \a quality to one of \c QDataVis::ShadowQuality. It is preset to - * \c QDataVis::ShadowMedium by default. + * \c QDataVis::ShadowQualityMedium by default. * * \note If setting QDataVis::ShadowQuality of a certain level fails, a level is lowered * until it is successful and shadowQualityChanged signal is emitted for each time the change is @@ -345,19 +345,19 @@ QFont Q3DSurface::font() const } /*! - * \property Q3DSurface::labelTransparency + * \property Q3DSurface::labelStyle * - * Sets label \a transparency to one of \c QDataVis::LabelTransparency. It is preset to - * \c QDataVis::TransparencyFromTheme by default. + * Sets label \a style to one of \c QDataVis::LabelStyle. It is preset to + * \c QDataVis::LabelStyleFromTheme by default. */ -void Q3DSurface::setLabelTransparency(QDataVis::LabelTransparency transparency) +void Q3DSurface::setLabelStyle(QDataVis::LabelStyle style) { - d_ptr->m_shared->setLabelTransparency(transparency); + d_ptr->m_shared->setLabelStyle(style); } -QDataVis::LabelTransparency Q3DSurface::labelTransparency() const +QDataVis::LabelStyle Q3DSurface::labelStyle() const { - return d_ptr->m_shared->labelTransparency(); + return d_ptr->m_shared->labelStyle(); } /*! diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index a51112e6..60847265 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -34,7 +34,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow { Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) - Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle) Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) @@ -46,7 +46,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow Q_PROPERTY(QFont font READ font WRITE setFont) Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) - Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) + Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) public: @@ -103,8 +103,8 @@ public: void setFont(const QFont &font); QFont font() const; - void setLabelTransparency(QDataVis::LabelTransparency transparency); - QDataVis::LabelTransparency labelTransparency() const; + void setLabelStyle(QDataVis::LabelStyle style); + QDataVis::LabelStyle labelStyle() const; protected: void mouseDoubleClickEvent(QMouseEvent *event); diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 25173c89..108933f7 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -261,7 +261,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) QMatrix4x4 depthProjectionMatrix; #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Render scene into a depth texture for using with shadow mapping // Bind depth shader m_depthShader->bind(); @@ -554,7 +554,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) m_dotShader->setUniformValue(m_dotShader->ambientS(), m_cachedTheme.m_ambientStrength); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader); m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix); @@ -629,7 +629,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) m_cachedTheme.m_ambientStrength * 2.0f); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(), m_shadowQualityToShader); @@ -731,7 +731,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -785,7 +785,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -861,7 +861,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -914,7 +914,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -986,7 +986,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1053,7 +1053,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1393,27 +1393,27 @@ void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality) { m_cachedShadowQuality = quality; switch (quality) { - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: m_shadowQualityToShader = 33.3f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: m_shadowQualityToShader = 100.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: m_shadowQualityToShader = 200.0f; m_shadowQualityMultiplier = 5; break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: m_shadowQualityToShader = 5.0f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: m_shadowQualityToShader = 10.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: m_shadowQualityToShader = 15.0f; m_shadowQualityMultiplier = 4; break; @@ -1547,41 +1547,41 @@ void Scatter3DRenderer::updateDepthBuffer() m_depthTexture = 0; } - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(), m_depthFrameBuffer, m_shadowQualityMultiplier); if (!m_depthTexture) { switch (m_cachedShadowQuality) { - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: qWarning("Creating high quality shadows failed. Changing to medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowMedium); - updateShadowQuality(QDataVis::ShadowMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityMedium); + updateShadowQuality(QDataVis::ShadowQualityMedium); break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: qWarning("Creating medium quality shadows failed. Changing to low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowLow); - updateShadowQuality(QDataVis::ShadowLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityLow); + updateShadowQuality(QDataVis::ShadowQualityLow); break; - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: qWarning("Creating low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: qWarning("Creating soft high quality shadows failed. Changing to soft medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftMedium); - updateShadowQuality(QDataVis::ShadowSoftMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + updateShadowQuality(QDataVis::ShadowQualitySoftMedium); break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: qWarning("Creating soft medium quality shadows failed. Changing to soft low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftLow); - updateShadowQuality(QDataVis::ShadowSoftLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftLow); + updateShadowQuality(QDataVis::ShadowQualitySoftLow); break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: qWarning("Creating soft low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; default: // You'll never get here diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index ded4dc6f..11db2377 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -43,7 +43,7 @@ SelectionPointer::SelectionPointer(Drawer *drawer) m_textureHelper(0), m_isInitialized(false), m_cachedTheme(drawer->theme()), - m_labelTransparency(QDataVis::TransparencyFromTheme), + m_labelStyle(QDataVis::LabelStyleFromTheme), m_drawer(drawer), m_cachedScene(0) { diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index bbcf2abe..0e766035 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -81,7 +81,7 @@ private: TextureHelper *m_textureHelper; bool m_isInitialized; Theme m_cachedTheme; - QDataVis::LabelTransparency m_labelTransparency; + QDataVis::LabelStyle m_labelStyle; LabelItem m_labelItem; Drawer *m_drawer; QRect m_mainViewPort; diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 0e762ff1..539cdb19 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -62,7 +62,7 @@ const GLfloat surfaceGridYOffset[2] = {-surfaceGridYOffsetValue, 2.0f * surfaceG Surface3DRenderer::Surface3DRenderer(Surface3DController *controller) : Abstract3DRenderer(controller), m_controller(controller), - m_labelTransparency(QDataVis::TransparencyFromTheme), + m_labelStyle(QDataVis::LabelStyleFromTheme), m_font(QFont(QStringLiteral("Arial"))), m_isGridEnabled(true), m_shader(0), @@ -127,7 +127,7 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller) updateSurfaceGridStatus(m_controller->surfaceGrid()); // Shadows are disabled for Q3DSurface in Tech Preview - updateShadowQuality(QDataVis::ShadowNone); + updateShadowQuality(QDataVis::ShadowQualityNone); initializeOpenGLFunctions(); initializeOpenGL(); @@ -681,7 +681,7 @@ void Surface3DRenderer::drawSlicedScene() glEnable(GL_TEXTURE_2D); glDisable(GL_DEPTH_TEST); glCullFace(GL_BACK); - if (m_cachedLabelTransparency > QDataVis::TransparencyNone) { + if (m_cachedLabelStyle > QDataVis::LabelStyleOpaque) { glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } @@ -752,7 +752,7 @@ void Surface3DRenderer::drawSlicedScene() glDisable(GL_TEXTURE_2D); glEnable(GL_DEPTH_TEST); - if (m_cachedLabelTransparency > QDataVis::TransparencyNone) + if (m_cachedLabelStyle > QDataVis::LabelStyleOpaque) glDisable(GL_BLEND); // Release label shader @@ -811,7 +811,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) // Draw depth buffer #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone && m_surfaceObj) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone && m_surfaceObj) { // Render scene into a depth texture for using with shadow mapping // Enable drawing to depth framebuffer glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer); @@ -994,7 +994,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) m_cachedTheme.m_ambientStrength); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_surfaceShader->setUniformValue(m_surfaceShader->shadowQ(), m_shadowQualityToShader); m_surfaceShader->setUniformValue(m_surfaceShader->depth(), depthMVPMatrix); @@ -1079,7 +1079,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) m_cachedTheme.m_ambientStrength * 2.0f); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(), m_shadowQualityToShader); @@ -1156,7 +1156,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1204,7 +1204,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1262,7 +1262,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1310,7 +1310,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1365,7 +1365,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1415,7 +1415,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) lineShader->setUniformValue(lineShader->MVP(), MVPMatrix); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { // Set shadow shader bindings lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader); lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix); @@ -1983,29 +1983,29 @@ void Surface3DRenderer::loadMeshFile() void Surface3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality) { qWarning() << "Shadows have been disabled for Q3DSurface in technology preview"; - m_cachedShadowQuality = QDataVis::ShadowNone; //quality; + m_cachedShadowQuality = QDataVis::ShadowQualityNone; //quality; switch (quality) { - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: m_shadowQualityToShader = 33.3f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: m_shadowQualityToShader = 100.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: m_shadowQualityToShader = 200.0f; m_shadowQualityMultiplier = 5; break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: m_shadowQualityToShader = 5.0f; m_shadowQualityMultiplier = 1; break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: m_shadowQualityToShader = 10.0f; m_shadowQualityMultiplier = 3; break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: m_shadowQualityToShader = 15.0f; m_shadowQualityMultiplier = 4; break; @@ -2131,41 +2131,41 @@ void Surface3DRenderer::updateDepthBuffer() m_depthTexture = 0; } - if (m_cachedShadowQuality > QDataVis::ShadowNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(), m_depthFrameBuffer, m_shadowQualityMultiplier); if (!m_depthTexture) { switch (m_cachedShadowQuality) { - case QDataVis::ShadowHigh: + case QDataVis::ShadowQualityHigh: qWarning("Creating high quality shadows failed. Changing to medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowMedium); - updateShadowQuality(QDataVis::ShadowMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityMedium); + updateShadowQuality(QDataVis::ShadowQualityMedium); break; - case QDataVis::ShadowMedium: + case QDataVis::ShadowQualityMedium: qWarning("Creating medium quality shadows failed. Changing to low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowLow); - updateShadowQuality(QDataVis::ShadowLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityLow); + updateShadowQuality(QDataVis::ShadowQualityLow); break; - case QDataVis::ShadowLow: + case QDataVis::ShadowQualityLow: qWarning("Creating low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; - case QDataVis::ShadowSoftHigh: + case QDataVis::ShadowQualitySoftHigh: qWarning("Creating soft high quality shadows failed. Changing to soft medium quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftMedium); - updateShadowQuality(QDataVis::ShadowSoftMedium); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + updateShadowQuality(QDataVis::ShadowQualitySoftMedium); break; - case QDataVis::ShadowSoftMedium: + case QDataVis::ShadowQualitySoftMedium: qWarning("Creating soft medium quality shadows failed. Changing to soft low quality."); - (void)m_controller->setShadowQuality(QDataVis::ShadowSoftLow); - updateShadowQuality(QDataVis::ShadowSoftLow); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualitySoftLow); + updateShadowQuality(QDataVis::ShadowQualitySoftLow); break; - case QDataVis::ShadowSoftLow: + case QDataVis::ShadowQualitySoftLow: qWarning("Creating soft low quality shadows failed. Switching shadows off."); - (void)m_controller->setShadowQuality(QDataVis::ShadowNone); - updateShadowQuality(QDataVis::ShadowNone); + (void)m_controller->setShadowQuality(QDataVis::ShadowQualityNone); + updateShadowQuality(QDataVis::ShadowQualityNone); break; default: // You'll never get here diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 9ab36214..cf0d7e3c 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -64,7 +64,7 @@ public: // Visual parameters QRect m_boundingRect; - QDataVis::LabelTransparency m_labelTransparency; + QDataVis::LabelStyle m_labelStyle; QFont m_font; bool m_isGridEnabled; diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h index a4bba2d3..8bdf55d7 100644 --- a/src/datavisualization/global/qdatavisualizationenums.h +++ b/src/datavisualization/global/qdatavisualizationenums.h @@ -33,7 +33,7 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject Q_ENUMS(Theme) Q_ENUMS(SelectionMode) Q_ENUMS(ShadowQuality) - Q_ENUMS(LabelTransparency) + Q_ENUMS(LabelStyle) public: enum InputState { @@ -76,8 +76,8 @@ public: PresetDirectlyAbove, PresetDirectlyAboveCW45, PresetDirectlyAboveCCW45, - PresetFrontBelow, // These work only for graphs including negative values. - PresetLeftBelow, // They act as Preset...Low for positive-only values. + PresetFrontBelow, + PresetLeftBelow, PresetRightBelow, PresetBehindBelow, PresetDirectlyBelow @@ -98,7 +98,7 @@ public: enum SelectionMode { ModeNone = 0, ModeItem, - ModeItemAndRow, // From here onwards used for Q3DBars only + ModeItemAndRow, ModeItemAndColumn, ModeItemRowAndColumn, ModeSliceRow, @@ -106,19 +106,19 @@ public: }; enum ShadowQuality { - ShadowNone = 0, - ShadowLow, - ShadowMedium, - ShadowHigh, - ShadowSoftLow, - ShadowSoftMedium, - ShadowSoftHigh + ShadowQualityNone = 0, + ShadowQualityLow, + ShadowQualityMedium, + ShadowQualityHigh, + ShadowQualitySoftLow, + ShadowQualitySoftMedium, + ShadowQualitySoftHigh }; - enum LabelTransparency { - TransparencyNone = 0, // Full solid, using colors from theme - TransparencyFromTheme, // Use colors and transparencies from theme - TransparencyNoBackground // Draw just text on transparent background + enum LabelStyle { + LabelStyleOpaque = 0, + LabelStyleFromTheme, + LabelStyleTransparent }; }; } diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc index d92ca7c0..80e97aff 100644 --- a/src/datavisualization/global/qtdatavisualizationenums.qdoc +++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc @@ -146,31 +146,31 @@ Quality of shadows. - \value ShadowNone + \value ShadowQualityNone Shadows are disabled. - \value ShadowLow + \value ShadowQualityLow Shadows are rendered in low quality. - \value ShadowMedium + \value ShadowQualityMedium Shadows are rendered in medium quality. - \value ShadowHigh + \value ShadowQualityHigh Shadows are rendered in high quality. - \value ShadowSoftLow + \value ShadowQualitySoftLow Shadows are rendered in low quality with softened edges. - \value ShadowSoftMedium + \value ShadowQualitySoftMedium Shadows are rendered in medium quality with softened edges. - \value ShadowSoftHigh + \value ShadowQualitySoftHigh Shadows are rendered in high quality with softened edges. */ /*! - \enum QtDataVisualization::QDataVis::LabelTransparency + \enum QtDataVisualization::QDataVis::LabelStyle - Label transparencies. + Label styles. - \value TransparencyNone - Full solid, using colors from theme. - \value TransparencyFromTheme - Use colors and transparencies from theme. - \value TransparencyNoBackground - Draw just text on transparent background. + \value LabelStyleOpaque + Fully opaque background, using colors and borders from theme. + \value LabelStyleFromTheme + Use transparencies, colors and borders from theme. + \value LabelStyleTransparent + Fully transparent background, using text color from theme. */ diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 4cda5fad..738f4775 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -45,7 +45,7 @@ QVector3D Utils::vectorFromColor(const QColor &color) } QImage Utils::printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor, - const QColor &txtColor, QDataVis::LabelTransparency transparency, + const QColor &txtColor, QDataVis::LabelStyle style, bool borders, int maxLabelWidth) { GLuint paddingWidth = 15; @@ -55,7 +55,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo valueFont.setPointSize(textureFontSize); QFontMetrics valueFM(valueFont); int valueStrWidth = valueFM.width(text); - if (maxLabelWidth && QDataVis::TransparencyNoBackground != transparency) + if (maxLabelWidth && QDataVis::LabelStyleTransparent != style) valueStrWidth = maxLabelWidth; int valueStrHeight = valueFM.height(); QSize labelSize; @@ -73,7 +73,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo labelSize.setHeight(getNearestPowerOfTwo(labelSize.height(), paddingHeight)); //qDebug() << "label size after padding" << labelSize << paddingWidth << paddingHeight; #else - if (QDataVis::TransparencyNoBackground == transparency) + if (QDataVis::LabelStyleTransparent == style) labelSize = QSize(valueStrWidth, valueStrHeight); else labelSize = QSize(valueStrWidth + paddingWidth * 2, valueStrHeight + paddingHeight * 2); @@ -89,8 +89,8 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo painter.setRenderHint(QPainter::Antialiasing, true); painter.setCompositionMode(QPainter::CompositionMode_Source); painter.setFont(valueFont); - switch (transparency) { - case QDataVis::TransparencyNoBackground: { + switch (style) { + case QDataVis::LabelStyleTransparent: { painter.setPen(txtColor); #if defined(Q_OS_ANDROID) painter.drawText((labelSize.width() - valueStrWidth) / 2.0f, @@ -106,7 +106,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo #endif break; } - case QDataVis::TransparencyFromTheme: { + case QDataVis::LabelStyleFromTheme: { painter.setBrush(QBrush(bgrColor)); if (borders) { painter.setPen(QPen(QBrush(txtColor), 5, Qt::SolidLine, Qt::SquareCap, Qt::RoundJoin)); @@ -124,7 +124,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo text); break; } - case QDataVis::TransparencyNone: { + case QDataVis::LabelStyleOpaque: { QColor labelColor = QColor(bgrColor); labelColor.setAlphaF(1.0); painter.setBrush(QBrush(labelColor)); diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 6e40eea7..6ebd16de 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -59,7 +59,7 @@ public: const QString &text, const QColor &bgrColor, const QColor &txtColor, - QDataVis::LabelTransparency transparency, + QDataVis::LabelStyle style, bool borders = false, int maxLabelWidth = 0); static QVector3D getSelection(QPoint mousepos, int height); diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 25d7e39d..cbee6376 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -77,14 +77,14 @@ QFont AbstractDeclarative::font() const return m_controller->font(); } -void AbstractDeclarative::setLabelTransparency(QDataVis::LabelTransparency transparency) +void AbstractDeclarative::setLabelStyle(QDataVis::LabelStyle style) { - m_controller->setLabelTransparency(transparency); + m_controller->setLabelStyle(style); } -QDataVis::LabelTransparency AbstractDeclarative::labelTransparency() const +QDataVis::LabelStyle AbstractDeclarative::labelStyle() const { - return m_controller->labelTransparency(); + return m_controller->labelStyle(); } void AbstractDeclarative::setGridVisible(bool visible) diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 843e4fad..30789126 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -42,7 +42,7 @@ class AbstractDeclarative : public QQuickItem { Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) - Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) @@ -51,7 +51,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) - Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) + Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) Q_ENUMS(QtDataVisualization::QDataVis::Theme) Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat) @@ -74,8 +74,8 @@ public: virtual void setFont(const QFont &font); virtual QFont font() const; - virtual void setLabelTransparency(QDataVis::LabelTransparency transparency); - virtual QDataVis::LabelTransparency labelTransparency() const; + virtual void setLabelStyle(QDataVis::LabelStyle style); + virtual QDataVis::LabelStyle labelStyle() const; virtual void setGridVisible(bool visible); virtual bool isGridVisible() const; -- cgit v1.2.3