Added MaskedBlur effect

3 files changed, 217 insertions, 0 deletions

diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp
index 42ed280..c6915a9 100644
--- a/tests/auto/tst_qtgraphicaleffects.cpp
+++ b/tests/auto/tst_qtgraphicaleffects.cpp
@@ -66,6 +66,7 @@ private slots:
     void innerShadow();
     void levelAdjust();
     void linearGradient();
+    void maskedBlur();
     void opacityMask();
     void radialBlur();
     void radialGradient();
@@ -697,6 +698,33 @@ void tst_qtgraphicaleffects::levelAdjust()
     delete obj;
 }
 
+void tst_qtgraphicaleffects::maskedBlur()
+{
+    // Creation
+    QString componentStr = "import QtQuick 2.0\n"
+            "import effects 0.1\n"
+            "MaskedBlur {"
+            "source: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}"
+            "maskSource: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}"
+            "width: 50; height: 50\n"
+            "}";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QObject *obj = component.create();
+    QTest::qWait(100);
+    QVERIFY(obj != 0);
+
+    // Default values
+    QCOMPARE(obj->property("source").toInt(), 0);
+    QCOMPARE(obj->property("maskSource").toInt(), 0);
+    QCOMPARE(obj->property("radius").toDouble(), 0.0);
+    QCOMPARE(obj->property("maximumRadius").toInt(), 0);
+    QCOMPARE(obj->property("cached").toBool(), false);
+    QCOMPARE(obj->property("transparentBorder").toBool(), false);
+    QCOMPARE(obj->property("fast").toBool(), false);
+
+    delete obj;
+}
 
 QTEST_MAIN(tst_qtgraphicaleffects)
 
diff --git a/tests/manual/testbed/TestBedModel.qml b/tests/manual/testbed/TestBedModel.qml
index 58eb38b..7fb27ec 100644
--- a/tests/manual/testbed/TestBedModel.qml
+++ b/tests/manual/testbed/TestBedModel.qml
@@ -48,6 +48,7 @@ ListModel {
     ListElement { name: "TestRectangularGlow.qml"; group: "Glow"; last: true }
     ListElement { name: "TestFastBlur.qml"; group: "Blur" }
     ListElement { name: "TestGaussianBlur.qml"; group: "Blur" }
+    ListElement { name: "TestMaskedBlur.qml"; group: "Blur" }
     ListElement { name: "TestRecursiveBlur.qml"; group: "Blur"; last: true }
     ListElement { name: "TestDirectionalBlur.qml"; group: "Motion Blur";  }
     ListElement { name: "TestRadialBlur.qml"; group: "Motion Blur";  }
diff --git a/tests/manual/testbed/TestMaskedBlur.qml b/tests/manual/testbed/TestMaskedBlur.qml
new file mode 100644
index 0000000..1c5fe35
--- /dev/null
+++ b/tests/manual/testbed/TestMaskedBlur.qml
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Graphical Effects module.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../../../src/effects"
+
+TestCaseTemplate {
+    ImageSource {
+        id: imageSource
+        source: "images/butterfly.png"
+        forcedUpdateAnimationRunning: updateCheckBox.selected
+    }
+
+    Rectangle {
+        id: maskSource
+        anchors.fill: imageSource
+        gradient: Gradient {
+                 GradientStop { position: 0.3; color: Qt.rgba(maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value) }
+                 GradientStop { position: 0.7; color: Qt.rgba(maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value) }
+        }
+    }
+
+    ShaderEffectSource {
+        id: shaderEffectSource
+        sourceItem: imageSource
+        live: updateCheckBox.selected
+        hideSource: enabledCheckBox.selected
+        smooth: true
+        onLiveChanged: scheduleUpdate()
+        visible: false
+    }
+
+    ShaderEffectSource {
+        id: shaderEffectMaskSource
+        sourceItem: maskSource
+        live: true
+        hideSource: enabledCheckBox.selected
+        smooth: true
+        onLiveChanged: scheduleUpdate()
+        visible: false
+    }
+
+    MaskedBlur {
+        id: effect
+        anchors.fill: imageSource
+        radius: radiusSlider.value
+        maximumRadius: maximumRadiusSlider.value
+        transparentBorder: transparentBorderCheckBox.selected
+        visible: enabledCheckBox.selected
+        cached: cachedCheckBox.selected
+        fast: fastCheckBox.selected
+        source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource
+        maskSource: sourceType.value == "shaderEffectSource" ? shaderEffectMaskSource : maskSource
+    }
+
+    bgColor: bgColorPicker.color
+    controls: [
+        Control {
+            caption: "general"
+            Slider {
+                id: radiusSlider
+                minimum: 0.0
+                maximum: 64.0
+                value: 16.0
+                caption: "radius"
+            }
+            Slider {
+                id: maximumRadiusSlider
+                minimum: 0
+                maximum: 16
+                value: 16
+                integer: true
+                caption: "maximumRadius"
+            }
+            CheckBox {
+                id: transparentBorderCheckBox
+                caption: "transparentBorder"
+                selected: false
+            }
+            CheckBox {
+                id: fastCheckBox
+                caption: "fast"
+                selected: false
+            }
+        },
+        Control {
+            caption: "maskSource gradient"
+            Slider {
+                id: maskAlphaBeginSlider
+                minimum: 0.0
+                maximum: 1.0
+                value: 1.0
+                caption: "opacity begin"
+            }
+            Slider {
+                id: maskAlphaEndSlider
+                minimum: 0.0
+                maximum: 1.0
+                value: 0.0
+                caption: "opacity end"
+            }
+        },
+
+        Control {
+            caption: "advanced"
+            last: true
+            Label {
+                caption: "Effect size"
+                text: effect.width + "x" + effect.height
+            }
+            Label {
+                caption: "FPS"
+                text: fps
+            }
+            CheckBox {
+                id: cachedCheckBox
+                caption: "cached"
+            }
+            CheckBox {
+                id: enabledCheckBox
+                caption: "enabled"
+            }
+            CheckBox {
+                id: updateCheckBox
+                caption: "animated"
+                selected: false
+            }
+            RadioButtonColumn {
+                id: sourceType
+                value: "shaderEffectSource"
+                caption: "source type"
+                RadioButton {
+                    caption: "shaderEffectSource"
+                    selected: caption == sourceType.value
+                    onPressedChanged: sourceType.value = caption
+                }
+                RadioButton {
+                    caption: "image"
+                    selected: caption == sourceType.value
+                    onPressedChanged: {
+                        sourceType.value = caption
+                        updateCheckBox.selected = false
+                    }
+                }
+            }
+            BGColorPicker {
+                id: bgColorPicker
+            }
+        }
+    ]
+}