liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Black and White Clean code issue2010

Browse Source
This commit is contained in:
jdc
2013-11-16 18:33:15 +01:00
parent 17959c1310
commit 7a80d235d5
69 changed files with 194 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtdata/languages/default
View File

@@ -960,12 +960,11 @@ TP_CHMIXER_GREEN;Green Channel
TP_CHMIXER_LABEL;Channel Mixer
TP_CHMIXERBW_LABEL;Black and White
TP_CHMIXER_RED;Red Channel
TP_BWMIX_ENABLED_LM;Enabled Black and White mode
TP_BWMIX_ENABLED;Complementary color
TP_BWMIX_CC_ENABLED;Complementary color
TP_BWMIX_CHANNEL;Luminance equalizer
TP_BWMIX_VAL;L
TP_BWMIX_TOOLTIP;Enable to allow automatic adjustment of complementary colors in ROYGCBMP mode
TP_BWMIX_SETTING_TOOLTIP;Different presets - films - landscape - or manual settings of channel-mixer and gamma\nNormal:43/33/30 Panchromatic:33/33/33\nHyperPanchro:41/25/34 LowSensitivity:27/27/46\nHighSensitivity:30/28/42 Orthochromatic:0/42/58\nHigh Contrast:40/34/60 Luminance:30/59/11\nLandscape:66/24/10 Portrait:54/44/12\nAbsolute RGB=no compensation\nRelative RGB=compensation (sum=always 100%)\nROYGCBMP: RGB mixer + filter on Orange-Yellow-Cyan-Magenta-Purple\n Infrared -40/200/-17
TP_BWMIX_CC_TOOLTIP;Enable to allow automatic adjustment of complementary colors in ROYGCBMP mode
TP_BWMIX_SETTING_TOOLTIP;Different presets - films - landscape - or manual settings of channel-mixer
TP_BWMIX_FILTER_TOOLTIP;Effect of the color filter is similar to film photography when filter is placed in front of the lens. Color filters reduce transmission of specific range of colors and correspondingly effect their lightness. E.g. Red filter would darken the Blue sky.
TP_BWMIX_AUTOCH;Auto
TP_BWMIX_AUTOCH_TIP;Calculate values optimizing channel-mixer

2
rtdata/profiles/BW/BW 1.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabledcc=true
Enabled=true
EnabledLm=true
Met=No
VCurve=0;

2
rtdata/profiles/BW/BW 2.pp3
View File

@@ -40,7 +40,7 @@ bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=true
Enabledcc=true
Met=No
VCurve=0;

2
rtdata/profiles/BW/BW 3.pp3
View File

@@ -40,7 +40,7 @@ bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=true
Enabledcc=true
Met=No
VCurve=0;

2
rtdata/profiles/BW/BW 4.pp3
View File

@@ -40,7 +40,7 @@ bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=true
Enabledcc=true
Met=No
VCurve=0;

4
rtdata/profiles/Contrasty/Deep Shadows.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Contrasty/Punchy 1.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Contrasty/Punchy 2.pp3
View File

@@ -39,10 +39,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Default ISO High.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Default ISO Medium.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Default.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;
CurveMode=Standard

4
rtdata/profiles/Equilibrated.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Amber/Faded Amber 1 TM Bright.pp3
View File

@@ -40,10 +40,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Faded/Amber/Faded Amber 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Amber/Faded Amber 1.pp3
View File

@@ -40,10 +40,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Faded/Blue/Faded Blue 1 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Blue/Faded Blue 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Blue/Faded Blue 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Blue/Faded Blue Pink TM.pp3
View File

@@ -40,10 +40,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Faded/Blue/Faded Blue Pink.pp3
View File

@@ -40,10 +40,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Faded/Chocolate/Faded Chocolate 1 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Chocolate/Faded Chocolate 2 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Golden/Faded Golden 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Golden/Faded Golden 2.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Green/Faded Green 1 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Green/Faded Green 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Green/Faded Green 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Green/Faded Green 2.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Green/Faded Green 3.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Neutral/Faded Neutral TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Neutral/Faded Neutral.pp3
View File

@@ -40,10 +40,10 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
Enabledcc=true
Met=No
VCurve=0;
EnabledLm=false
Enabled=false
[Luminance Curve]
Brightness=0

