diff options
Diffstat (limited to 'examples/quick/multieffect/testbed/qml')
| -rw-r--r-- | examples/quick/multieffect/testbed/qml/Settings.qml | 28 | ||||
| -rw-r--r-- | examples/quick/multieffect/testbed/qml/SettingsView.qml | 46 | ||||
| -rw-r--r-- | examples/quick/multieffect/testbed/qml/main.qml | 12 |
3 files changed, 43 insertions, 43 deletions
diff --git a/examples/quick/multieffect/testbed/qml/Settings.qml b/examples/quick/multieffect/testbed/qml/Settings.qml index 82db53202c..6139bdc6f4 100644 --- a/examples/quick/multieffect/testbed/qml/Settings.qml +++ b/examples/quick/multieffect/testbed/qml/Settings.qml @@ -28,9 +28,9 @@ QtObject { property real contrast: 0.0 property bool saturationEnabled: true property real saturation: 0.0 - property bool colorizeEnabled: true - property color colorizeColor: Qt.rgba(1.0, 0.0, 0.0, 1.0) - property real colorize: 0.0 + property bool colorizationEnabled: true + property color colorizationColor: Qt.rgba(1.0, 0.0, 0.0, 1.0) + property real colorization: 0.0 property bool blurEnabled: true property real blur: 0.0 @@ -47,10 +47,10 @@ QtObject { property bool maskEnabled: true property bool maskInverted: false - property real maskThresholdLow: 0.0 - property real maskSpreadLow: 0.0 - property real maskThresholdUp: 1.0 - property real maskSpreadUp: 0.0 + property real maskThresholdMin: 0.0 + property real maskSpreadAtMin: 0.0 + property real maskThresholdMax: 1.0 + property real maskSpreadAtMax: 0.0 function reset() { autoPaddingEnabled = defaultSettings.autoPaddingEnabled; @@ -62,9 +62,9 @@ QtObject { contrast = defaultSettings.contrast; saturationEnabled = defaultSettings.saturationEnabled; saturation = defaultSettings.saturation; - colorizeEnabled = defaultSettings.colorizeEnabled; - colorizeColor = defaultSettings.colorizeColor; - colorize = defaultSettings.colorize; + colorizationEnabled = defaultSettings.colorizationEnabled; + colorizationColor = defaultSettings.colorizationColor; + colorization = defaultSettings.colorization; blurEnabled = defaultSettings.blurEnabled; blur = defaultSettings.blur; @@ -81,10 +81,10 @@ QtObject { maskEnabled = defaultSettings.maskEnabled; maskInverted = defaultSettings.maskInverted; - maskThresholdLow = defaultSettings.maskThresholdLow; - maskSpreadLow = defaultSettings.maskSpreadLow; - maskThresholdUp = defaultSettings.maskThresholdUp; - maskSpreadUp = defaultSettings.maskSpreadUp; + maskThresholdMin = defaultSettings.maskThresholdMin; + maskSpreadAtMin = defaultSettings.maskSpreadAtMin; + maskThresholdMax = defaultSettings.maskThresholdMax; + maskSpreadAtMax = defaultSettings.maskSpreadAtMax; rootItem.reseted(); } diff --git a/examples/quick/multieffect/testbed/qml/SettingsView.qml b/examples/quick/multieffect/testbed/qml/SettingsView.qml index d0d70958bf..9b753298dd 100644 --- a/examples/quick/multieffect/testbed/qml/SettingsView.qml +++ b/examples/quick/multieffect/testbed/qml/SettingsView.qml @@ -11,9 +11,9 @@ Item { property real showAnimation: show ? 1 : 0 function resetSettings() { - colorizeColorSelector.setValues(defaultSettings.colorizeColor.r, - defaultSettings.colorizeColor.g, - defaultSettings.colorizeColor.b); + colorizationColorSelector.setValues(defaultSettings.colorizationColor.r, + defaultSettings.colorizationColor.g, + defaultSettings.colorizationColor.b); shadowColorSelector.setValues(defaultSettings.shadowColor.r, defaultSettings.shadowColor.g, defaultSettings.shadowColor.b); @@ -213,25 +213,25 @@ Item { } } SettingsComponentSlider { - text: qsTr("Colorize") + ": " + value.toFixed(3) + text: qsTr("Colorization") + ": " + value.toFixed(3) showCheckbox: true - checked: settings.colorizeEnabled + checked: settings.colorizationEnabled onToggled: { - settings.colorizeEnabled = checked; + settings.colorizationEnabled = checked; } - value: settings.colorize + value: settings.colorization from: 0 to: 1 onMoved: { - settings.colorize = value; + settings.colorization = value; } } SettingsComponentColorSelector { - id: colorizeColorSelector - text: qsTr("Colorize Color") + id: colorizationColorSelector + text: qsTr("Colorization Color") width: settings.settingsViewWidth - 10 onValueChanged: { - settings.colorizeColor = value; + settings.colorizationColor = value; } } } @@ -359,39 +359,39 @@ Item { height: 20 * dp } SettingsComponentSlider { - text: qsTr("Mask Lower Threshold") + ": " + value.toFixed(3) - value: settings.maskThresholdLow + text: qsTr("Mask Threshold Min") + ": " + value.toFixed(3) + value: settings.maskThresholdMin from: 0.0 to: 1.0 onMoved: { - settings.maskThresholdLow = value; + settings.maskThresholdMin = value; } } SettingsComponentSlider { - text: qsTr("Mask Lower Spread") + ": " + value.toFixed(3) - value: settings.maskSpreadLow + text: qsTr("Mask Spread At Min") + ": " + value.toFixed(3) + value: settings.maskSpreadAtMin from: 0.0 to: 1.0 onMoved: { - settings.maskSpreadLow = value; + settings.maskSpreadAtMin = value; } } SettingsComponentSlider { - text: qsTr("Mask Upper Threshold") + ": " + value.toFixed(3) - value: settings.maskThresholdUp + text: qsTr("Mask Threshold Max") + ": " + value.toFixed(3) + value: settings.maskThresholdMax from: 0.0 to: 1.0 onMoved: { - settings.maskThresholdUp = value; + settings.maskThresholdMax = value; } } SettingsComponentSlider { - text: qsTr("Mask Upper Spread") + ": " + value.toFixed(3) - value: settings.maskSpreadUp + text: qsTr("Mask Spread At Max") + ": " + value.toFixed(3) + value: settings.maskSpreadAtMax from: 0.0 to: 1.0 onMoved: { - settings.maskSpreadUp = value; + settings.maskSpreadAtMax = value; } } } diff --git a/examples/quick/multieffect/testbed/qml/main.qml b/examples/quick/multieffect/testbed/qml/main.qml index 71cec0a486..6d34a47bfa 100644 --- a/examples/quick/multieffect/testbed/qml/main.qml +++ b/examples/quick/multieffect/testbed/qml/main.qml @@ -85,8 +85,8 @@ Rectangle { brightness: settings.brightnessEnabled ? settings.brightness : 0 contrast: settings.contrastEnabled ? settings.contrast : 0 saturation: settings.saturationEnabled ? settings.saturation : 0 - colorizeColor: settings.colorizeColor - colorize: settings.colorizeEnabled ? settings.colorize : 0 + colorizationColor: settings.colorizationColor + colorization: settings.colorizationEnabled ? settings.colorization : 0 blurEnabled: settings.blurEnabled blur: settings.blur blurMax: settings.blurMax @@ -100,10 +100,10 @@ Rectangle { shadowScale: settings.shadowScale maskEnabled: settings.maskEnabled maskInverted: settings.maskInverted - maskThresholdLow: settings.maskThresholdLow - maskSpreadLow: settings.maskSpreadLow - maskThresholdUp: settings.maskThresholdUp - maskSpreadUp: settings.maskSpreadUp + maskThresholdMin: settings.maskThresholdMin + maskSpreadAtMin: settings.maskSpreadAtMin + maskThresholdMax: settings.maskThresholdMax + maskSpreadAtMax: settings.maskSpreadAtMax onItemSizeChanged: { warningsView.showSizeWarning(); |