diff options
author | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-10 16:33:53 +0200 |
---|---|---|
committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-10 16:33:53 +0200 |
commit | b5b50593d4eca7932eec1e0f727bbc8b2f43f229 (patch) | |
tree | a6f6432a2ee78c8a0da8c2e31767d24501bed18b /tests/manual | |
parent | 9adb74149e07b8d750596dff928d7d725e16c74a (diff) | |
download | qtgraphicaleffects-b5b50593d4eca7932eec1e0f727bbc8b2f43f229.tar.gz |
Simplified manual test codes
Diffstat (limited to 'tests/manual')
25 files changed, 36 insertions, 710 deletions
diff --git a/tests/manual/testbed/ImageSource.qml b/tests/manual/testbed/ImageSource.qml index f1a2368..511fe6e 100644 --- a/tests/manual/testbed/ImageSource.qml +++ b/tests/manual/testbed/ImageSource.qml @@ -44,12 +44,13 @@ Image { id: is source: "images/bug.jpg" smooth: true - visible: sourceType.value == "shaderEffectSource" anchors.fill: parent fillMode: Image.PreserveAspectFit sourceSize: width > height ? Qt.size(0, parent.height) : Qt.size(parent.width, 0) + //visible: !enabledCheckBox.selected + opacity: enabledCheckBox.selected ? 0.0 : 1.0 - property bool forcedUpdateAnimationRunning: false + property bool forcedUpdateAnimationRunning: updateCheckBox.selected Text { x: is.width - 10 - width y: 10 diff --git a/tests/manual/testbed/TestBlend.qml b/tests/manual/testbed/TestBlend.qml index fc0d8f8..bf65164 100644 --- a/tests/manual/testbed/TestBlend.qml +++ b/tests/manual/testbed/TestBlend.qml @@ -45,31 +45,11 @@ TestCaseTemplate { ImageSource { id: imageSource1 source: "images/bug.jpg" - forcedUpdateAnimationRunning: updateCheckBox.selected } ImageSource { id: imageSource2 source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource1 - sourceItem: imageSource1 - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false - onLiveChanged: scheduleUpdate() - } - - ShaderEffectSource { - id: shaderEffectSource2 - sourceItem: imageSource2 - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false - onLiveChanged: scheduleUpdate() } Blend { @@ -77,8 +57,8 @@ TestCaseTemplate { anchors.fill: imageSource1 visible: enabledCheckBox.selected cached: cachedCheckBox.selected - backgroundSource: sourceType.value == "shaderEffectSource" ? shaderEffectSource1 : imageSource1 - foregroundSource: sourceType.value == "shaderEffectSource" ? shaderEffectSource2 : imageSource2 + backgroundSource: imageSource1 + foregroundSource: imageSource2 mode: blendMode.value } @@ -228,24 +208,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestBrightnessContrast.qml b/tests/manual/testbed/TestBrightnessContrast.qml index dd57f5a..92a4168 100644 --- a/tests/manual/testbed/TestBrightnessContrast.qml +++ b/tests/manual/testbed/TestBrightnessContrast.qml @@ -44,15 +44,6 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - onLiveChanged: scheduleUpdate() } BrightnessContrast { @@ -62,7 +53,7 @@ TestCaseTemplate { contrast: contrastSlider.value visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -109,24 +100,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestColorOverlay.qml b/tests/manual/testbed/TestColorOverlay.qml index 1fe9273..14ed235 100644 --- a/tests/manual/testbed/TestColorOverlay.qml +++ b/tests/manual/testbed/TestColorOverlay.qml @@ -45,16 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - anchors.fill: imageSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - onLiveChanged: scheduleUpdate() } ColorOverlay { @@ -63,7 +53,7 @@ TestCaseTemplate { color: colorPicker.color visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -102,24 +92,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestColorize.qml b/tests/manual/testbed/TestColorize.qml index 4e5f729..20dfc05 100644 --- a/tests/manual/testbed/TestColorize.qml +++ b/tests/manual/testbed/TestColorize.qml @@ -45,16 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource forcedUpdateAnimationRunning: updateCheckBox.selected - source: "images/butterfly.png" - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false - onLiveChanged: scheduleUpdate() } Colorize { @@ -65,7 +55,7 @@ TestCaseTemplate { lightness: colorPicker.lightness visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -103,24 +93,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestConicalGradient.qml b/tests/manual/testbed/TestConicalGradient.qml index 29bca35..0ef3348 100644 --- a/tests/manual/testbed/TestConicalGradient.qml +++ b/tests/manual/testbed/TestConicalGradient.qml @@ -45,7 +45,6 @@ TestCaseTemplate { ImageSource { id: maskImage source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected Text { text: "MASK" font.pixelSize: 60 @@ -57,22 +56,13 @@ TestCaseTemplate { } } - ShaderEffectSource { - id: maskSource - sourceItem: maskImage - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: false - onLiveChanged: scheduleUpdate() - } ConicalGradient { id: effect anchors.fill: parent cached: cachedCheckBox.selected visible: enabledCheckBox.selected - maskSource: maskCheckBox.selected ? (sourceType.value == "shaderEffectSource" ? maskSource : maskImage) : undefined + maskSource: maskCheckBox.selected ? maskImage : undefined horizontalOffset: (offsetPicker.xValue - 0.5) * width verticalOffset: (offsetPicker.yValue - 0.5) * height gradient: Gradient { @@ -157,24 +147,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestDesaturate.qml b/tests/manual/testbed/TestDesaturate.qml index 1191eb6..c714e41 100644 --- a/tests/manual/testbed/TestDesaturate.qml +++ b/tests/manual/testbed/TestDesaturate.qml @@ -44,16 +44,6 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false - onLiveChanged: scheduleUpdate() } Desaturate { @@ -62,7 +52,7 @@ TestCaseTemplate { desaturation: grayscaleSlider.value visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -102,24 +92,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestDirectionalBlur.qml b/tests/manual/testbed/TestDirectionalBlur.qml index 4742deb..70146c8 100644 --- a/tests/manual/testbed/TestDirectionalBlur.qml +++ b/tests/manual/testbed/TestDirectionalBlur.qml @@ -45,16 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - onLiveChanged: scheduleUpdate() } DirectionalBlur { @@ -66,7 +56,7 @@ TestCaseTemplate { samples: samplesSlider.value visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -126,24 +116,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestDisplace.qml b/tests/manual/testbed/TestDisplace.qml index d5749bd..15ef6f0 100644 --- a/tests/manual/testbed/TestDisplace.qml +++ b/tests/manual/testbed/TestDisplace.qml @@ -46,7 +46,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/bug.jpg" - forcedUpdateAnimationRunning: updateCheckBox.selected } Rectangle { @@ -65,31 +64,13 @@ TestCaseTemplate { } } - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: false - smooth: true - visible: false - onLiveChanged: scheduleUpdate() - } - - ShaderEffectSource { id: shaderEffectNormalSource - sourceItem: displacementMapSource - live: true - hideSource: enabledCheckBox.selected - smooth: true - visible: false - } - Displace { id: effect anchors.fill: imageSource visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource - displacementSource: sourceType.value == "shaderEffectSource" ? shaderEffectNormalSource : di + source: imageSource + displacementSource: displacementMapSource displacement: displacementScaleSlider.value smooth: true MouseArea { diff --git a/tests/manual/testbed/TestDropShadow.qml b/tests/manual/testbed/TestDropShadow.qml index 8aaf3ee..ba18b4c 100644 --- a/tests/manual/testbed/TestDropShadow.qml +++ b/tests/manual/testbed/TestDropShadow.qml @@ -54,7 +54,7 @@ TestCaseTemplate { color: colorPicker.color visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource fast: fastCheckBox.selected } @@ -62,14 +62,7 @@ TestCaseTemplate { id: imageSource source: "images/butterfly.png" anchors.centerIn: parent - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - anchors.fill: imageSource - sourceItem: imageSource - hideSource: false + opacity: 1.0 } PositionPicker { diff --git a/tests/manual/testbed/TestFastBlur.qml b/tests/manual/testbed/TestFastBlur.qml index 16515af..ea723a2 100644 --- a/tests/manual/testbed/TestFastBlur.qml +++ b/tests/manual/testbed/TestFastBlur.qml @@ -44,17 +44,6 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource; - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: enabledCheckBox.selected - onLiveChanged: scheduleUpdate() } FastBlur { @@ -64,7 +53,7 @@ TestCaseTemplate { transparentBorder: transparentBorderCheckBox.selected visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -109,24 +98,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestGammaAdjust.qml b/tests/manual/testbed/TestGammaAdjust.qml index f2f6f38..44ff129 100644 --- a/tests/manual/testbed/TestGammaAdjust.qml +++ b/tests/manual/testbed/TestGammaAdjust.qml @@ -44,26 +44,16 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - forcedUpdateAnimationRunning: updateCheckBox.selected source: "images/butterfly.png" } - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false - onLiveChanged: scheduleUpdate() - } - GammaAdjust { id: effect anchors.fill: imageSource gamma: gammaSlider.value visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -103,24 +93,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestGaussianBlur.qml b/tests/manual/testbed/TestGaussianBlur.qml index d0bdd6c..92629a4 100644 --- a/tests/manual/testbed/TestGaussianBlur.qml +++ b/tests/manual/testbed/TestGaussianBlur.qml @@ -44,16 +44,6 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - onLiveChanged: scheduleUpdate() } GaussianBlur { @@ -65,7 +55,7 @@ TestCaseTemplate { transparentBorder: transparentBorderCheckBox.selected visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -125,24 +115,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestGlow.qml b/tests/manual/testbed/TestGlow.qml index 3059311..3eeedfc 100644 --- a/tests/manual/testbed/TestGlow.qml +++ b/tests/manual/testbed/TestGlow.qml @@ -53,24 +53,14 @@ TestCaseTemplate { visible: enabledCheckBox.selected cached: cachedCheckBox.selected fast: fastCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } ImageSource { id: imageSource source: "images/butterfly.png" anchors.centerIn: parent - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: false - smooth: true - visible: true - onLiveChanged: scheduleUpdate() + opacity: 1.0 } bgColor: bgColorPicker.color @@ -140,24 +130,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestHueSaturation.qml b/tests/manual/testbed/TestHueSaturation.qml index e1aa569..5a8de38 100644 --- a/tests/manual/testbed/TestHueSaturation.qml +++ b/tests/manual/testbed/TestHueSaturation.qml @@ -44,18 +44,9 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - forcedUpdateAnimationRunning: updateCheckBox.selected source: "images/butterfly.png" } - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - visible: false; onLiveChanged: scheduleUpdate() - } - HueSaturation { id: effect anchors.fill: imageSource @@ -64,7 +55,7 @@ TestCaseTemplate { hue: colorPicker.hue saturation: colorPicker.saturation lightness: colorPicker.lightness - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -103,24 +94,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestInnerShadow.qml b/tests/manual/testbed/TestInnerShadow.qml index 94b9923..615351d 100644 --- a/tests/manual/testbed/TestInnerShadow.qml +++ b/tests/manual/testbed/TestInnerShadow.qml @@ -47,14 +47,6 @@ TestCaseTemplate { id: imageSource source: "images/butterfly.png" anchors.centerIn: parent - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - hideSource: enabledCheckBox.selected - smooth: true } InnerShadow { @@ -69,7 +61,7 @@ TestCaseTemplate { visible: enabledCheckBox.selected cached: cachedCheckBox.selected fast: fastCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } PositionPicker { @@ -154,24 +146,6 @@ TestCaseTemplate { 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 color: "#ababab" diff --git a/tests/manual/testbed/TestLevelAdjust.qml b/tests/manual/testbed/TestLevelAdjust.qml index 478ac7b..6223481 100644 --- a/tests/manual/testbed/TestLevelAdjust.qml +++ b/tests/manual/testbed/TestLevelAdjust.qml @@ -45,15 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - onLiveChanged: scheduleUpdate() } LevelAdjust { @@ -61,7 +52,7 @@ TestCaseTemplate { anchors.fill: imageSource visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource minimumInput: colorPicker1.color maximumInput: colorPicker2.color minimumOutput: colorPicker3.color @@ -145,24 +136,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestLinearGradient.qml b/tests/manual/testbed/TestLinearGradient.qml index e269974..5c97d15 100644 --- a/tests/manual/testbed/TestLinearGradient.qml +++ b/tests/manual/testbed/TestLinearGradient.qml @@ -45,7 +45,6 @@ TestCaseTemplate { ImageSource { id: maskImage source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected Text { text: "MASK" font.pixelSize: 60 @@ -57,19 +56,12 @@ TestCaseTemplate { } } - ShaderEffectSource { - id: maskSource - sourceItem: maskImage - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true; visible: false; onLiveChanged: scheduleUpdate() } - LinearGradient { id: effect anchors.fill: parent cached: cachedCheckBox.selected visible: enabledCheckBox.selected - maskSource: maskCheckBox.selected ? (sourceType.value == "shaderEffectSource" ? maskSource : maskImage) : undefined + maskSource: maskCheckBox.selected ? maskImage : undefined start: Qt.point(startPicker.xValue * width, startPicker.yValue * height) end: Qt.point(endPicker.xValue * width, endPicker.yValue * height) gradient: Gradient { @@ -165,24 +157,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestMaskedBlur.qml b/tests/manual/testbed/TestMaskedBlur.qml index fb1c4b3..8944026 100644 --- a/tests/manual/testbed/TestMaskedBlur.qml +++ b/tests/manual/testbed/TestMaskedBlur.qml @@ -45,38 +45,18 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected } Rectangle { id: maskSource anchors.fill: imageSource + visible: !enabledCheckBox.selected 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 @@ -86,8 +66,8 @@ TestCaseTemplate { visible: enabledCheckBox.selected cached: cachedCheckBox.selected fast: fastCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource - maskSource: sourceType.value == "shaderEffectSource" ? shaderEffectMaskSource : maskSource + source: imageSource + maskSource: maskSource } bgColor: bgColorPicker.color @@ -162,24 +142,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestOpacityMask.qml b/tests/manual/testbed/TestOpacityMask.qml index 4708eef..1e041da 100644 --- a/tests/manual/testbed/TestOpacityMask.qml +++ b/tests/manual/testbed/TestOpacityMask.qml @@ -45,13 +45,11 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/bug.jpg" - forcedUpdateAnimationRunning: updateCheckBox.selected + forcedUpdateAnimationRunning: false } ImageSource { id: maskSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - Text { text: "MASK" font.pixelSize: 60 @@ -63,32 +61,13 @@ TestCaseTemplate { } } - ShaderEffectSource { - id: shaderEffectSource1 - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: false - onLiveChanged: scheduleUpdate() - } - ShaderEffectSource { - id: shaderEffectSource2 - sourceItem: maskSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: false - onLiveChanged: scheduleUpdate() - } - OpacityMask { id: effect anchors.fill: imageSource visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource1 : imageSource - maskSource: sourceType.value == "shaderEffectSource" ? shaderEffectSource2 : maskSource + source: imageSource + maskSource: maskSource } bgColor: bgColorPicker.color @@ -117,24 +96,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestRadialBlur.qml b/tests/manual/testbed/TestRadialBlur.qml index 42ac991..9b965a2 100644 --- a/tests/manual/testbed/TestRadialBlur.qml +++ b/tests/manual/testbed/TestRadialBlur.qml @@ -45,16 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - onLiveChanged: scheduleUpdate() } RadialBlur { @@ -67,7 +57,7 @@ TestCaseTemplate { verticalOffset: (offsetPicker.yValue - 0.5) * height visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } PositionPicker { @@ -134,24 +124,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestRadialGradient.qml b/tests/manual/testbed/TestRadialGradient.qml index eae283e..d1cec1f 100644 --- a/tests/manual/testbed/TestRadialGradient.qml +++ b/tests/manual/testbed/TestRadialGradient.qml @@ -45,7 +45,6 @@ TestCaseTemplate { ImageSource { id: maskImage source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected Text { text: "MASK" font.pixelSize: 60 @@ -57,18 +56,12 @@ TestCaseTemplate { } } - ShaderEffectSource { - id: maskSource - sourceItem: maskImage - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected; smooth: true; visible: false; onLiveChanged: scheduleUpdate() } - RadialGradient { id: effect anchors.fill: parent cached: cachedCheckBox.selected visible: enabledCheckBox.selected - maskSource: maskCheckBox.selected ? (sourceType.value == "shaderEffectSource" ? maskSource : maskImage) : undefined + maskSource: maskCheckBox.selected ? maskImage : undefined horizontalOffset: (offsetPicker.xValue - 0.5) * width verticalOffset: (offsetPicker.yValue - 0.5) * height horizontalRadius: horizontalRadiusSlider.value @@ -169,24 +162,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestRecursiveBlur.qml b/tests/manual/testbed/TestRecursiveBlur.qml index 56acb31..1a83748 100644 --- a/tests/manual/testbed/TestRecursiveBlur.qml +++ b/tests/manual/testbed/TestRecursiveBlur.qml @@ -47,15 +47,6 @@ TestCaseTemplate { id: imageSource } - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: true - hideSource: enabledCheckBox.selected - smooth: true - visible: false - } - RecursiveBlur { id: effect loops: iterationSlider.value @@ -64,7 +55,7 @@ TestCaseTemplate { transparentBorder: transparentBorderCheckBox.selected visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } bgColor: bgColorPicker.color @@ -119,24 +110,6 @@ TestCaseTemplate { id: enabledCheckBox caption: "enabled" } - 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 } diff --git a/tests/manual/testbed/TestThresholdMask.qml b/tests/manual/testbed/TestThresholdMask.qml index 1f5c15b..da230d5 100644 --- a/tests/manual/testbed/TestThresholdMask.qml +++ b/tests/manual/testbed/TestThresholdMask.qml @@ -45,32 +45,10 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/bug.jpg" - forcedUpdateAnimationRunning: updateCheckBox.selected } ImageSource { id: maskSource source: "images/fog.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource1 - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: false - onLiveChanged: scheduleUpdate() - } - - ShaderEffectSource { - id: shaderEffectSource2 - sourceItem: maskSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - visible: false - onLiveChanged: scheduleUpdate() } ThresholdMask { @@ -78,8 +56,8 @@ TestCaseTemplate { anchors.fill: imageSource visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource1 : imageSource - maskSource: sourceType.value == "shaderEffectSource" ? shaderEffectSource2 : maskSource + source: imageSource + maskSource: maskSource threshold: thresholdSlider.value spread: fringeSlider.value } @@ -128,24 +106,6 @@ TestCaseTemplate { 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 } diff --git a/tests/manual/testbed/TestZoomBlur.qml b/tests/manual/testbed/TestZoomBlur.qml index 38f9896..efab28e 100644 --- a/tests/manual/testbed/TestZoomBlur.qml +++ b/tests/manual/testbed/TestZoomBlur.qml @@ -45,16 +45,6 @@ TestCaseTemplate { ImageSource { id: imageSource source: "images/butterfly.png" - forcedUpdateAnimationRunning: updateCheckBox.selected - } - - ShaderEffectSource { - id: shaderEffectSource - sourceItem: imageSource - live: updateCheckBox.selected - hideSource: enabledCheckBox.selected - smooth: true - onLiveChanged: scheduleUpdate() } ZoomBlur { @@ -67,7 +57,7 @@ TestCaseTemplate { verticalOffset: (offsetPicker.yValue - 0.5) * height visible: enabledCheckBox.selected cached: cachedCheckBox.selected - source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource + source: imageSource } PositionPicker { @@ -134,24 +124,6 @@ TestCaseTemplate { 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 } |