4
rtdata/profiles/Faded/Purple/Faded Purple 1 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Purple/Faded Purple 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Purple/Faded Purple 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Purple/Faded Purple 2 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Purple/Faded Purple 2.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Teal/Faded Teal Orange TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Teal/Faded Teal Orange TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Teal/Faded Teal Orange.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Warm/Faded Warm 1 TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Warm/Faded Warm 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Warm/Faded Warm 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Warm/Faded Warm 2.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Faded/Warm/Faded Warm 3.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/High-Key.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Natural 1.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

5
rtdata/profiles/Natural 2.pp3
View File

@@ -39,12 +39,13 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;
[Luminance Curve]
Brightness=0
Contrast=0

4
rtdata/profiles/Pop/Pop 1.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Pop/Pop 2 L.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Pop/Pop 3 Skin.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

2
rtdata/profiles/Pop/Pop 4 BW.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabledcc=true
Enabled=true
EnabledLm=true
Met=No
VCurve=0;

4
rtdata/profiles/Portrait/Portrait Smooth.pp3
View File

@@ -39,8 +39,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Natural TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Natural.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Pale TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Pale.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Studio TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - Studio.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

4
rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3
View File

@@ -40,8 +40,8 @@ bwyell=33
bwcyan=33
bwmag=33
bwpur=33
Enabled=true
EnabledLm=false
Enabledcc=true
Enabled=false
Met=No
VCurve=0;

2
rtengine/improccoordinator.cc
View File

@@ -306,7 +306,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
if ( todo!=MINUPDATE ) {
ipf.rgbProc (oprevi, oprevl, hltonecurve, shtonecurve, tonecurve, shmap, params.toneCurve.saturation,
rCurve, gCurve, bCurve, customToneCurve1, customToneCurve2,customToneCurvebw1, customToneCurvebw2, rrm, ggm, bbm,params.toneCurve.expcomp, params.toneCurve.hlcompr, params.toneCurve.hlcomprthresh);
if(params.chmixerbw.enabledLm && abwListener) abwListener->BWChanged((float) rrm, (float) ggm, (float) bbm);
if(params.chmixerbw.enabled && abwListener) abwListener->BWChanged((float) rrm, (float) ggm, (float) bbm);
// correct GUI black and white with value
}

8
rtengine/improcfun.cc
View File

