Commit beada9ea authored by Victor Yacovlev's avatar Victor Yacovlev

Merge branch 'colorcompare'

parents 0fc4594f 09239e74
......@@ -25,6 +25,14 @@
"arguments": [
{ "name": "x", "baseType": "color" }
]
},
{
"name": {"ascii": "="},
"returnType": "bool",
"arguments": [
{ "name": "x", "baseType": "color" },
{ "name": "y", "baseType": "color" }
]
}
]
}
......@@ -247,6 +247,14 @@ static quint32 colorToUintValue(const Color &x)
}
bool _ColorerModule::runOperatorEQUAL(const Color &x, const Color &y)
{
return x.a == y.a &&
x.r == y.r &&
x.g == y.g &&
x.b == y.b;
}
} // namespace Actor_Colorer
......@@ -36,7 +36,7 @@ public slots:
void reset();
Color runOperatorINPUT(const QString& x, bool& ok);
QString runOperatorOUTPUT(const Color& x);
bool runOperatorEQUAL(const Color& x, const Color& y);
/* ========= CLASS PRIVATE ========= */
......
......@@ -179,7 +179,7 @@
"async": false,
"arguments": [
{ "name": {"ascii": "width", "ru_RU": "толщина"}, "baseType": "int" },
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" }
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" }
]
},
{
......@@ -188,7 +188,7 @@
"arguments": [
{ "name": "x", "baseType": "int" },
{ "name": "y", "baseType": "int" },
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" }
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" }
]
},
{
......@@ -212,7 +212,7 @@
"name": {"ascii": "split to CMYK", "ru_RU": "разложить в CMYK"},
"async": false,
"arguments": [
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" },
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" },
{ "name": "c", "baseType": "int", "access": "out" },
{ "name": "m", "baseType": "int", "access": "out" },
{ "name": "y", "baseType": "int", "access": "out" },
......@@ -223,7 +223,7 @@
"name": {"ascii": "split to HSL", "ru_RU": "разложить в HSL"},
"async": false,
"arguments": [
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" },
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" },
{ "name": "h", "baseType": "int", "access": "out" },
{ "name": "s", "baseType": "int", "access": "out" },
{ "name": "l", "baseType": "int", "access": "out" }
......@@ -233,7 +233,7 @@
"name": {"ascii": "split to HSV", "ru_RU": "разложить в HSV"},
"async": false,
"arguments": [
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" },
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" },
{ "name": "h", "baseType": "int", "access": "out" },
{ "name": "s", "baseType": "int", "access": "out" },
{ "name": "v", "baseType": "int", "access": "out" }
......@@ -243,7 +243,7 @@
"name": {"ascii": "split to RGB", "ru_RU": "разложить в RGB"},
"async": false,
"arguments": [
{ "name": {"ascii": "color", "ru_RU": "цвет"}, "baseType": "color" },
{ "name": {"ascii": "color_", "ru_RU": "цвет_"}, "baseType": "color" },
{ "name": "r", "baseType": "int", "access": "out" },
{ "name": "g", "baseType": "int", "access": "out" },
{ "name": "b", "baseType": "int", "access": "out" }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment