From b6e0e570dd7bf9285bcd1678f3bfe12c0bd24691 Mon Sep 17 00:00:00 2001
From: Mykhailo Malyshko <ddroom.spectr@gmail.com>
Date: Tue, 29 Sep 2015 09:08:54 +0300
Subject: [PATCH] WB: added 'evening' preset, with CCT 4600K.

---
 ddroom.qrc               |   1 +
 resources/wb_evening.svg | 362 +++++++++++++++++++++++++++++++++++++++
 src/f_wb.cpp             |   4 +-
 3 files changed, 366 insertions(+), 1 deletion(-)
 create mode 100644 resources/wb_evening.svg

diff --git a/ddroom.qrc b/ddroom.qrc
index f73e3b0..faa2d3f 100644
--- a/ddroom.qrc
+++ b/ddroom.qrc
@@ -35,6 +35,7 @@
 	<file>resources/wb_cloudy.svg</file>
 	<file>resources/wb_custom.svg</file>
 	<file>resources/wb_daylight.svg</file>
+	<file>resources/wb_evening.svg</file>
 	<file>resources/wb_picker.svg</file>
 	<file>resources/wb_shade.svg</file>
 	<file>resources/wb_tungsten.svg</file>
diff --git a/resources/wb_evening.svg b/resources/wb_evening.svg
new file mode 100644
index 0000000..7ccb39f
--- /dev/null
+++ b/resources/wb_evening.svg
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="64px"
+   height="64px"
+   id="wb_evening"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="wb_evening.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3003">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3775"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3802"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;">
+      <path
+         id="path3808"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3796"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="CurveOut"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="CurveOut"
+       style="overflow:visible">
+      <path
+         id="path3963"
+         d="M -5.4129913,-5.0456926 C -2.6529913,-5.0456926 -0.41299131,-2.8056926 -0.41299131,-0.045692580 C -0.41299131,2.7143074 -2.6529913,4.9543074 -5.4129913,4.9543074"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
+         transform="scale(0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3784"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3778"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient4941">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4943" />
+      <stop
+         id="stop4945"
+         offset="0.44600233"
+         style="stop-color:#000000;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882;"
+         offset="0.69599217"
+         id="stop4947" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4949" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3364">
+      <stop
+         id="stop3366"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.49803922;"
+         offset="0.5"
+         id="stop4915" />
+      <stop
+         id="stop4917"
+         offset="0.75"
+         style="stop-color:#000000;stop-opacity:0.24705882;" />
+      <stop
+         id="stop3368"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3348">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3350" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3352" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3348"
+       id="radialGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9133175e-4,0.2140867,-0.2399258,-2.3611465e-4,67.402024,44.507654)"
+       cx="38.444538"
+       cy="63.421787"
+       fx="38.444336"
+       fy="63.421776"
+       r="12.92077" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941"
+       id="radialGradient4939"
+       cx="54.778557"
+       cy="58.819149"
+       fx="54.77853"
+       fy="58.819149"
+       r="1.7856575"
+       gradientTransform="matrix(-1.3867106e-3,1.5491014,-1.7360705,-1.7096801e-3,154.3683,-32.033834)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941"
+       id="radialGradient5001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.2738956e-3,1.5028427,-1.5948335,-1.6586262e-3,125.3842,-21.62912)"
+       cx="54.778557"
+       cy="58.819149"
+       fx="54.77853"
+       fy="58.819149"
+       r="1.7856575" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3348"
+       id="radialGradient5003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.7576606e-4,0.2076937,-0.2204068,-2.2906387e-4,45.493018,52.626712)"
+       cx="38.444538"
+       cy="63.421787"
+       fx="38.444336"
+       fy="63.421776"
+       r="12.92077" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.171429"
+     inkscape:cx="27.311952"
+     inkscape:cy="21.60946"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1003"
+     inkscape:window-x="-3"
+     inkscape:window-y="24"
+     showguides="true"
+     inkscape:snap-global="false"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393"
+       visible="true"
+       enabled="true"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07561821000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 28.58744,50.163615 0,-1.328633 1.214751,0 1.21475,0 0,1.328633 0,1.328633 -1.21475,0 -1.214751,0 0,-1.328633 z"
+       id="path3844"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07561821000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 39.460029,49.181068 c -0.722083,-1.253212 -1.295166,-2.307225 -1.273519,-2.342252 0.08265,-0.133733 1.962919,-1.155224 2.016895,-1.095716 0.07215,0.07955 3.190157,5.482112 3.242228,5.617806 0.03136,0.08172 -0.219783,0.10076 -1.31699,0.09985 l -1.355737,-0.0011 -1.312877,-2.278567 z"
+       id="path3846"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07561821000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 16.288092,51.449786 c 0,-0.03376 3.158926,-5.544875 3.232209,-5.638971 0.01082,-0.01389 0.480857,0.241438 1.044535,0.567391 0.961053,0.555739 1.019362,0.602584 0.936427,0.75232 -0.04864,0.08782 -0.634266,1.105138 -1.301383,2.2607 l -1.21294,2.101022 -1.349424,0 c -0.742183,0 -1.349424,-0.01911 -1.349424,-0.04246 z"
+       id="path3842"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3269"
+       sodipodi:cx="29"
+       sodipodi:cy="29"
+       sodipodi:rx="17"
+       sodipodi:ry="17"
+       d="m 46,29 a 17,17 0 1 1 -34,0 17,17 0 1 1 34,0 z"
+       transform="matrix(0.94335049,0,0,0.94335049,2.4429035,2.6866875)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9712286;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4"
+       width="1.4957726"
+       height="10.090143"
+       x="29.005629"
+       y="0.77271277" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.96829039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-4"
+       width="1.4987108"
+       height="10.009524"
+       x="29.383747"
+       y="-58.948257"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.96829039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-4-6"
+       width="1.4987109"
+       height="10.009523"
+       x="29.383749"
+       y="-10.568294"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9712286;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-6"
+       width="1.4957726"
+       height="10.090143"
+       x="9.9946365"
+       y="11.559849"
+       transform="matrix(0.8660254,-0.5,0.5,0.8660254,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.96829039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-4-9"
+       width="1.4987108"
+       height="10.009524"
+       x="40.170879"
+       y="-39.937271"
+       transform="matrix(0.5,0.8660254,-0.8660254,0.5,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.96829039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-4-6-2"
+       width="1.4987109"
+       height="10.009522"
+       x="40.170879"
+       y="8.4426956"
+       transform="matrix(0.5,0.8660254,-0.8660254,0.5,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.97414929;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-1"
+       width="1.4928522"
+       height="10.17078"
+       x="-11.852787"
+       y="60.146912"
+       transform="matrix(0.5,-0.8660254,0.8660254,0.5,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9712286;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-7"
+       width="1.4957726"
+       height="10.090143"
+       x="-11.883607"
+       y="11.638"
+       transform="matrix(0.5,-0.8660254,0.8660254,0.5,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.96829039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4085-5-4-4-62"
+       width="1.4987108"
+       height="10.009524"
+       x="40.249027"
+       y="-18.059023"
+       transform="matrix(0.8660254,0.5,-0.5,0.8660254,0,0)" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 0.10154107,58.249301 0,-4.859005 29.95119293,0 29.951192,0 0,4.859005 0,4.858999 -29.951192,0 -29.95119293,0 0,-4.858999 z"
+       id="path3848"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/f_wb.cpp b/src/f_wb.cpp
index 447af0e..3398e83 100644
--- a/src/f_wb.cpp
+++ b/src/f_wb.cpp
@@ -197,6 +197,7 @@ F_WB::F_WB(int id) : Filter() {
 
 	wb_presets.push_back(f_wb_preset(WB_ID_CUSTOM, false, 0));
 	wb_presets.push_back(f_wb_preset(WB_ID_CAMERA, false, 0));
+	wb_presets.push_back(f_wb_preset("evening", true, 4600.0));
 	wb_presets.push_back(f_wb_preset("daylight", true, 5200.0));
 	wb_presets.push_back(f_wb_preset("cloudy", true, 6000.0));
 	wb_presets.push_back(f_wb_preset("shade", true, 7000.0));
@@ -661,8 +662,9 @@ QWidget *F_WB::controls(QWidget *parent) {
 	std::map<std::string, _wb_tb_t> wb_tb;
 	wb_tb["custom"] = _wb_tb_t(":/resources/wb_custom.svg", tr("set with temperature and tint"), false);
 	wb_tb["camera"] = _wb_tb_t(":/resources/wb_camera.svg", tr("use WB as shoot"), true);
+	wb_tb["evening"] = _wb_tb_t(":/resources/wb_evening.svg", tr("Evening (~4600K)"), false);
 	wb_tb["daylight"] = _wb_tb_t(":/resources/wb_daylight.svg", tr("Daylight (~5200K)"), false);
-	wb_tb["cloudy"] = _wb_tb_t(":/resources/wb_cloudy.svg", tr("Cloudy, twilight or sunset (~6000K)"), false);
+	wb_tb["cloudy"] = _wb_tb_t(":/resources/wb_cloudy.svg", tr("Cloudy (~6000K)"), false);
 	wb_tb["shade"] = _wb_tb_t(":/resources/wb_shade.svg", tr("Shade (~7000K)"), true);
 	wb_tb["tungsten"] = _wb_tb_t(":/resources/wb_tungsten.svg", tr("Tungsten (~3200K)"), false);
 	wb_tb["fluorescent"] = _wb_tb_t(":/resources/wb_fluorescent.svg", tr("White fluorescent (~4000K)"), true);