Commit de24e000 authored by Bruno Coudoin's avatar Bruno Coudoin
Browse files

color_mix, removed double colorization

We were passing colorized item and not using them. Instead
we were colorizing. As we have many trouble on some platforms
for the colorization it is best to use pre-painted items as much
as possible.
parent 688540b9
......@@ -29,12 +29,11 @@ import "."
Image {
id: chooser
source: Activity.url + (activity.modeRGB ? "flashlight.svg" : "tube.svg")
z: 1
property int maxSteps: 10
property int currentStep: 0
property alias hue: color.hue
property real hue
Image {
id: intensity
......@@ -93,14 +92,6 @@ Image {
}
}
Colorize {
id: color
anchors.fill: parent
source: parent
hue: 0.0
saturation: 1
}
ColorButton {
source: Activity.url + "plus.svg"
anchors {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg6431"
viewBox="0 0 178.80735 64.476656"
version="1.0"
inkscape:version="0.48.4 r9939"
width="100%"
height="100%"
sodipodi:docname="tube.svg">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="713"
id="namedview36"
showgrid="false"
inkscape:zoom="2.9577523"
inkscape:cx="105.12125"
inkscape:cy="60.172277"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
inkscape:current-layer="svg6431"
borderlayer="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<defs
id="defs3">
<linearGradient
id="linearGradient12398">
<stop
id="stop12400"
stop-color="#f0f0f0"
offset="0" />
<stop
id="stop12402"
stop-color="#c8c8c8"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient8414">
<stop
id="stop8416"
stop-color="#fff"
offset="0" />
<stop
id="stop8418"
stop-color="#fff"
stop-opacity="0"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient4190"
y2="38.905998"
xlink:href="#linearGradient12398"
gradientUnits="userSpaceOnUse"
x2="143.64999"
y1="73.655998"
x1="141.60001" />
<linearGradient
id="linearGradient4205"
y2="356.22"
gradientUnits="userSpaceOnUse"
x2="142.08"
gradientTransform="translate(133.53,-137.52)"
y1="378.75"
x1="130.14">
<stop
id="stop8446"
stop-color="#e5e5e5"
stop-opacity="0"
offset="0" />
<stop
id="stop8448"
stop-color="#4a4a4a"
stop-opacity=".56842"
offset=".5" />
<stop
id="stop8450"
stop-color="#b8b8b8"
stop-opacity="0"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient4208"
y2="39.810001"
xlink:href="#linearGradient8414"
gradientUnits="userSpaceOnUse"
x2="-106.25"
gradientTransform="matrix(0.82457,0,0,0.95225,-18.827,169.57)"
y1="38.985001"
x1="-96.900002" />
<linearGradient
id="linearGradient4211"
y2="284.64001"
xlink:href="#linearGradient12398"
spreadMethod="repeat"
gradientUnits="userSpaceOnUse"
x2="353.17001"
gradientTransform="matrix(0.80037,0,0,0.82926,3.1209,-4.34)"
y1="287.54999"
x1="353.17001" />
<linearGradient
id="linearGradient4214"
y2="371.23001"
xlink:href="#linearGradient12398"
gradientUnits="userSpaceOnUse"
x2="99.469002"
gradientTransform="matrix(1.7486,0,0,1.1547,-282.46,-195.94)"
y1="370.92999"
x1="104.03" />
<linearGradient
id="linearGradient4217"
y2="92.377998"
xlink:href="#linearGradient8414"
gradientUnits="userSpaceOnUse"
x2="149.10001"
gradientTransform="matrix(0.99685,0,0,1,0.31499,167.58)"
y1="39.280998"
x1="150.81" />
<linearGradient
id="linearGradient4220"
y2="393.82001"
gradientUnits="userSpaceOnUse"
x2="147"
gradientTransform="translate(133.53,-137.52)"
y1="375.92999"
x1="138.39999">
<stop
id="stop3406"
stop-color="#e5e5e5"
offset="0" />
<stop
id="stop8432"
stop-color="#4a4a4a"
offset=".5" />
<stop
id="stop3408"
stop-color="#b8b8b8"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient4224"
y2="323.45001"
xlink:href="#linearGradient12398"
spreadMethod="reflect"
gradientUnits="userSpaceOnUse"
x2="126.66"
gradientTransform="matrix(0.67577,0,0,1.0025,38.717,-56.067)"
y1="294.98999"
x1="125.67" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4205"
id="linearGradient3039"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.87983081,0,0,0.83334367,32.795885,-283.10558)"
x1="130.14"
y1="378.75"
x2="142.08"
y2="356.22" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8414"
id="linearGradient3042"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.72548206,0,0,0.79355148,68.123344,-27.194073)"
x1="-96.900002"
y1="38.985001"
x2="-106.25"
y2="39.810001" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12398"
id="linearGradient3048"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5384721,0,0,0.96226196,-163.82908,-331.78952)"
x1="104.03"
y1="370.92999"
x2="99.469002"
y2="371.23001" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8414"
id="linearGradient3051"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8770593,0,0,0.83334364,-84.41078,-29.415923)"
x1="150.81"
y1="39.280998"
x2="149.10001"
y2="92.377998" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4220"
id="linearGradient3054"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.87983076,0,0,0.83334364,32.795884,-283.10557)"
x1="138.39999"
y1="375.92999"
x2="147"
y2="393.82001" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12398"
id="linearGradient3057"
gradientUnits="userSpaceOnUse"
x1="141.60001"
y1="73.655998"
x2="143.64999"
y2="38.905998"
gradientTransform="matrix(0.8770593,0,0,0.83334364,-84.132877,-29.827438)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12398"
id="linearGradient3060"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.59456326,0,0,0.83542703,-50.623512,-215.22724)"
spreadMethod="reflect"
x1="125.67"
y1="294.98999"
x2="126.66"
y2="323.45001" />
</defs>
<path
id="path6381"
style="color:#000000;fill:url(#linearGradient3060);stroke:#000000;stroke-width:1.71254373;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 9.295604,2.0479562 142.57237,9.5647164 V 55.448617 L 9.295604,62.957044 V 2.0479562 z"
inkscape:connector-curvature="0" />
<path
id="path8406"
d="M 9.3265613,2.2046253 V 31.553321 H 142.12211 V 9.7047174 L 9.3265613,2.2046253 z"
style="color:#000000;fill:url(#linearGradient3057)"
inkscape:connector-curvature="0" />
<path
id="path6385"
d="M 161.72629,24.614902 142.37001,9.6230494 142.50198,55.423616 161.72629,40.390098 V 24.614902 z"
style="color:#000000;fill:url(#linearGradient3054)"
inkscape:connector-curvature="0" />
<path
id="path8410"
d="M 13.061281,3.6428191 V 26.609768 c 46.243905,11.841815 88.484569,9.041779 128.068169,4.675058 0.29034,-15.825194 0.32553,-4.183384 0.21115,-18.925233 -0.17596,-1.16668 -0.95901,-2.225028 -2.52511,-2.316696 L 13.061281,3.6428191 z"
style="opacity:0.87879004;color:#000000;fill:url(#linearGradient3051)"
inkscape:connector-curvature="0" />
<rect
id="rect6383"
style="color:#000000;fill:url(#linearGradient3048);stroke:#000000;stroke-width:1.71254373;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="scale(-1,1)"
height="62.764114"
width="9.9438477"
y="0.85627186"
x="-10.800113" />
<rect
id="rect6387"
style="color:#000000;fill:#e6e6e6;stroke:#000000;stroke-width:1.4947722;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
height="16.079367"
width="16.272078"
y="24.5357"
x="161.78789" />
<rect
id="rect8434"
style="color:#000000;fill:url(#linearGradient3042)"
transform="scale(-1,1)"
height="59.829906"
width="6.7865744"
y="2.114629"
x="-8.9612694" />
<path
id="path8440"
style="color:#000000;fill:url(#linearGradient3039);stroke:#000000;stroke-width:1.71254373;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 161.72629,24.614902 142.37001,9.6230494 142.50198,55.423616 161.72629,40.390098 V 24.614902 z"
inkscape:connector-curvature="0" />
<metadata
id="metadata34">
<rdf:RDF>
<cc:Work>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:publisher>
<cc:Agent
rdf:about="http://openclipart.org/">
<dc:title>Openclipart</dc:title>
</cc:Agent>
</dc:publisher>
<dc:title>Color tube White</dc:title>
<dc:date>2010-07-14T11:43:29</dc:date>
<dc:description>Colored tube of paint</dc:description>
<dc:source>http://openclipart.org/detail/72877/color-tube-white-by-trnsltlife</dc:source>
<dc:creator>
<cc:Agent>
<dc:title>TrnsltLife</dc:title>
</cc:Agent>
</dc:creator>
<dc:subject>
<rdf:Bag>
<rdf:li>Blanc</rdf:li>
<rdf:li>Colors of the spectrum</rdf:li>
<rdf:li>Couleurs du spectre</rdf:li>
<rdf:li>Quality</rdf:li>
<rdf:li>Qualité</rdf:li>
<rdf:li>White</rdf:li>
<rdf:li>clip art</rdf:li>
<rdf:li>clipart</rdf:li>
</rdf:Bag>
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<path
style="fill:none;stroke:#858585;stroke-width:0.87764347px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 162.60172,24.767247 4.44003,15.616268"
id="path3062"
inkscape:connector-curvature="0" />
</svg>
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