Texture to surface

API for setting a texture to surface.

Task-number: QTRD-3232
Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 67 insertions, 0 deletions

diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 1107d721..bcfc4042 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -300,6 +300,54 @@ QSurface3DSeries::DrawFlags QSurface3DSeries::drawMode() const
 }
 
 /*!
+ * Set the \a texture as a QImage for the surface. To clear the texture, set empty
+ * QImage as texture.
+ */
+void QSurface3DSeries::setTexture(const QImage &texture)
+{
+    if (dptr()->m_texture != texture) {
+        dptr()->setTexture(texture);
+
+        emit textureChanged(texture);
+        dptr()->m_textureFile.clear();
+    }
+}
+
+QImage QSurface3DSeries::texture() const
+{
+    return dptrc()->m_texture;
+}
+
+/*! \property QSurface3DSeries::textureFile
+ *
+ * Holds the texture file name for the surface texture. To clear the texture, set empty
+ * file name.
+ */
+void QSurface3DSeries::setTextureFile(const QString &filename)
+{
+    if (dptr()->m_textureFile != filename) {
+        if (filename.isEmpty()) {
+            setTexture(QImage());
+        } else {
+            QImage image(filename);
+            if (image.isNull()) {
+                qWarning() << "Warning: Tried to set invalid image file as surface texture.";
+                return;
+            }
+            setTexture(image);
+        }
+
+        dptr()->m_textureFile = filename;
+        emit textureFileChanged(filename);
+    }
+}
+
+QString QSurface3DSeries::textureFile() const
+{
+    return dptrc()->m_textureFile;
+}
+
+/*!
  * \internal
  */
 QSurface3DSeriesPrivate *QSurface3DSeries::dptr()
@@ -445,4 +493,11 @@ void QSurface3DSeriesPrivate::setDrawMode(QSurface3DSeries::DrawFlags mode)
     }
 }
 
+void QSurface3DSeriesPrivate::setTexture(const QImage &texture)
+{
+    m_texture = texture;
+    if (static_cast<Surface3DController *>(m_controller))
+        static_cast<Surface3DController *>(m_controller)->updateSurfaceTexture(qptr());
+}
+
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 64df7202..7051e583 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -35,6 +35,8 @@ class QT_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries
     Q_PROPERTY(bool flatShadingEnabled READ isFlatShadingEnabled WRITE setFlatShadingEnabled NOTIFY flatShadingEnabledChanged)
     Q_PROPERTY(bool flatShadingSupported READ isFlatShadingSupported NOTIFY flatShadingSupportedChanged)
     Q_PROPERTY(DrawFlags drawMode READ drawMode WRITE setDrawMode NOTIFY drawModeChanged)
+    Q_PROPERTY(QImage texture READ texture WRITE setTexture NOTIFY textureChanged)
+    Q_PROPERTY(QString textureFile READ textureFile WRITE setTextureFile NOTIFY textureFileChanged)
 
 public:
     enum DrawFlag {
@@ -63,12 +65,19 @@ public:
 
     bool isFlatShadingSupported() const;
 
+    void setTexture(const QImage &texture);
+    QImage texture() const;
+    void setTextureFile(const QString &filename);
+    QString textureFile() const;
+
 signals:
     void dataProxyChanged(QSurfaceDataProxy *proxy);
     void selectedPointChanged(const QPoint &position);
     void flatShadingEnabledChanged(bool enable);
     void flatShadingSupportedChanged(bool enable);
     void drawModeChanged(QSurface3DSeries::DrawFlags mode);
+    void textureChanged(const QImage &image);
+    void textureFileChanged(const QString &filename);
 
 protected:
     explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = 0);
diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h
index d4cc2820..270a3ad1 100644
--- a/src/datavisualization/data/qsurface3dseries_p.h
+++ b/src/datavisualization/data/qsurface3dseries_p.h
@@ -48,6 +48,7 @@ public:
     void setSelectedPoint(const QPoint &position);
     void setFlatShadingEnabled(bool enabled);
     void setDrawMode(QSurface3DSeries::DrawFlags mode);
+    void setTexture(const QImage &texture);
 
 private:
     QSurface3DSeries *qptr();
@@ -55,6 +56,8 @@ private:
     QPoint m_selectedPoint;
     bool m_flatShadingEnabled;
     QSurface3DSeries::DrawFlags m_drawMode;
+    QImage m_texture;
+    QString m_textureFile;
 
 private:
     friend class QSurface3DSeries;