@@ -1953,7 +1953,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, LUTf & hltone
float chMixBR = float(params->chmixer.blue[0]);
float chMixBG = float(params->chmixer.blue[1]);
float chMixBB = float(params->chmixer.blue[2]);
bool BWchmix = params->chmixerbw.enabled;
bool BWchmix = params->chmixerbw.enabledcc;
int shHighlights = params->sh.highlights;
int shShadows = params->sh.shadows;
float bwr = float(params->chmixerbw.bwred);
@@ -1967,7 +1967,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, LUTf & hltone
float bwcyan = float(params->chmixerbw.bwcyan);
float bwmag = float(params->chmixerbw.bwmag);
float bwpur = float(params->chmixerbw.bwpur);
bool blackwhite = params->chmixerbw.enabledLm;
bool blackwhite = params->chmixerbw.enabled;
int algm=0;
if (params->chmixerbw.met=="No") algm=0;
else if(params->chmixerbw.met=="De") algm=1;
@@ -2606,7 +2606,7 @@ if(algm==3 && blackwhite) {//channel-mixer
float cgM=0.f;
float cbM=0.f;
bool complem = params->chmixerbw.enabled;
bool complem = params->chmixerbw.enabledcc;
float fcompl = 1.f;
if(complem) fcompl = 3.f;
@@ -2888,7 +2888,7 @@ void ImProcFunctions::chromiLuminanceCurve (int pW, LabImage* lold, LabImage* ln
// reference to the params structure has to be done outside of the parallelization to avoid CPU cache problem
bool highlight = params->hlrecovery.enabled; //Get the value if "highlight reconstruction" is activated
int chromaticity = params->labCurve.chromaticity;
bool bwToning = params->labCurve.bwtoning /*|| params->chmixerbw.met=="Ch" */ || params->chmixerbw.enabledLm || (params->chmixerbw.bwredgam!=0 && params->chmixerbw.enabledLm) || (params->chmixerbw.bwgreengam!=0 && params->chmixerbw.enabledLm) || (params->chmixerbw.bwbluegam!=0 && params->chmixerbw.enabledLm);
bool bwToning = params->labCurve.bwtoning /*|| params->chmixerbw.met=="Ch" */ || params->chmixerbw.enabled || (params->chmixerbw.bwredgam!=0 && params->chmixerbw.enabled) || (params->chmixerbw.bwgreengam!=0 && params->chmixerbw.enabled) || (params->chmixerbw.bwbluegam!=0 && params->chmixerbw.enabled);
//if(bwToning) printf("OK bwto\n"); else printf("pas de bw\n");
bool LCredsk = params->labCurve.lcredsk;
bool ccut = ccutili;

8
rtengine/procparams.cc
View File

@@ -370,8 +370,8 @@ void ProcParams::setDefaults () {
chmixer.blue[2] = 100;
chmixerbw.autoc = false;
chmixerbw.enabled = true;
chmixerbw.enabledLm = false;
chmixerbw.enabledcc = true;
chmixerbw.enabled = false;
chmixerbw.bwred = 33;
chmixerbw.bwgreen = 33;
chmixerbw.bwblue = 33;
@@ -629,8 +629,8 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol
keyFile.set_double_list("Channel Mixer", "Curve2", tcurvebw2);
}
if (!pedited || pedited->chmixerbw.autoc) keyFile.set_boolean ("Channel Mixer", "Autoc", chmixerbw.autoc);
if (!pedited || pedited->chmixerbw.enabledcc) keyFile.set_boolean ("Channel Mixer", "Enabledcc", chmixerbw.enabledcc);
if (!pedited || pedited->chmixerbw.enabled) keyFile.set_boolean ("Channel Mixer", "Enabled", chmixerbw.enabled);
if (!pedited || pedited->chmixerbw.enabledLm) keyFile.set_boolean ("Channel Mixer", "EnabledLm", chmixerbw.enabledLm);
if (!pedited || pedited->chmixerbw.bwred) keyFile.set_integer ("Channel Mixer", "bwred", chmixerbw.bwred);
if (!pedited || pedited->chmixerbw.bwgreen) keyFile.set_integer ("Channel Mixer", "bwgreen", chmixerbw.bwgreen);
if (!pedited || pedited->chmixerbw.bwblue) keyFile.set_integer ("Channel Mixer", "bwblue", chmixerbw.bwblue);
@@ -1198,8 +1198,8 @@ if (keyFile.has_group ("Channel Mixer")) {
if (pedited) pedited->chmixerbw.curveMode2 = true;
}
if (keyFile.has_key ("Channel Mixer", "Autoc")) { chmixerbw.autoc = keyFile.get_boolean ("Channel Mixer", "Autoc"); if (pedited) pedited->chmixerbw.autoc = true; }
if (keyFile.has_key ("Channel Mixer", "Enabledcc")) { chmixerbw.enabledcc = keyFile.get_boolean ("Channel Mixer", "Enabledcc"); if (pedited) pedited->chmixerbw.enabledcc = true; }
if (keyFile.has_key ("Channel Mixer", "Enabled")) { chmixerbw.enabled = keyFile.get_boolean ("Channel Mixer", "Enabled"); if (pedited) pedited->chmixerbw.enabled = true; }
if (keyFile.has_key ("Channel Mixer", "EnabledLm")) { chmixerbw.enabledLm = keyFile.get_boolean ("Channel Mixer", "EnabledLm"); if (pedited) pedited->chmixerbw.enabledLm = true; }
if (keyFile.has_key ("Channel Mixer", "bwred")) { chmixerbw.bwred = keyFile.get_integer ("Channel Mixer", "bwred"); if (pedited) pedited->chmixerbw.bwred = true; }
if (keyFile.has_key ("Channel Mixer", "bwgreen")) { chmixerbw.bwgreen = keyFile.get_integer ("Channel Mixer", "bwgreen"); if (pedited) pedited->chmixerbw.bwgreen = true; }
if (keyFile.has_key ("Channel Mixer", "bwblue")) { chmixerbw.bwblue = keyFile.get_integer ("Channel Mixer", "bwblue"); if (pedited) pedited->chmixerbw.bwblue = true; }

2
rtengine/procparams.h
View File

@@ -643,8 +643,8 @@ class ChannelMixerbwParams {
std::vector<double> vcurve;
bool autoc;
bool enabledcc;
bool enabled;
bool enabledLm;
int bwred;
int bwgreen;
int bwblue;

109
rtgui/chmixerbw.cc
View File

@@ -30,11 +30,11 @@ using namespace rtengine::procparams;
ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
CurveListener::setMulti(true);
set_border_width(4);
enabledLm = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_ENABLED_LM")));
enabledLm->set_active (false);
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
enabled->set_active (false);
pack_start(*enabledLm, Gtk::PACK_SHRINK, 0);
enabledLm->show ();
pack_start(*enabled, Gtk::PACK_SHRINK, 0);
enabled->show ();
Gtk::HBox* metHBox = Gtk::manage (new Gtk::HBox ());
metHBox->set_border_width (0);
@@ -94,13 +94,13 @@ ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
hsep1->show ();
pack_start (*hsep1);
enabled = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_ENABLED")));
enabledcc = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_CC_ENABLED")));
enabled->set_active (true);
enabled->set_tooltip_markup (M("TP_BWMIX_TOOLTIP"));
enabledcc->set_active (true);
enabledcc->set_tooltip_markup (M("TP_BWMIX_CC_TOOLTIP"));
pack_start(*enabled, Gtk::PACK_SHRINK, 0);
enabled->show ();
pack_start(*enabledcc, Gtk::PACK_SHRINK, 0);
enabledcc->show ();
abox = Gtk::manage (new Gtk::HBox ());
abox->set_border_width (2);
@@ -316,9 +316,9 @@ ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
bwbluegam->show();
pack_start( *bwbluegam, Gtk::PACK_SHRINK, 0);
enaLmconn = enabledLm->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabledLm_toggled) );
enaconn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabled_toggled) );
enaccconn = enabledcc->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabledcc_toggled) );
filconn = fil->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::filChanged) );
setconn = set->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::setChanged) );
metconn = met->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::metChanged) );
@@ -492,8 +492,8 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
shape->setUnChanged (!pedited->chmixerbw.curve);
shape2->setUnChanged (!pedited->chmixerbw.curve2);
autoch->set_inconsistent (!pedited->chmixerbw.autoc);
enabledLm->set_inconsistent (!pedited->chmixerbw.enabledLm);
enabled->set_inconsistent (!pedited->chmixerbw.enabled);
enabledcc->set_inconsistent (!pedited->chmixerbw.enabledcc);
bwred->setEditedState (pedited->chmixerbw.bwred ? Edited : UnEdited);
bwgreen->setEditedState (pedited->chmixerbw.bwgreen ? Edited : UnEdited);
bwblue->setEditedState (pedited->chmixerbw.bwblue ? Edited : UnEdited);
@@ -513,14 +513,14 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
}
}
autoconn.block (false);
enaccconn.block (true);
enabledcc->set_active (pp->chmixerbw.enabledcc);
enaccconn.block (false);
lastEnabledcc = pp->chmixerbw.enabledcc;
enaconn.block (true);
enabled->set_active (pp->chmixerbw.enabled);
enaconn.block (false);
lastEnabled = pp->chmixerbw.enabled;
enaLmconn.block (true);
enabledLm->set_active (pp->chmixerbw.enabledLm);
enaLmconn.block (false);
lastEnabledLm = pp->chmixerbw.enabledLm;
bwred->setValue (pp->chmixerbw.bwred);
bwgreen->setValue (pp->chmixerbw.bwgreen);
bwblue->setValue (pp->chmixerbw.bwblue);
@@ -541,8 +541,8 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
}
void ChMixerbw::write (ProcParams* pp, ParamsEdited* pedited) {
pp->chmixerbw.enabledcc = enabledcc->get_active ();
pp->chmixerbw.enabled = enabled->get_active ();
pp->chmixerbw.enabledLm = enabledLm->get_active ();
pp->chmixerbw.autoc = autoch->get_active();
pp->chmixerbw.bwred = bwred->getValue ();
pp->chmixerbw.bwgreen = bwgreen->getValue ();
@@ -571,10 +571,10 @@ void ChMixerbw::write (ProcParams* pp, ParamsEdited* pedited) {
if (pedited) {
pedited->chmixerbw.vcurve = !vshape->isUnChanged ();
pedited->chmixerbw.enabledLm = !enabledLm->get_inconsistent();
pedited->chmixerbw.enabled = !enabled->get_inconsistent();
pedited->chmixerbw.curve = !shape->isUnChanged ();
pedited->chmixerbw.autoc = !autoch->get_inconsistent();
pedited->chmixerbw.enabled = !enabled->get_inconsistent();
pedited->chmixerbw.enabledcc = !enabledcc->get_inconsistent();
pedited->chmixerbw.bwred = bwred->getEditedState ();
pedited->chmixerbw.bwgreen = bwgreen->getEditedState ();
pedited->chmixerbw.bwblue = bwblue->getEditedState ();
@@ -743,7 +743,7 @@ void ChMixerbw::setChanged () {
rglabel->show();
gglabel->show();
bglabel->show();
enabled->hide();
enabledcc->hide();
fil->set_sensitive (true);
}
@@ -774,7 +774,7 @@ void ChMixerbw::setChanged () {
rglabel->show();
gglabel->show();
bglabel->show();
enabled->show();
enabledcc->show();
fil->set_sensitive (true);
}
@@ -809,19 +809,19 @@ void ChMixerbw::setChanged () {
clabel->hide();
mlabel->hide();
plabel->hide();
enabled->hide();
enabledcc->hide();
fil->set_sensitive (true);
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWset, set->get_active_text ());
}
}
void ChMixerbw::filChanged () {
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWfil, fil->get_active_text ());
}
}
@@ -830,8 +830,7 @@ void ChMixerbw::metChanged () {
if(met->get_active_row_number()==3) {
set->show();
setLabel->show();
//enabled->show();
enabledLm->show();
enabled->show();
curveEditorG->hide();
curveEditorGBW->show();
curveEditorGBW2->show();
@@ -854,7 +853,7 @@ void ChMixerbw::metChanged () {
bwgreengam->show();
bwbluegam->show();
Gamlabel->show();
enabled->hide();
enabledcc->hide();
}
if(set->get_active_row_number()==12 || set->get_active_row_number()==13) {
bworan->show();
@@ -867,7 +866,7 @@ void ChMixerbw::metChanged () {
clabel->show();
mlabel->show();
plabel->show();
enabled->show();
enabledcc->show();
}
}
@@ -881,8 +880,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
bwred->hide();
bwgreen->hide();
bwblue->hide();
@@ -923,8 +922,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
curveEditorG->hide();
bwred->hide();
bwgreen->hide();
@@ -950,8 +949,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
curveEditorG->hide();
bwred->hide();
bwgreen->hide();
@@ -979,24 +978,24 @@ void ChMixerbw::metChanged () {
curveEditorGBW->hide();
curveEditorGBW2->hide();
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWmet, met->get_active_text ());
}
}
void ChMixerbw::enabledLm_toggled () {
void ChMixerbw::enabled_toggled () {
if (batchMode) {
if (enabledLm->get_inconsistent()) {
enabledLm->set_inconsistent (false);
enaLmconn.block (true);
enabledLm->set_active (false);
enaLmconn.block (false);
if (enabled->get_inconsistent()) {
enabled->set_inconsistent (false);
enaconn.block (true);
enabled->set_active (false);
enaconn.block (false);
}
else if (lastEnabledLm)
enabledLm->set_inconsistent (true);
else if (lastEnabled)
enabled->set_inconsistent (true);
lastEnabledLm = enabledLm->get_active ();
lastEnabled = enabled->get_active ();
}
if (listener) {
@@ -1035,23 +1034,23 @@ void ChMixerbw::neutral_pressed () {
}
void ChMixerbw::enabled_toggled () {
void ChMixerbw::enabledcc_toggled () {
if (batchMode) {
if (enabled->get_inconsistent()) {
enabled->set_inconsistent (false);
enaconn.block (true);
enabled->set_active (false);
enaconn.block (false);
if (enabledcc->get_inconsistent()) {
enabledcc->set_inconsistent (false);
enaccconn.block (true);
enabledcc->set_active (false);
enaccconn.block (false);
}
else if (lastEnabled)
enabled->set_inconsistent (true);
else if (lastEnabledcc)
enabledcc->set_inconsistent (true);
lastEnabled = enabled->get_active ();
lastEnabledcc = enabledcc->get_active ();
}
if (listener) {
if (enabled->get_active ()){
if (enabledcc->get_active ()){
listener->panelChanged (EvBWChmixEnabled, M("GENERAL_ENABLED"));
}
else {
@@ -1188,7 +1187,7 @@ void ChMixerbw::adjusterChanged (Adjuster* a, double newval) {
autoch->set_inconsistent (false);
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
Glib::ustring value = a->getTextValue();
if (a == bwred)
listener->panelChanged (EvBWred, value );

14
rtgui/chmixerbw.h
View File

@@ -74,13 +74,13 @@ class ChMixerbw : public Gtk::VBox, public AdjusterListener, public FoldableTool
Gtk::Label* filLabel;
Gtk::Image *imgIcon[11];
Gtk::CheckButton* enabledLm;
bool lastEnabledLm;
sigc::connection enaLmconn;
Gtk::CheckButton* enabled;
bool lastEnabled, lastAuto;
sigc::connection enaconn,tcmodeconn,tcmodeconn2, autoconn, neutralconn;
bool lastEnabled;
sigc::connection enaconn;
Gtk::CheckButton* enabledcc;
bool lastEnabledcc, lastAuto;
sigc::connection enaccconn,tcmodeconn,tcmodeconn2, autoconn, neutralconn;
MyComboBoxText* toneCurveBW;
MyComboBoxText* toneCurveBW2;
@@ -107,8 +107,8 @@ class ChMixerbw : public Gtk::VBox, public AdjusterListener, public FoldableTool
void adjusterChanged (Adjuster* a, double newval);
void setAdjusterBehavior (bool bwadd, bool bwgadd, bool bwfadd);
void trimValues (rtengine::procparams::ProcParams* pp);
void enabledcc_toggled ();
void enabled_toggled ();
void enabledLm_toggled ();
void metChanged ();
void filChanged ();
void setChanged ();

6
rtgui/paramsedited.cc
View File

@@ -216,8 +216,8 @@ void ParamsEdited::set (bool v) {
chmixer.blue[0] = v;
chmixer.blue[1] = v;
chmixer.blue[2] = v;
chmixerbw.enabledcc = v;
chmixerbw.enabled = v;
chmixerbw.enabledLm = v;
chmixerbw.bwred = v;
chmixerbw.bwgreen = v;
chmixerbw.bwblue = v;
@@ -497,8 +497,8 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
chmixer.blue[0] = chmixer.blue[0] && p.chmixer.blue[0] == other.chmixer.blue[0];
chmixer.blue[1] = chmixer.blue[1] && p.chmixer.blue[1] == other.chmixer.blue[1];
chmixer.blue[2] = chmixer.blue[2] && p.chmixer.blue[2] == other.chmixer.blue[2];
chmixerbw.enabledcc = chmixerbw.enabledcc && p.chmixerbw.enabledcc == other.chmixerbw.enabledcc;
chmixerbw.enabled = chmixerbw.enabled && p.chmixerbw.enabled == other.chmixerbw.enabled;
chmixerbw.enabledLm = chmixerbw.enabledLm && p.chmixerbw.enabledLm == other.chmixerbw.enabledLm;
chmixerbw.bwred = chmixerbw.bwred && p.chmixerbw.bwred == other.chmixerbw.bwred;
chmixerbw.bwgreen = chmixerbw.bwgreen && p.chmixerbw.bwgreen == other.chmixerbw.bwgreen;
chmixerbw.bwblue = chmixerbw.bwblue && p.chmixerbw.bwblue == other.chmixerbw.bwblue;
@@ -633,8 +633,8 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (chmixer.green[i]) toEdit.chmixer.green[i] = dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.green[i] + mods.chmixer.green[i] : mods.chmixer.green[i];
if (chmixer.blue[i]) toEdit.chmixer.blue[i] = dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.blue[i] + mods.chmixer.blue[i] : mods.chmixer.blue[i];
}
if (chmixerbw.enabledcc) toEdit.chmixerbw.enabledcc = mods.chmixerbw.enabledcc;
if (chmixerbw.enabled) toEdit.chmixerbw.enabled = mods.chmixerbw.enabled;
if (chmixerbw.enabledLm) toEdit.chmixerbw.enabledLm = mods.chmixerbw.enabledLm;
if (chmixerbw.bwgreen) toEdit.chmixerbw.bwgreen = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwgreen + mods.chmixerbw.bwgreen : mods.chmixerbw.bwgreen;
if (chmixerbw.bwred) toEdit.chmixerbw.bwred = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwred + mods.chmixerbw.bwred : mods.chmixerbw.bwred;
if (chmixerbw.bwblue) toEdit.chmixerbw.bwblue = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwblue + mods.chmixerbw.bwblue : mods.chmixerbw.bwblue;

2
rtgui/paramsedited.h
View File

@@ -354,8 +354,8 @@ class ChannelMixerParamsEdited {
class ChannelMixerbwParamsEdited {
public:
bool enabledcc;
bool enabled;
bool enabledLm;
bool bwred;
bool bwgreen;
bool bwblue;