Merge lp:~fboucault/qt-halide/expose_qimage into lp:qt-halide

[Florian Boucault]

New property QImage HalideImage::image exposing backing QImage.
New parameter to HalideTransform::scheduleUpdate(bool requiresQImage) ensuring HalideTransform::output will be backed by a QImage.

[Ugo Riboni (uriboni)]

LGTM unless you want to add some unit tests that cover the case when there is no backing QImage

review: Approve

=== modified file 'src/QtHalide/halide_image.cpp'
--- src/QtHalide/halide_image.cpp	2015-04-09 21:30:38 +0000
+++ src/QtHalide/halide_image.cpp	2015-06-09 16:35:21 +0000
@@ -142,6 +142,20 @@
     }
 }
 
+/*!
+    \qmlproperty QImage HalideImage::image
+
+    Returns the QImage backing the HalideImage if any.
+*/
+QImage HalideImage::image() const
+{
+    if (m_data) {
+        return m_data->image;
+    } else {
+        return QImage();
+    }
+}
+
 void HalideImage::setData(QSharedPointer<HalideImageData> data)
 {
     Q_ASSERT_X(!data.isNull(), "HalideImage::setData", "cannot set null data");
@@ -161,6 +175,10 @@
         if (data->size != oldData->size) {
             Q_EMIT sizeChanged();
         }
+
+        if (data->image != oldData->image) {
+            Q_EMIT imageChanged();
+        }
     }
     Q_EMIT dataChanged();
 }
@@ -230,6 +248,7 @@
 
     if (m_reload.isFinished()) {
         if (m_source.isEmpty()) {
+            m_data.reset(new HalideImageData);
             setStatus(HalideImage::Null);
         } else {
             setStatus(HalideImage::Loading);

=== modified file 'src/QtHalide/halide_image.h'
--- src/QtHalide/halide_image.h	2015-04-08 15:48:49 +0000
+++ src/QtHalide/halide_image.h	2015-06-09 16:35:21 +0000
@@ -50,6 +50,7 @@
     Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize NOTIFY sourceSizeChanged)
     Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QImage image READ image NOTIFY imageChanged)
 
 public:
     explicit HalideImage(QObject *parent = 0);
@@ -64,6 +65,7 @@
     QSize sourceSize() const;
     QSize size() const;
     Status status() const;
+    QImage image() const;
 
     void setSource(QUrl source);
     void setSourceSize(QSize sourceSize);
@@ -75,6 +77,7 @@
     void sourceSizeChanged();
     void sizeChanged();
     void statusChanged(HalideImage::Status);
+    void imageChanged();
     void dataChanged();
 
 private Q_SLOTS:

=== modified file 'src/QtHalide/halide_transform.cpp'
--- src/QtHalide/halide_transform.cpp	2015-04-09 21:30:38 +0000
+++ src/QtHalide/halide_transform.cpp	2015-06-09 16:35:21 +0000
@@ -297,13 +297,16 @@
 
 
 /*!
-    \qmlmethod HalideTransform::scheduleUpdate()
+    \qmlmethod HalideTransform::scheduleUpdate(bool requiresQImage)
 
     Requests the transform to recompute its output.
+
+    If \a requiresQImage is true then \l output will be backed by a QImage
+    accessible through its \l HalideImage::image property.
 */
-void HalideTransform::scheduleUpdate()
+void HalideTransform::scheduleUpdate(bool requiresQImage)
 {
-    doUpdate(false);
+    doUpdate(requiresQImage);
 }
 
 void HalideTransform::doUpdate(bool outputImageRequired)

=== modified file 'src/QtHalide/halide_transform.h'
--- src/QtHalide/halide_transform.h	2015-04-08 15:48:49 +0000
+++ src/QtHalide/halide_transform.h	2015-06-09 16:35:21 +0000
@@ -50,7 +50,7 @@
     virtual void componentComplete();
 
     Q_INVOKABLE bool saveToFile(QString fileName);
-    Q_SLOT void scheduleUpdate();
+    Q_SLOT void scheduleUpdate(bool requiresQImage = false);
 
     bool live() const;
     void setLive(bool live);

