From dc44212691faec0bc73cca2e08f7c7d0ffaf38d7 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sat, 3 Feb 2018 21:49:41 +0100 Subject: [PATCH 1/4] Soft-proofing: fall back to using the current output profile if no printer profile is specified Implements #4361 --- rtdata/languages/default | 4 ++-- rtengine/iccstore.cc | 4 ++++ rtengine/improcfun.cc | 20 ++++++++++++++------ rtgui/editorpanel.cc | 22 +++------------------- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index fff7c3b34..df0cc9dc6 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1229,8 +1229,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF SAVEDLG_WARNFILENAME;File will be named SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders. -SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the Printer profile. -SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate the printer's output by using the Printer profile set in Preferences > Color Management. +SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in bright green the pixels which have out of gamut colors from the Printer/Output profile. +SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, lets you simulate the appearance of the image when printed (if a Printer profile set in Preferences > Color Management) or when viewed on a display that uses the current output profile (if no printer profile is selected). THRESHOLDSELECTOR_B;Bottom THRESHOLDSELECTOR_BL;Bottom-left THRESHOLDSELECTOR_BR;Bottom-right diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 81d0583ac..b8063f54b 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -333,6 +333,10 @@ public: } defaultMonitorProfile = settings->monitorProfile; + + // initialize the alarm colours for lcms gamut checking -- we use bright green + cmsUInt16Number cms_alarm_codes[cmsMAXCHANNELS] = { 0, 65535, 0 }; + cmsSetAlarmCodes(cms_alarm_codes); } cmsHPROFILE workingSpace(const Glib::ustring& name) const diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 37a3e707f..0954867f1 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -300,18 +300,26 @@ void ImProcFunctions::updateColorProfiles (const Glib::ustring& monitorProfile, if (softProof) { cmsHPROFILE oprof = nullptr; + RenderingIntent outIntent; + + flags = cmsFLAGS_SOFTPROOFING | cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE; if (!settings->printerProfile.empty()) { oprof = ICCStore::getInstance()->getProfile (settings->printerProfile); + if (settings->printerBPC) { + flags |= cmsFLAGS_BLACKPOINTCOMPENSATION; + } + outIntent = settings->printerIntent; + } else { + oprof = ICCStore::getInstance()->getProfile(params->icm.output); + if (params->icm.outputBPC) { + flags |= cmsFLAGS_BLACKPOINTCOMPENSATION; + } + outIntent = params->icm.outputIntent; } if (oprof) { // NOCACHE is for thread safety, NOOPTIMIZE for precision - flags = cmsFLAGS_SOFTPROOFING | cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE; - - if (settings->printerBPC) { - flags |= cmsFLAGS_BLACKPOINTCOMPENSATION; - } if (gamutCheck) { flags |= cmsFLAGS_GAMUTCHECK; @@ -321,7 +329,7 @@ void ImProcFunctions::updateColorProfiles (const Glib::ustring& monitorProfile, iprof, TYPE_Lab_FLT, monitor, TYPE_RGB_8, oprof, - monitorIntent, settings->printerIntent, + monitorIntent, outIntent, flags ); diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 21753bcf5..b5af09d7b 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -153,7 +153,6 @@ private: Gtk::ToggleButton softProof; Gtk::ToggleButton spGamutCheck; sigc::connection profileConn, intentConn, softproofConn; - bool canSProof; Glib::ustring defprof; rtengine::StagedImageProcessor* const& processor; @@ -212,7 +211,6 @@ private: softProof.set_tooltip_markup (M ("SOFTPROOF_TOOLTIP")); softProof.set_active (false); - softProof.set_sensitive (canSProof); softProof.show (); Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("spGamutCheck.png")); @@ -301,8 +299,8 @@ private: intentBox.setItemSensitivity (0, supportsPerceptual); intentBox.setItemSensitivity (1, supportsRelativeColorimetric); intentBox.setItemSensitivity (2, supportsAbsoluteColorimetric); - softProof.set_sensitive (canSProof); - spGamutCheck.set_sensitive (canSProof); + softProof.set_sensitive (true); + spGamutCheck.set_sensitive (softProof.get_active()); } else { intentBox.setItemSensitivity (0, true); intentBox.setItemSensitivity (1, true); @@ -352,15 +350,9 @@ private: void updateSoftProofParameters (bool noEvent = false) { - if (!canSProof) { - ConnectionBlocker profileBlocker (softproofConn); - softProof.set_active (false); - softProof.set_sensitive (false); #if !defined(__APPLE__) // monitor profile not supported on apple - } else { - softProof.set_sensitive (profileBox.get_active_row_number () > 0); + softProof.set_sensitive (profileBox.get_active_row_number () > 0); #endif - } spGamutCheck.set_sensitive (softProof.get_sensitive() && softProof.get_active()); @@ -390,7 +382,6 @@ private: public: explicit ColorManagementToolbar (rtengine::StagedImageProcessor* const& ipc) : intentBox (Glib::ustring (), true), - canSProof (!options.rtSettings.printerProfile.empty() && options.rtSettings.printerProfile != "None"), // assuming the printer profile exist! processor (ipc) { #if !defined(__APPLE__) // monitor profile not supported on apple @@ -419,12 +410,6 @@ public: grid->attach_next_to (spGamutCheck, Gtk::POS_RIGHT, 1, 1); } - void canSoftProof (bool canSP) - { - canSProof = canSP; - updateSoftProofParameters(); - } - void updateProcessor() { if (processor) { @@ -2305,7 +2290,6 @@ void EditorPanel::tbShowHideSidePanels_managestate() void EditorPanel::updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC) { - colorMgmtToolBar->canSoftProof (!printerProfile.empty() && printerProfile != "None"); } void EditorPanel::updateTPVScrollbar (bool hide) From ff808c823be5fb9abfd2ae34a70b5fa81117eeb0 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 4 Feb 2018 16:09:14 +0100 Subject: [PATCH 2/4] Gamut icons made consistent, closes #4360 --- .../images/Dark/actions/gamut-softproof.png | Bin 0 -> 954 bytes rtdata/images/Dark/actions/gamut-warning.png | Bin 0 -> 992 bytes .../images/Light/actions/gamut-softproof.png | Bin 0 -> 973 bytes rtdata/images/Light/actions/gamut-warning.png | Bin 0 -> 984 bytes rtgui/editorpanel.cc | 4 +- .../scalable/gamut-softproof.file | 1 + .../source_icons/scalable/gamut-softproof.svg | 303 ++++ .../source_icons/scalable/gamut-warning.file | 1 + tools/source_icons/scalable/gamut-warning.svg | 123 ++ tools/source_icons/scalable/softProof.file | 1 - tools/source_icons/scalable/softProof.svg | 1389 ----------------- tools/source_icons/scalable/spGamutCheck.file | 1 - tools/source_icons/scalable/spGamutCheck.svg | 1344 ---------------- 13 files changed, 430 insertions(+), 2737 deletions(-) create mode 100644 rtdata/images/Dark/actions/gamut-softproof.png create mode 100644 rtdata/images/Dark/actions/gamut-warning.png create mode 100644 rtdata/images/Light/actions/gamut-softproof.png create mode 100644 rtdata/images/Light/actions/gamut-warning.png create mode 100644 tools/source_icons/scalable/gamut-softproof.file create mode 100644 tools/source_icons/scalable/gamut-softproof.svg create mode 100644 tools/source_icons/scalable/gamut-warning.file create mode 100644 tools/source_icons/scalable/gamut-warning.svg delete mode 100644 tools/source_icons/scalable/softProof.file delete mode 100644 tools/source_icons/scalable/softProof.svg delete mode 100644 tools/source_icons/scalable/spGamutCheck.file delete mode 100644 tools/source_icons/scalable/spGamutCheck.svg diff --git a/rtdata/images/Dark/actions/gamut-softproof.png b/rtdata/images/Dark/actions/gamut-softproof.png new file mode 100644 index 0000000000000000000000000000000000000000..d61874507ea6837abe30e4eb436060d085952541 GIT binary patch literal 954 zcmV;r14aCaP)(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1055b!SaeirbZlh+Nn>wrb0B7Kav*eQWgsF&cyMKMbRr;hVPYU@ zZXi-&cT{L)a$#^~WeEx?i~s-t7IZ~ebU}4=Xm4@=O>c5%VQwHuVRB@5Z*OE^P<7b= z002^SMObu0Z*X~XX=iA307F9{L3DI-X<~JBX>V>VQ)ppwWkGCdYh@s4baZe!FE3+q zWnpw_c4cF4ZEbIEb1rXkXD@7NV`Xl0WpgiLc`b8cFElPNFT+$~1poj7d`Uz>R5*>T zl+SAuQ4q(!GjBH(0yXJTDa9T{Mf4I7r4uUE$Bt86s3oPm9$w;1vl9@UN$8x`O#Frr^mdR&v%%4JfKCM=cVwU#LdI< z^75rdqj4*4G&eVA9~tax%$TsZ`R9M&tG9=;&L=ajuJq>Khz};Z*>~ z0YE8rV|{(y4uW6|KoY<)0C!5I(xYOrICyBVh>(adfK>q70M@G2>Iq}aNNb{qT(&H0 zsZ=VBv?ayCL?nemVTp(|GjHYd`Gv{J$t`A1#*>NYq%mgEb=^}v!JRIQF%-eRi^!sg zcmNE5ArV>V1@8zZq8b2*$OaJ!5$zDsa{&7QhKw;!wbrNm28+mEWDvB(0st>W#3!OO z5zRY}bEYpaGgl+9v@u-)P$QzWh|IgLd$ymBzX3oPhKV+&VCEGO*(IV>H1qR^0_XGj zUqrM=L<8;ajWMK@dL<&e00u?mvDW%rPjJ-rR{$OV4`U25v)hC-^IgyLEC8^&fr)5U zL}mbNb}<(bd7_ls%;j>G=1#hTgCHo{wtX9b0H8P%z@}wctJ!RJJ6_urJT)~{bsT4n znFow9f1+?*DfP*=?RVqj<9?^wu3!KN!*JFZbB~$d1NfLur$1yenf=zBa=AR5OeS|S znM}PI>$*Gun3$OO!p!%5-=8fM3UA_20I1jNSA5@p=s3<;Gj=ey=pEi9qK#f=aYaAj zaCH8hNF*K{jG|Vn{Ya%!v;9H=fSGe5G7R9SZQC!i+3fH5rjI18^)+Tr_`d&adU`tO cUGWe43kbd>bod4j+W-In07*qoM6N<$f|@Fg-2eap literal 0 HcmV?d00001 diff --git a/rtdata/images/Dark/actions/gamut-warning.png b/rtdata/images/Dark/actions/gamut-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..f6bb292a9debb374b578c1a277b8e257bd2a172e GIT binary patch literal 992 zcmV<610Vc}P)(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1055b!SaeirbZlh+Nn>wrb0B7Kav*eQWgsF&cyMKMbRr;hVPYU@ zZXi-&cT{L)a$#^~WeEx?i~s-t7IZ~ebU}4=Xm4@=O>c5%VQwHuVRB@5Z*OE^P<7b= z002^SMObu0Z*X~XX=iA307F9{L3DI-X<~JBX>V>VQ)ppwWkGCdYh@s4baZe!FE3+q zWnpw_c4cF4ZEbIEb1rXkXD@7NV`Xl0WpgiLc`b8cFElPNFT+$~1poj7qDe$SR5*>j zl)r1#a2Up)_nSm|QsJysTuQY<)y2gMuA#XYe^i_**8jkzgMzp?ii+UibaoKB*+Fo! zoJliuQWP9KgsRlG^v)lxRtM`fm+#|}9M|^J>ma_^3+$@@aSU*LZfNh1uy{UjyJ z6NX`aa&oe(9jgKGeZOC8JuV`<0W6Tb>$+~K+3frNWdNfjMMTCN$9b3qR!#l&1PTB> zBJ!YAD&3iwn8-D4bP0eG5g|FU)x;`UuY=^tP3wqU$mjEq!!Ybfz+ao>FKxl~dVL=N zvz0+a4lAXOCjCs4G}Fqz4y=@tB)CNKViZLu0NfCfWdMkx=vbnENP{FlZUr_0pjNBJ zmSurt(RJN7iS{H2f)`rrMHu2!qR0BEhX(aJP1Fz_1y zM1%mAMP$Xc?K%Kt9VP_;!^6Wd$)BcaTCGeQ>bur@1ptc0q7?+eJ(8OSYW!j%@xD~hpV9$0Y7Li(#N&RPnAP|yQQ+VS@lbny^xO*Gm zaS<5<0K+i$Hsw#3N~QZ@7@F%QR!Yrjt$W&03x&db+KWgh$%dwsIu%9HK>+U?6UT8p ztCTv>4qPl2t#Y}%BLO`F@T!%s0ai-A1#oC9sPFs7`uh5wS1J{MYHI4ZZQFIzG)GB( z&ICJ-vrKYVdXr^TK}0%5WT)2pECATHy`;6i0^m(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1055b!SaeirbZlh+Nn>wrb0B7Kav*eQWgsF&cyMKMbRr;hVPYU@ zZXi-&cT{L)a$#^~WeEx?i~s-t7IZ~ebU}4=Xm4@=O>c5%VQwHuVRB@5Z*OE^P<7b= z002^SMObu0Z*X~XX=iA307F9{L3DI-X<~JBX>V>VQ)ppwWkGCdYh@s4baZe!FE3+q zWnpw_c4cF4ZEbIEb1rXkXD@7NV`Xl0WpgiLc`b8cFElPNFT+$~1poj7k4Z#9R5*>T zl+9}sQ540`y)#L=Y9=XmBc+}8O`3|WEnSG>N9!P*(qE($hul75gB+NAHgFqIgRG$}os_i@ktao&6IfC}~W^jJ6{@!>=% zbs-Q4+^sAQ4-Z?TqoaXigA<8_NkkI>&N+^A9smXh2P1_-;ls|(&PT^_ZjX_g+k%9 zh;&yPMdTuY7q)G8*8e>7?{9Txlq>nSU|!b0V50A}u1(gM)*qcsw3E7Fa}b0HC#A0w6@RE+VgpXtxZXj>Tf} zmch)NEsy&Zd;3K6nwd96BqAb{j^hlp1O~8i7`{erhKO<^5&H)4apXOHG{OKWVMI0d$p@-;2fKqkoC>`Fz^4tjAjGR=FUeF%jt!k>5o0 vW_5LStNNvnC8g9YA_@kB!I$-}>%{a2Yg`R;0z|!D00000NkvXXu0mjfAbp&k literal 0 HcmV?d00001 diff --git a/rtdata/images/Light/actions/gamut-warning.png b/rtdata/images/Light/actions/gamut-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..cbbf89a5615bc1de39d28a65789f48ec0a494272 GIT binary patch literal 984 zcmV;}11J26P)(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1055b!SaeirbZlh+Nn>wrb0B7Kav*eQWgsF&cyMKMbRr;hVPYU@ zZXi-&cT{L)a$#^~WeEx?i~s-t7IZ~ebU}4=Xm4@=O>c5%VQwHuVRB@5Z*OE^P<7b= z002^SMObu0Z*X~XX=iA307F9{L3DI-X<~JBX>V>VQ)ppwWkGCdYh@s4baZe!FE3+q zWnpw_c4cF4ZEbIEb1rXkXD@7NV`Xl0WpgiLc`b8cFElPNFT+$~1poj7nn^@KR5*>b zl)Z1$P!z?_b?lU+A*7;^C6$sUje{z6v5*+MAjHSO5+TZez|s-1FarWHFhK{TZY-=w zfJ7uFB%)d>5tZYpG^l*0ZHPpQP3+6SOZD2iHUqrrzI)I8y>p+Q4g9ASlQ-3BHP-L< zv)yj@$3YGGd_I#(rINi~Z#xW3!=O^Bls(T|Wacp<`oPS$ZQFh(i*;SU!p!rcZ^5#x zhX;X`Vc>b*HD(?I0A`*5aDQrQ>Q*k7OAIx>?_U-@#LRPHjukQ9ApocL7Mb~CB9VA3 z>HzR{XH=pukzhqpjx)0wBw%J;Rn-#$W=VM~NWTlr%p?xz5YZ(7CyD4f5p9V43;_7P zZ%e(cFt7>$u~^I#`v=Wt(-iTOa=H8(z#{-RF{jEWvvs@95Z_W z;CbE-Sktukk>E@wvkd?vBO{;o3M|X&q|@n}0MKf+zA^JQ06&|}u1A8GmzR4)0B~LRm~`M-(=_kR&d#cUc*ml!24Erz+-Nk~l9^ps$INHi?REh`Q@-O> zBFaaB4a3l;r>Elpkjv$s649F=-40k))wckOVbDUMFw^Vxp1ZF5qF5{%wOVaJMDs-S z`9Sc>%E|_S!_uE@-_kVgG!dnUC`m-;fj=J*GhbB{tPfBll2=|{Sib4X4vQe0000set_padding (0, 0); softProof.add (*softProofImage); softProof.set_relief (Gtk::RELIEF_NONE); @@ -215,7 +215,7 @@ private: softProof.set_sensitive (canSProof); softProof.show (); - Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("spGamutCheck.png")); + Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("gamut-warning.png")); spGamutCheckImage->set_padding (0, 0); spGamutCheck.add (*spGamutCheckImage); spGamutCheck.set_relief (Gtk::RELIEF_NONE); diff --git a/tools/source_icons/scalable/gamut-softproof.file b/tools/source_icons/scalable/gamut-softproof.file new file mode 100644 index 000000000..18b57b0a2 --- /dev/null +++ b/tools/source_icons/scalable/gamut-softproof.file @@ -0,0 +1 @@ +gamut-softproof.png,w22,actions diff --git a/tools/source_icons/scalable/gamut-softproof.svg b/tools/source_icons/scalable/gamut-softproof.svg new file mode 100644 index 000000000..5129ab9de --- /dev/null +++ b/tools/source_icons/scalable/gamut-softproof.svg @@ -0,0 +1,303 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/gamut-warning.file b/tools/source_icons/scalable/gamut-warning.file new file mode 100644 index 000000000..da853059c --- /dev/null +++ b/tools/source_icons/scalable/gamut-warning.file @@ -0,0 +1 @@ +gamut-warning.png,w22,actions diff --git a/tools/source_icons/scalable/gamut-warning.svg b/tools/source_icons/scalable/gamut-warning.svg new file mode 100644 index 000000000..be75417c2 --- /dev/null +++ b/tools/source_icons/scalable/gamut-warning.svg @@ -0,0 +1,123 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + ! + + diff --git a/tools/source_icons/scalable/softProof.file b/tools/source_icons/scalable/softProof.file deleted file mode 100644 index e275113ec..000000000 --- a/tools/source_icons/scalable/softProof.file +++ /dev/null @@ -1 +0,0 @@ -softProof.png,w22,actions diff --git a/tools/source_icons/scalable/softProof.svg b/tools/source_icons/scalable/softProof.svg deleted file mode 100644 index d09f316a2..000000000 --- a/tools/source_icons/scalable/softProof.svg +++ /dev/null @@ -1,1389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/tools/source_icons/scalable/spGamutCheck.file b/tools/source_icons/scalable/spGamutCheck.file deleted file mode 100644 index f8b0d6338..000000000 --- a/tools/source_icons/scalable/spGamutCheck.file +++ /dev/null @@ -1 +0,0 @@ -spGamutCheck.png,w22,actions diff --git a/tools/source_icons/scalable/spGamutCheck.svg b/tools/source_icons/scalable/spGamutCheck.svg deleted file mode 100644 index 9748e3916..000000000 --- a/tools/source_icons/scalable/spGamutCheck.svg +++ /dev/null @@ -1,1344 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - ! - From 14a463102cb635b0c89aaaff28c70e2efceb0a6e Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sun, 4 Feb 2018 18:02:01 +0100 Subject: [PATCH 3/4] use cyan instead of green for out-of-gamut pixels --- rtdata/languages/default | 2 +- rtengine/iccstore.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index df0cc9dc6..16efa864f 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1229,7 +1229,7 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF SAVEDLG_WARNFILENAME;File will be named SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders. -SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in bright green the pixels which have out of gamut colors from the Printer/Output profile. +SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, pixels with colors that are outside the gamut of the Printer/Output profile are highlighted. SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, lets you simulate the appearance of the image when printed (if a Printer profile set in Preferences > Color Management) or when viewed on a display that uses the current output profile (if no printer profile is selected). THRESHOLDSELECTOR_B;Bottom THRESHOLDSELECTOR_BL;Bottom-left diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index b8063f54b..e77ea7f0f 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -335,7 +335,7 @@ public: defaultMonitorProfile = settings->monitorProfile; // initialize the alarm colours for lcms gamut checking -- we use bright green - cmsUInt16Number cms_alarm_codes[cmsMAXCHANNELS] = { 0, 65535, 0 }; + cmsUInt16Number cms_alarm_codes[cmsMAXCHANNELS] = { 0, 65535, 65535 }; cmsSetAlarmCodes(cms_alarm_codes); } From b4227e1a026e83f87b28808dfc313c39f851fd97 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 4 Feb 2018 18:55:21 +0100 Subject: [PATCH 4/4] Always show image dimensions below navigator preview, fixes #4359 --- rtgui/navigator.cc | 7 ++++--- rtgui/navigator.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc index 7f159861d..e34a909df 100644 --- a/rtgui/navigator.cc +++ b/rtgui/navigator.cc @@ -38,6 +38,8 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt mbox->set_name("Navigator"); previewWindow = Gtk::manage (new PreviewWindow ()); mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2); + dimension = Gtk::manage (new Gtk::Label ()); + mbox->pack_start (*dimension, Gtk::PACK_SHRINK, 2); position = Gtk::manage (new Gtk::Label ()); mbox->pack_start (*position, Gtk::PACK_SHRINK, 2); @@ -207,10 +209,9 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt void Navigator::setInvalid (int fullWidth, int fullHeight) { if (fullWidth > 0 && fullHeight > 0) { - position->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight)); - } else { - position->set_text (M("NAVIGATOR_XY_NA")); + dimension->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight)); } + position->set_text (M("NAVIGATOR_XY_NA")); R->set_text (M("NAVIGATOR_NA")); G->set_text (M("NAVIGATOR_NA")); diff --git a/rtgui/navigator.h b/rtgui/navigator.h index e6ca33559..6108e2809 100644 --- a/rtgui/navigator.h +++ b/rtgui/navigator.h @@ -37,6 +37,7 @@ private: void cycleUnitsHSV (GdkEventButton *event); protected: + Gtk::Label* dimension; Gtk::Label* position; Gtk::Label *R, *G, *B; Gtk::Label *H, *S, *V;