=== modified file 'tests/unit/QtHalideTestHelper/test_helper.cpp'
--- tests/unit/QtHalideTestHelper/test_helper.cpp	2015-04-08 15:48:49 +0000
+++ tests/unit/QtHalideTestHelper/test_helper.cpp	2015-06-09 16:35:21 +0000
@@ -34,3 +34,13 @@
 {
     return QFile::remove(path);
 }
+
+QColor TestHelper::pixelColor(QImage image, int x, int y)
+{
+    return QColor(image.pixel(x, y));
+}
+
+QSize TestHelper::imageSize(QImage image)
+{
+    return image.size();
+}

=== modified file 'tests/unit/QtHalideTestHelper/test_helper.h'
--- tests/unit/QtHalideTestHelper/test_helper.h	2015-04-08 15:48:49 +0000
+++ tests/unit/QtHalideTestHelper/test_helper.h	2015-06-09 16:35:21 +0000
@@ -18,6 +18,8 @@
 #define TEST_HELPER_H
 
 #include <QtCore/QObject>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
 
 class TestHelper : public QObject
 {
@@ -30,6 +32,8 @@
     QString saveLocation() const;
 
     Q_INVOKABLE bool deleteFile(QString path);
+    Q_INVOKABLE QColor pixelColor(QImage image, int x, int y);
+    Q_INVOKABLE QSize imageSize(QImage image);
 
 Q_SIGNALS:
     void saveLocationChanged();

=== modified file 'tests/unit/tst_image.qml'
--- tests/unit/tst_image.qml	2015-04-08 15:48:49 +0000
+++ tests/unit/tst_image.qml	2015-06-09 16:35:21 +0000
@@ -88,6 +88,22 @@
             compare(input.size.height, 10, "height not matching");
         }
 
+        function test_qimage() {
+            input.setSourceAndCheckStatus("", Image.Null);
+            var imageSize = helper.imageSize(input.image);
+            compare(imageSize.width, 0, "input.image has incorrect width");
+            compare(imageSize.height, 0, "input.image has incorrect height");
+
+            input.setSourceAndCheckStatus("in.png", Image.Ready);
+            imageSize = helper.imageSize(input.image);
+            compare(imageSize.width, 10, "input.image has incorrect width");
+            compare(imageSize.height, 10, "input.image has incorrect height");
+
+            var firstPixelColor = helper.pixelColor(input.image, 0, 0);
+            var expectedColor = Qt.rgba(128/255, 128/255, 128/255, 255/255);
+            verify(Qt.colorEqual(firstPixelColor, expectedColor), "input.image has incorrect content");
+        }
+
         function test_setNullData() {
             skip("CRASHES + QtHalideTestHelper does not have setImageData and checkImageData for now")
             helper.setImageData(input, null);

=== modified file 'tests/unit/tst_transform.qml'
--- tests/unit/tst_transform.qml	2015-04-08 15:48:49 +0000
+++ tests/unit/tst_transform.qml	2015-06-09 16:35:21 +0000
@@ -61,6 +61,10 @@
         test: test
     }
 
+    TestHelper {
+        id: helper
+    }
+
     ComparePixelsTestCase {
         id: test
         name: "TransformTest"
@@ -155,6 +159,32 @@
             transform.functions = "hello";
             compare(transform.functions.count, 0, "function list is not empty after invalid set");
         }
+
+        function test_schedule_update() {
+            transform.live = false;
+            transform.input = input;
+            transform.functions = [red];
+            compareAllPixelsWithColor(128, 128, 128, 255, "unexpected output present before going live");
+
+            transform.scheduleUpdate();
+            spy.waitForUpdate();
+            compareAllPixelsWithColor(255, 128, 128, 255, "filters were not applied when update requested");
+        }
+
+        function test_schedule_update_request_qimage() {
+            transform.live = false;
+            transform.input = input;
+            transform.functions = [red];
+            transform.scheduleUpdate(true);
+            spy.waitForUpdate();
+
+            var imageSize = helper.imageSize(transform.output.image);
+            compare(imageSize.width, 10, "transform.output.image has incorrect width");
+            compare(imageSize.height, 10, "transform.output.image has incorrect height");
+            var firstPixelColor = helper.pixelColor(transform.output.image, 0, 0);
+            var expectedColor = Qt.rgba(255/255, 128/255, 128/255, 255/255);
+            verify(Qt.colorEqual(firstPixelColor, expectedColor), "transform.output.image has incorrect content");
+        }
     }
 }