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

Selective editing - adds the feather slider for each Graduated Filter (#7079)

Browse Source 
* Feather GF color and vibrance

* Feather exposure

* Graduated filer feather wavelet

* Graduated filter feather log

* Graduated filter Cam16 feather

* Change history msg

* GF shadows highlight feather

* GF mask common feather

* Move feather settings in settings mask

* Change history msg

* Change label feather

* Change 2 labels
This commit is contained in:
Desmis 2024-06-16 07:35:50 +02:00 committed by GitHub
parent 4f4a3d2336
commit a1c6ce5dd2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 300 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rtdata/languages/default
View File

@ -1068,7 +1068,7 @@ HISTORY_MSG_829;Local - SH gradient angle
HISTORY_MSG_830;Local - Color gradient strength L HISTORY_MSG_830;Local - Color gradient strength L
HISTORY_MSG_831;Local - Color gradient angle HISTORY_MSG_831;Local - Color gradient angle
HISTORY_MSG_832;Local - Color gradient strength C HISTORY_MSG_832;Local - Color gradient strength C
HISTORY_MSG_833;Local - TG - Feather gradient HISTORY_MSG_833;Local - Mask gradient feather
HISTORY_MSG_834;Local - Color gradient strength H HISTORY_MSG_834;Local - Color gradient strength H
HISTORY_MSG_835;Local - Vib gradient strength L HISTORY_MSG_835;Local - Vib gradient strength L
HISTORY_MSG_836;Local - Vib gradient angle HISTORY_MSG_836;Local - Vib gradient angle
@ -1502,6 +1502,15 @@ HISTORY_MSG_LOCAL_CIEMASK_STRU;Local Cie mask structure
HISTORY_MSG_LOCAL_CIEMASK_STRU_TOOL;Local Cie mask structure as tool HISTORY_MSG_LOCAL_CIEMASK_STRU_TOOL;Local Cie mask structure as tool
HISTORY_MSG_LOCAL_CIEMASK_WLC;Local CIECAM mask wavelet Lc HISTORY_MSG_LOCAL_CIEMASK_WLC;Local CIECAM mask wavelet Lc
HISTORY_MSG_LOCAL_CIEMASK_WLEV;Local CIECAM mask wavelet levels HISTORY_MSG_LOCAL_CIEMASK_WLEV;Local CIECAM mask wavelet levels
HISTORY_MSG_LOCAL_FEATHERCOL;Local Color gradient feather
HISTORY_MSG_LOCAL_FEATHEREXE;Local Exp gradient feather
HISTORY_MSG_LOCAL_FEATHERVIB;Local Vib gradient feather
HISTORY_MSG_LOCAL_FEATHERWAV;Local Wav gradient feather
HISTORY_MSG_LOCAL_FEATHERLOG;Local Log gradient feather
HISTORY_MSG_LOCAL_FEATHERCIE;Local CIECAM gradient feather
HISTORY_MSG_LOCAL_FEATHERSH;Local SH gradient feather
HISTORY_MSG_LOCAL_FEATHERMAS;Local Mask common gradient feather
HISTORY_MSG_LOCAL_LOG_BLACKS;Local Log - Blacks distribution HISTORY_MSG_LOCAL_LOG_BLACKS;Local Log - Blacks distribution
HISTORY_MSG_LOCAL_LOG_COMPR;Local Log - Compress brightness HISTORY_MSG_LOCAL_LOG_COMPR;Local Log - Compress brightness
HISTORY_MSG_LOCAL_LOG_SAT;Local Log - Saturation control HISTORY_MSG_LOCAL_LOG_SAT;Local Log - Saturation control
@ -2929,7 +2938,7 @@ TP_LOCALLAB_CHRRT;Chroma
TP_LOCALLAB_CIE;Color appearance (Cam16 & JzCzHz) TP_LOCALLAB_CIE;Color appearance (Cam16 & JzCzHz)
TP_LOCALLAB_CIE_SMOOTH_NONE;None TP_LOCALLAB_CIE_SMOOTH_NONE;None
TP_LOCALLAB_CIE_SMOOTH_EV;Ev based TP_LOCALLAB_CIE_SMOOTH_EV;Ev based
TP_LOCALLAB_CIE_SMOOTHFRAME;Highlight attenuation & Levels TP_LOCALLAB_CIE_SMOOTHFRAME;Highlight Attenuation & Levels
TP_LOCALLAB_CIE_SMOOTH_GAMMA;Slope based TP_LOCALLAB_CIE_SMOOTH_GAMMA;Slope based
TP_LOCALLAB_CIE_SMOOTH_GAMMA ROLLOFF;Gamma based TP_LOCALLAB_CIE_SMOOTH_GAMMA ROLLOFF;Gamma based
TP_LOCALLAB_CIE_SMOOTH_LEVELS;Levels TP_LOCALLAB_CIE_SMOOTH_LEVELS;Levels
@ -3089,7 +3098,8 @@ TP_LOCALLAB_FATLEVEL;Sigma
TP_LOCALLAB_FATSAT;Saturation control TP_LOCALLAB_FATSAT;Saturation control
TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask ƒ TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask ƒ
TP_LOCALLAB_FEATH_TOOLTIP;Gradient width as a percentage of the Spot diagonal\nUsed by all graduated filters in all tools.\nNo action if a graduated filter hasn't been activated. TP_LOCALLAB_FEATH_TOOLTIP;Gradient width as a percentage of the Spot diagonal\nUsed by all graduated filters in all tools.\nNo action if a graduated filter hasn't been activated.
TP_LOCALLAB_FEATVALUE;Feather gradient (Grad. Filters) TP_LOCALLAB_FEATVALUE;Feather gradient
TP_LOCALLAB_FEATVALUE_MASK;Feather gradient (Grad. Filters Mask)
TP_LOCALLAB_FFTCOL_MASK;FFTW ƒ TP_LOCALLAB_FFTCOL_MASK;FFTW ƒ
TP_LOCALLAB_FFTMASK_TOOLTIP;Use a Fourier transform for better quality (increased processing time and memory requirements). TP_LOCALLAB_FFTMASK_TOOLTIP;Use a Fourier transform for better quality (increased processing time and memory requirements).
TP_LOCALLAB_FFTW;ƒ - Use Fast Fourier Transform TP_LOCALLAB_FFTW;ƒ - Use Fast Fourier Transform
@ -3566,7 +3576,7 @@ TP_LOCALLAB_SLOPESMOOTHR;Red balance (Slope)
TP_LOCALLAB_SLOPESMOOTHG;Green balance (Slope) TP_LOCALLAB_SLOPESMOOTHG;Green balance (Slope)
TP_LOCALLAB_SLOPESMOOTHB;Blue balance (Slope) TP_LOCALLAB_SLOPESMOOTHB;Blue balance (Slope)
TP_LOCALLAB_SLOSH;Slope TP_LOCALLAB_SLOSH;Slope
TP_LOCALLAB_SMOOTHCIE;Highlight attenuation TP_LOCALLAB_SMOOTHCIE;Highlight Attenuation
TP_LOCALLAB_SMOOTHCIE_LUM;Luminosity mode TP_LOCALLAB_SMOOTHCIE_LUM;Luminosity mode
TP_LOCALLAB_SMOOTHCIE_SCA;Scale Yb Scene TP_LOCALLAB_SMOOTHCIE_SCA;Scale Yb Scene
TP_LOCALLAB_SMOOTHCIE_YB;Scale Yb Viewing TP_LOCALLAB_SMOOTHCIE_YB;Scale Yb Viewing

43
rtengine/iplocallab.cc
View File

@ -501,19 +501,25 @@ struct local_params {
float angmaexp; float angmaexp;
float str_mas; float str_mas;
float ang_mas; float ang_mas;
float feather_mas;
float strexp; float strexp;
float angexp; float angexp;
float featherexp;
float strSH; float strSH;
float angSH; float angSH;
float featherSH;
float strcol; float strcol;
float strcolab; float strcolab;
float strcolh; float strcolh;
float angcol; float angcol;
float feathcol;
float strvib; float strvib;
float strvibab; float strvibab;
float strvibh; float strvibh;
float angvib; float angvib;
float feathervib;
float angwav; float angwav;
float featherwav;
float strwav; float strwav;
float blendmaL; float blendmaL;
float radmaL; float radmaL;
@ -529,6 +535,7 @@ struct local_params {
float basew; float basew;
float anglog; float anglog;
float featherlog;
float strlog; float strlog;
float softradiusexp; float softradiusexp;
float softradiuscol; float softradiuscol;
@ -804,6 +811,7 @@ struct local_params {
float detailcie; float detailcie;
float strgradcie; float strgradcie;
float anggradcie; float anggradcie;
float feathercie;
bool satcie; bool satcie;
bool satlog; bool satlog;
int sensilog; int sensilog;
@ -1367,22 +1375,29 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
float angmaskexpo = ((float) locallab.spots.at(sp).angmaskexp); float angmaskexpo = ((float) locallab.spots.at(sp).angmaskexp);
float strmask = ((float) locallab.spots.at(sp).str_mask); float strmask = ((float) locallab.spots.at(sp).str_mask);
float angmask = ((float) locallab.spots.at(sp).ang_mask); float angmask = ((float) locallab.spots.at(sp).ang_mask);
float feathermask = ((float) locallab.spots.at(sp).feather_mask);
float strexpo = ((float) locallab.spots.at(sp).strexp); float strexpo = ((float) locallab.spots.at(sp).strexp);
float angexpo = ((float) locallab.spots.at(sp).angexp); float angexpo = ((float) locallab.spots.at(sp).angexp);
float featherexpo = ((float) locallab.spots.at(sp).featherexp);
float strSH = ((float) locallab.spots.at(sp).strSH); float strSH = ((float) locallab.spots.at(sp).strSH);
float angSH = ((float) locallab.spots.at(sp).angSH); float angSH = ((float) locallab.spots.at(sp).angSH);
float featherSH = ((float) locallab.spots.at(sp).featherSH);
float strcol = ((float) locallab.spots.at(sp).strcol); float strcol = ((float) locallab.spots.at(sp).strcol);
float strcolab = ((float) locallab.spots.at(sp).strcolab); float strcolab = ((float) locallab.spots.at(sp).strcolab);
float strcolh = ((float) locallab.spots.at(sp).strcolh); float strcolh = ((float) locallab.spots.at(sp).strcolh);
float angcol = ((float) locallab.spots.at(sp).angcol); float angcol = ((float) locallab.spots.at(sp).angcol);
float feathcol = ((float) locallab.spots.at(sp).feathercol);
float strvib = ((float) locallab.spots.at(sp).strvib); float strvib = ((float) locallab.spots.at(sp).strvib);
float strvibab = ((float) locallab.spots.at(sp).strvibab); float strvibab = ((float) locallab.spots.at(sp).strvibab);
float strvibh = ((float) locallab.spots.at(sp).strvibh); float strvibh = ((float) locallab.spots.at(sp).strvibh);
float angvib = ((float) locallab.spots.at(sp).angvib); float angvib = ((float) locallab.spots.at(sp).angvib);
float feathervib = ((float) locallab.spots.at(sp).feathervib);
float strwav = ((float) locallab.spots.at(sp).strwav); float strwav = ((float) locallab.spots.at(sp).strwav);
float angwav = ((float) locallab.spots.at(sp).angwav); float angwav = ((float) locallab.spots.at(sp).angwav);
float featherwav = ((float) locallab.spots.at(sp).featherwav);
float strlog = ((float) locallab.spots.at(sp).strlog); float strlog = ((float) locallab.spots.at(sp).strlog);
float anglog = ((float) locallab.spots.at(sp).anglog); float anglog = ((float) locallab.spots.at(sp).anglog);
float featherlog = ((float) locallab.spots.at(sp).featherlog);
float softradiusexpo = ((float) locallab.spots.at(sp).softradiusexp); float softradiusexpo = ((float) locallab.spots.at(sp).softradiusexp);
float softradiuscolor = ((float) locallab.spots.at(sp).softradiuscol); float softradiuscolor = ((float) locallab.spots.at(sp).softradiuscol);
float softradiusreti = ((float) locallab.spots.at(sp).softradiusret); float softradiusreti = ((float) locallab.spots.at(sp).softradiusret);
@ -1515,6 +1530,7 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
float contciemask = (float) locallab.spots.at(sp).contcie; float contciemask = (float) locallab.spots.at(sp).contcie;
float strgradcie = ((float) locallab.spots.at(sp).strgradcie); float strgradcie = ((float) locallab.spots.at(sp).strgradcie);
float anggradcie = ((float) locallab.spots.at(sp).anggradcie); float anggradcie = ((float) locallab.spots.at(sp).anggradcie);
float feathercie = ((float) locallab.spots.at(sp).feathercie);
lp.comprlo = locallab.spots.at(sp).comprlog; lp.comprlo = locallab.spots.at(sp).comprlog;
lp.comprlocie = locallab.spots.at(sp).comprcie; lp.comprlocie = locallab.spots.at(sp).comprcie;
@ -1550,23 +1566,30 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
lp.angmaexp = angmaskexpo; lp.angmaexp = angmaskexpo;
lp.str_mas = strmask; lp.str_mas = strmask;
lp.ang_mas = angmask; lp.ang_mas = angmask;
lp.feather_mas = feathermask;
lp.strexp = strexpo; lp.strexp = strexpo;
lp.angexp = angexpo; lp.angexp = angexpo;
lp.featherexp = featherexpo;
lp.strSH = strSH; lp.strSH = strSH;
lp.angSH = angSH; lp.angSH = angSH;
lp.featherSH = featherSH;
lp.strcol = strcol; lp.strcol = strcol;
lp.strcolab = strcolab; lp.strcolab = strcolab;
lp.strcolh = strcolh; lp.strcolh = strcolh;
lp.angcol = angcol; lp.angcol = angcol;
lp.feathcol = feathcol;
lp.strvib = strvib; lp.strvib = strvib;
lp.strvibab = strvibab; lp.strvibab = strvibab;
lp.strvibh = strvibh; lp.strvibh = strvibh;
lp.angvib = angvib; lp.angvib = angvib;
lp.feathervib = feathervib;
lp.strwav = strwav; lp.strwav = strwav;
lp.angwav = angwav; lp.angwav = angwav;
lp.featherwav = featherwav;
lp.strlog = strlog; lp.strlog = strlog;
lp.anglog = anglog; lp.anglog = anglog;
lp.featherlog = featherlog;
lp.softradiusexp = softradiusexpo; lp.softradiusexp = softradiusexpo;
lp.softradiuscol = softradiuscolor; lp.softradiuscol = softradiuscolor;
lp.softradiusret = softradiusreti; lp.softradiusret = softradiusreti;
@ -1779,6 +1802,7 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
lp.contciemask = 0.01f * contciemask; lp.contciemask = 0.01f * contciemask;
lp.strgradcie = strgradcie; lp.strgradcie = strgradcie;
lp.anggradcie = anggradcie; lp.anggradcie = anggradcie;
lp.feathercie = feathercie;
lp.blendmacie = blendmaskcie; lp.blendmacie = blendmaskcie;
lp.radmacie = radmaskcie; lp.radmacie = radmaskcie;
@ -5621,19 +5645,24 @@ void calclocalGradientParams(const struct local_params& lp, struct grad_params&
int h = bfh; int h = bfh;
float stops = 0.f; float stops = 0.f;
float angs = 0.f; float angs = 0.f;
double varfeath = 0.25; //0.01f * lp.feath;
if (indic == 0) { if (indic == 0) {
stops = -lp.strmaexp; stops = -lp.strmaexp;
angs = lp.angmaexp; angs = lp.angmaexp;
varfeath = 0.01f * lp.feath;//for all masks when present
} else if (indic == 1) { } else if (indic == 1) {
stops = lp.strexp; stops = lp.strexp;
angs = lp.angexp; angs = lp.angexp;
varfeath = 0.01f * lp.featherexp;
} else if (indic == 2) { } else if (indic == 2) {
stops = lp.strSH; stops = lp.strSH;
angs = lp.angSH; angs = lp.angSH;
varfeath = 0.01f * lp.featherSH;
} else if (indic == 3) { } else if (indic == 3) {
stops = lp.strcol; stops = lp.strcol;
angs = lp.angcol; angs = lp.angcol;
varfeath = 0.01f * lp.feathcol;
} else if (indic == 4) { } else if (indic == 4) {
float redu = 1.f; float redu = 1.f;
@ -5645,41 +5674,49 @@ void calclocalGradientParams(const struct local_params& lp, struct grad_params&
stops = redu * lp.strcolab; stops = redu * lp.strcolab;
angs = lp.angcol; angs = lp.angcol;
varfeath = 0.01f * lp.feathcol;
} else if (indic == 5) { } else if (indic == 5) {
stops = lp.strcolab; stops = lp.strcolab;
angs = lp.angcol; angs = lp.angcol;
varfeath = 0.01f * lp.feathcol;
} else if (indic == 6) { } else if (indic == 6) {
stops = lp.strcolh; stops = lp.strcolh;
angs = lp.angcol; angs = lp.angcol;
varfeath = 0.01f * lp.feathcol;
} else if (indic == 7) { } else if (indic == 7) {
stops = lp.strvib; stops = lp.strvib;
angs = lp.angvib; angs = lp.angvib;
varfeath = 0.01f * lp.feathervib;
} else if (indic == 8) { } else if (indic == 8) {
float redu = 1.f; float redu = 1.f;
if (lp.strvibab > 0.f) { if (lp.strvibab > 0.f) {
redu = 0.7f; redu = 0.7f;
} else { } else {
redu = 0.5f; redu = 0.5f;
} }
stops = redu * lp.strvibab; stops = redu * lp.strvibab;
angs = lp.angvib; angs = lp.angvib;
varfeath = 0.01f * lp.feathervib;
} else if (indic == 9) { } else if (indic == 9) {
stops = lp.strvibh; stops = lp.strvibh;
angs = lp.angvib; angs = lp.angvib;
varfeath = 0.01f * lp.feathervib;
} else if (indic == 10) { } else if (indic == 10) {
stops = std::fabs(lp.strwav); stops = std::fabs(lp.strwav);
angs = lp.angwav; angs = lp.angwav;
varfeath = 0.01f * lp.featherwav;
} else if (indic == 11) { } else if (indic == 11) {
stops = lp.strlog; stops = lp.strlog;
angs = lp.anglog; angs = lp.anglog;
varfeath = 0.01f * lp.featherlog;
} else if (indic == 12) { } else if (indic == 12) {
stops = -lp.str_mas; stops = -lp.str_mas;
angs = lp.ang_mas; angs = lp.ang_mas;
varfeath = 0.01f * lp.feather_mas;
} else if (indic == 15) { } else if (indic == 15) {
stops = lp.strgradcie; stops = lp.strgradcie;
angs = lp.anggradcie; angs = lp.anggradcie;
varfeath = 0.01f * lp.feathercie;
} }
@ -5687,7 +5724,7 @@ void calclocalGradientParams(const struct local_params& lp, struct grad_params&
double gradient_center_x = LIM01((lp.xc - xstart) / bfw); double gradient_center_x = LIM01((lp.xc - xstart) / bfw);
double gradient_center_y = LIM01((lp.yc - ystart) / bfh); double gradient_center_y = LIM01((lp.yc - ystart) / bfh);
double gradient_angle = static_cast<double>(angs) / 180.0 * rtengine::RT_PI; double gradient_angle = static_cast<double>(angs) / 180.0 * rtengine::RT_PI;
double varfeath = 0.01f * lp.feath; // double varfeath = 0.01f * lp.feath;
//printf("xstart=%f ysta=%f lpxc=%f lpyc=%f stop=%f bb=%f cc=%f ang=%f ff=%d gg=%d\n", xstart, ystart, lp.xc, lp.yc, gradient_stops, gradient_center_x, gradient_center_y, gradient_angle, w, h); //printf("xstart=%f ysta=%f lpxc=%f lpyc=%f stop=%f bb=%f cc=%f ang=%f ff=%d gg=%d\n", xstart, ystart, lp.xc, lp.yc, gradient_stops, gradient_center_x, gradient_center_y, gradient_angle, w, h);

34
rtengine/procparams.cc
View File

@ -3044,6 +3044,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
strcolab(0.), strcolab(0.),
strcolh(0.), strcolh(0.),
angcol(0.), angcol(0.),
feathercol(25.),
blurcolde(5), blurcolde(5),
blurcol(0.2), blurcol(0.2),
contcol(0.), contcol(0.),
@ -3286,6 +3287,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
gamex(1.), gamex(1.),
strexp(0.), strexp(0.),
angexp(0.), angexp(0.),
featherexp(25.),
excurve{ excurve{
static_cast<double>(DCT_NURBS), static_cast<double>(DCT_NURBS),
0.0, 0.0,
@ -3436,6 +3438,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
blurSHde(5), blurSHde(5),
strSH(0.), strSH(0.),
angSH(0.), angSH(0.),
featherSH(25.),
inverssh(false), inverssh(false),
chromaskSH(0.0), chromaskSH(0.0),
gammaskSH(1.0), gammaskSH(1.0),
@ -3531,6 +3534,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
strvibab(0.0), strvibab(0.0),
strvibh(0.0), strvibh(0.0),
angvib(0.0), angvib(0.0),
feathervib(25.0),
Lmaskvibcurve{ Lmaskvibcurve{
static_cast<double>(DCT_NURBS), static_cast<double>(DCT_NURBS),
0.0, 0.0,
@ -3975,6 +3979,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
sigmalc2(1.0), sigmalc2(1.0),
strwav(0.0), strwav(0.0),
angwav(0.0), angwav(0.0),
featherwav(25.0),
strengthw(0.0), strengthw(0.0),
sigmaed(1.0), sigmaed(1.0),
radiusw(15.0), radiusw(15.0),
@ -4259,6 +4264,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
baselog(2.), baselog(2.),
strlog(0.0), strlog(0.0),
anglog(0.0), anglog(0.0),
featherlog(25.0),
CCmaskcurveL{ CCmaskcurveL{
static_cast<double>(FCT_MinMaxCPoints), static_cast<double>(FCT_MinMaxCPoints),
0.0, 0.0,
@ -4386,6 +4392,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
shadmask(0.0), shadmask(0.0),
str_mask(0), str_mask(0),
ang_mask(0), ang_mask(0),
feather_mask(25),
HHhmask_curve{ HHhmask_curve{
static_cast<double>(FCT_MinMaxCPoints), static_cast<double>(FCT_MinMaxCPoints),
0.0, 0.0,
@ -4669,6 +4676,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
surroundcie("Average"), surroundcie("Average"),
strgradcie(0.), strgradcie(0.),
anggradcie(0.), anggradcie(0.),
feathercie(25.),
enacieMask(false), enacieMask(false),
enacieMaskall(false), enacieMaskall(false),
CCmaskciecurve{ CCmaskciecurve{
@ -4912,6 +4920,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& strcolab == other.strcolab && strcolab == other.strcolab
&& strcolh == other.strcolh && strcolh == other.strcolh
&& angcol == other.angcol && angcol == other.angcol
&& feathercol == other.feathercol
&& blurcolde == other.blurcolde && blurcolde == other.blurcolde
&& blurcol == other.blurcol && blurcol == other.blurcol
&& contcol == other.contcol && contcol == other.contcol
@ -4974,6 +4983,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& gamex == other.gamex && gamex == other.gamex
&& strexp == other.strexp && strexp == other.strexp
&& angexp == other.angexp && angexp == other.angexp
&& featherexp == other.featherexp
&& excurve == other.excurve && excurve == other.excurve
&& norm == other.norm && norm == other.norm
&& inversex == other.inversex && inversex == other.inversex
@ -5037,6 +5047,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& blurSHde == other.blurSHde && blurSHde == other.blurSHde
&& strSH == other.strSH && strSH == other.strSH
&& angSH == other.angSH && angSH == other.angSH
&& featherSH == other.featherSH
&& inverssh == other.inverssh && inverssh == other.inverssh
&& chromaskSH == other.chromaskSH && chromaskSH == other.chromaskSH
&& gammaskSH == other.gammaskSH && gammaskSH == other.gammaskSH
@ -5082,6 +5093,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& strvibab == other.strvibab && strvibab == other.strvibab
&& strvibh == other.strvibh && strvibh == other.strvibh
&& angvib == other.angvib && angvib == other.angvib
&& feathervib == other.feathervib
&& Lmaskvibcurve == other.Lmaskvibcurve && Lmaskvibcurve == other.Lmaskvibcurve
&& recothresv == other.recothresv && recothresv == other.recothresv
&& lowthresv == other.lowthresv && lowthresv == other.lowthresv
@ -5298,6 +5310,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& sigmalc2 == other.sigmalc2 && sigmalc2 == other.sigmalc2
&& strwav == other.strwav && strwav == other.strwav
&& angwav == other.angwav && angwav == other.angwav
&& featherwav == other.featherwav
&& strengthw == other.strengthw && strengthw == other.strengthw
&& sigmaed == other.sigmaed && sigmaed == other.sigmaed
&& radiusw == other.radiusw && radiusw == other.radiusw
@ -5412,6 +5425,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& surround == other.surround && surround == other.surround
&& strlog == other.strlog && strlog == other.strlog
&& anglog == other.anglog && anglog == other.anglog
&& featherlog == other.featherlog
&& CCmaskcurveL == other.CCmaskcurveL && CCmaskcurveL == other.CCmaskcurveL
&& LLmaskcurveL == other.LLmaskcurveL && LLmaskcurveL == other.LLmaskcurveL
&& HHmaskcurveL == other.HHmaskcurveL && HHmaskcurveL == other.HHmaskcurveL
@ -5450,6 +5464,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& shadmask == other.shadmask && shadmask == other.shadmask
&& str_mask == other.str_mask && str_mask == other.str_mask
&& ang_mask == other.ang_mask && ang_mask == other.ang_mask
&& feather_mask == other.feather_mask
&& HHhmask_curve == other.HHhmask_curve && HHhmask_curve == other.HHhmask_curve
&& Lmask_curve == other.Lmask_curve && Lmask_curve == other.Lmask_curve
&& LLmask_curvewav == other.LLmask_curvewav && LLmask_curvewav == other.LLmask_curvewav
@ -5584,6 +5599,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& detailcie == other.detailcie && detailcie == other.detailcie
&& strgradcie == other.strgradcie && strgradcie == other.strgradcie
&& anggradcie == other.anggradcie && anggradcie == other.anggradcie
&& feathercie == other.feathercie
&& surroundcie == other.surroundcie && surroundcie == other.surroundcie
&& enacieMask == other.enacieMask && enacieMask == other.enacieMask
&& enacieMaskall == other.enacieMaskall && enacieMaskall == other.enacieMaskall
@ -6856,6 +6872,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->strcolab, "Locallab", "Strcolab_" + index_str, spot.strcolab, keyFile); saveToKeyfile(!pedited || spot_edited->strcolab, "Locallab", "Strcolab_" + index_str, spot.strcolab, keyFile);
saveToKeyfile(!pedited || spot_edited->strcolh, "Locallab", "Strcolh_" + index_str, spot.strcolh, keyFile); saveToKeyfile(!pedited || spot_edited->strcolh, "Locallab", "Strcolh_" + index_str, spot.strcolh, keyFile);
saveToKeyfile(!pedited || spot_edited->angcol, "Locallab", "Angcol_" + index_str, spot.angcol, keyFile); saveToKeyfile(!pedited || spot_edited->angcol, "Locallab", "Angcol_" + index_str, spot.angcol, keyFile);
saveToKeyfile(!pedited || spot_edited->feathercol, "Locallab", "Feathercol_" + index_str, spot.feathercol, keyFile);
saveToKeyfile(!pedited || spot_edited->blurcolde, "Locallab", "Blurcolde_" + index_str, spot.blurcolde, keyFile); saveToKeyfile(!pedited || spot_edited->blurcolde, "Locallab", "Blurcolde_" + index_str, spot.blurcolde, keyFile);
saveToKeyfile(!pedited || spot_edited->blurcol, "Locallab", "Blurcol_" + index_str, spot.blurcol, keyFile); saveToKeyfile(!pedited || spot_edited->blurcol, "Locallab", "Blurcol_" + index_str, spot.blurcol, keyFile);
saveToKeyfile(!pedited || spot_edited->contcol, "Locallab", "Contcol_" + index_str, spot.contcol, keyFile); saveToKeyfile(!pedited || spot_edited->contcol, "Locallab", "Contcol_" + index_str, spot.contcol, keyFile);
@ -6919,6 +6936,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->gamex, "Locallab", "Gamex_" + index_str, spot.gamex, keyFile); saveToKeyfile(!pedited || spot_edited->gamex, "Locallab", "Gamex_" + index_str, spot.gamex, keyFile);
saveToKeyfile(!pedited || spot_edited->strexp, "Locallab", "Strexp_" + index_str, spot.strexp, keyFile); saveToKeyfile(!pedited || spot_edited->strexp, "Locallab", "Strexp_" + index_str, spot.strexp, keyFile);
saveToKeyfile(!pedited || spot_edited->angexp, "Locallab", "Angexp_" + index_str, spot.angexp, keyFile); saveToKeyfile(!pedited || spot_edited->angexp, "Locallab", "Angexp_" + index_str, spot.angexp, keyFile);
saveToKeyfile(!pedited || spot_edited->featherexp, "Locallab", "Featherexp_" + index_str, spot.featherexp, keyFile);
saveToKeyfile(!pedited || spot_edited->excurve, "Locallab", "ExCurve_" + index_str, spot.excurve, keyFile); saveToKeyfile(!pedited || spot_edited->excurve, "Locallab", "ExCurve_" + index_str, spot.excurve, keyFile);
saveToKeyfile(!pedited || spot_edited->norm, "Locallab", "Norm_" + index_str, spot.norm, keyFile); saveToKeyfile(!pedited || spot_edited->norm, "Locallab", "Norm_" + index_str, spot.norm, keyFile);
saveToKeyfile(!pedited || spot_edited->inversex, "Locallab", "Inversex_" + index_str, spot.inversex, keyFile); saveToKeyfile(!pedited || spot_edited->inversex, "Locallab", "Inversex_" + index_str, spot.inversex, keyFile);
@ -6979,6 +6997,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->blurSHde, "Locallab", "BlurSHde_" + index_str, spot.blurSHde, keyFile); saveToKeyfile(!pedited || spot_edited->blurSHde, "Locallab", "BlurSHde_" + index_str, spot.blurSHde, keyFile);
saveToKeyfile(!pedited || spot_edited->strSH, "Locallab", "StrSH_" + index_str, spot.strSH, keyFile); saveToKeyfile(!pedited || spot_edited->strSH, "Locallab", "StrSH_" + index_str, spot.strSH, keyFile);
saveToKeyfile(!pedited || spot_edited->angSH, "Locallab", "AngSH_" + index_str, spot.angSH, keyFile); saveToKeyfile(!pedited || spot_edited->angSH, "Locallab", "AngSH_" + index_str, spot.angSH, keyFile);
saveToKeyfile(!pedited || spot_edited->featherSH, "Locallab", "FeatherSH_" + index_str, spot.featherSH, keyFile);
saveToKeyfile(!pedited || spot_edited->inverssh, "Locallab", "Inverssh_" + index_str, spot.inverssh, keyFile); saveToKeyfile(!pedited || spot_edited->inverssh, "Locallab", "Inverssh_" + index_str, spot.inverssh, keyFile);
saveToKeyfile(!pedited || spot_edited->chromaskSH, "Locallab", "ChromaskSH_" + index_str, spot.chromaskSH, keyFile); saveToKeyfile(!pedited || spot_edited->chromaskSH, "Locallab", "ChromaskSH_" + index_str, spot.chromaskSH, keyFile);
saveToKeyfile(!pedited || spot_edited->gammaskSH, "Locallab", "GammaskSH_" + index_str, spot.gammaskSH, keyFile); saveToKeyfile(!pedited || spot_edited->gammaskSH, "Locallab", "GammaskSH_" + index_str, spot.gammaskSH, keyFile);
@ -7024,6 +7043,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->strvibab, "Locallab", "Strvibab_" + index_str, spot.strvibab, keyFile); saveToKeyfile(!pedited || spot_edited->strvibab, "Locallab", "Strvibab_" + index_str, spot.strvibab, keyFile);
saveToKeyfile(!pedited || spot_edited->strvibh, "Locallab", "Strvibh_" + index_str, spot.strvibh, keyFile); saveToKeyfile(!pedited || spot_edited->strvibh, "Locallab", "Strvibh_" + index_str, spot.strvibh, keyFile);
saveToKeyfile(!pedited || spot_edited->angvib, "Locallab", "Angvib_" + index_str, spot.angvib, keyFile); saveToKeyfile(!pedited || spot_edited->angvib, "Locallab", "Angvib_" + index_str, spot.angvib, keyFile);
saveToKeyfile(!pedited || spot_edited->angvib, "Locallab", "Feathervib_" + index_str, spot.feathervib, keyFile);
saveToKeyfile(!pedited || spot_edited->Lmaskvibcurve, "Locallab", "LmaskvibCurve_" + index_str, spot.Lmaskvibcurve, keyFile); saveToKeyfile(!pedited || spot_edited->Lmaskvibcurve, "Locallab", "LmaskvibCurve_" + index_str, spot.Lmaskvibcurve, keyFile);
saveToKeyfile(!pedited || spot_edited->recothresv, "Locallab", "Recothresv_" + index_str, spot.recothresv, keyFile); saveToKeyfile(!pedited || spot_edited->recothresv, "Locallab", "Recothresv_" + index_str, spot.recothresv, keyFile);
saveToKeyfile(!pedited || spot_edited->lowthresv, "Locallab", "Lowthresv_" + index_str, spot.lowthresv, keyFile); saveToKeyfile(!pedited || spot_edited->lowthresv, "Locallab", "Lowthresv_" + index_str, spot.lowthresv, keyFile);
@ -7246,6 +7266,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->sigmalc2, "Locallab", "Sigmalc2_" + index_str, spot.sigmalc2, keyFile); saveToKeyfile(!pedited || spot_edited->sigmalc2, "Locallab", "Sigmalc2_" + index_str, spot.sigmalc2, keyFile);
saveToKeyfile(!pedited || spot_edited->strwav, "Locallab", "Strwav_" + index_str, spot.strwav, keyFile); saveToKeyfile(!pedited || spot_edited->strwav, "Locallab", "Strwav_" + index_str, spot.strwav, keyFile);
saveToKeyfile(!pedited || spot_edited->angwav, "Locallab", "Angwav_" + index_str, spot.angwav, keyFile); saveToKeyfile(!pedited || spot_edited->angwav, "Locallab", "Angwav_" + index_str, spot.angwav, keyFile);
saveToKeyfile(!pedited || spot_edited->featherwav, "Locallab", "Featherwav_" + index_str, spot.featherwav, keyFile);
saveToKeyfile(!pedited || spot_edited->strengthw, "Locallab", "Strengthw_" + index_str, spot.strengthw, keyFile); saveToKeyfile(!pedited || spot_edited->strengthw, "Locallab", "Strengthw_" + index_str, spot.strengthw, keyFile);
saveToKeyfile(!pedited || spot_edited->sigmaed, "Locallab", "Sigmaed_" + index_str, spot.sigmaed, keyFile); saveToKeyfile(!pedited || spot_edited->sigmaed, "Locallab", "Sigmaed_" + index_str, spot.sigmaed, keyFile);
saveToKeyfile(!pedited || spot_edited->radiusw, "Locallab", "Radiusw_" + index_str, spot.radiusw, keyFile); saveToKeyfile(!pedited || spot_edited->radiusw, "Locallab", "Radiusw_" + index_str, spot.radiusw, keyFile);
@ -7358,6 +7379,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->surround, "Locallab", "Surround_" + index_str, spot.surround, keyFile); saveToKeyfile(!pedited || spot_edited->surround, "Locallab", "Surround_" + index_str, spot.surround, keyFile);
saveToKeyfile(!pedited || spot_edited->strlog, "Locallab", "Strlog_" + index_str, spot.strlog, keyFile); saveToKeyfile(!pedited || spot_edited->strlog, "Locallab", "Strlog_" + index_str, spot.strlog, keyFile);
saveToKeyfile(!pedited || spot_edited->anglog, "Locallab", "Anglog_" + index_str, spot.anglog, keyFile); saveToKeyfile(!pedited || spot_edited->anglog, "Locallab", "Anglog_" + index_str, spot.anglog, keyFile);
saveToKeyfile(!pedited || spot_edited->featherlog, "Locallab", "Featherlog_" + index_str, spot.featherlog, keyFile);
saveToKeyfile(!pedited || spot_edited->CCmaskcurveL, "Locallab", "CCmaskCurveL_" + index_str, spot.CCmaskcurveL, keyFile); saveToKeyfile(!pedited || spot_edited->CCmaskcurveL, "Locallab", "CCmaskCurveL_" + index_str, spot.CCmaskcurveL, keyFile);
saveToKeyfile(!pedited || spot_edited->LLmaskcurveL, "Locallab", "LLmaskCurveL_" + index_str, spot.LLmaskcurveL, keyFile); saveToKeyfile(!pedited || spot_edited->LLmaskcurveL, "Locallab", "LLmaskCurveL_" + index_str, spot.LLmaskcurveL, keyFile);
saveToKeyfile(!pedited || spot_edited->HHmaskcurveL, "Locallab", "HHmaskCurveL_" + index_str, spot.HHmaskcurveL, keyFile); saveToKeyfile(!pedited || spot_edited->HHmaskcurveL, "Locallab", "HHmaskCurveL_" + index_str, spot.HHmaskcurveL, keyFile);
@ -7397,6 +7419,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->shadmask, "Locallab", "Shadmask_" + index_str, spot.shadmask, keyFile); saveToKeyfile(!pedited || spot_edited->shadmask, "Locallab", "Shadmask_" + index_str, spot.shadmask, keyFile);
saveToKeyfile(!pedited || spot_edited->str_mask, "Locallab", "Str_mask_" + index_str, spot.str_mask, keyFile); saveToKeyfile(!pedited || spot_edited->str_mask, "Locallab", "Str_mask_" + index_str, spot.str_mask, keyFile);
saveToKeyfile(!pedited || spot_edited->ang_mask, "Locallab", "Ang_mask_" + index_str, spot.ang_mask, keyFile); saveToKeyfile(!pedited || spot_edited->ang_mask, "Locallab", "Ang_mask_" + index_str, spot.ang_mask, keyFile);
saveToKeyfile(!pedited || spot_edited->feather_mask, "Locallab", "Feather_mask_" + index_str, spot.feather_mask, keyFile);
saveToKeyfile(!pedited || spot_edited->HHhmask_curve, "Locallab", "HHhmask_Curve_" + index_str, spot.HHhmask_curve, keyFile); saveToKeyfile(!pedited || spot_edited->HHhmask_curve, "Locallab", "HHhmask_Curve_" + index_str, spot.HHhmask_curve, keyFile);
saveToKeyfile(!pedited || spot_edited->Lmask_curve, "Locallab", "Lmask_Curve_" + index_str, spot.Lmask_curve, keyFile); saveToKeyfile(!pedited || spot_edited->Lmask_curve, "Locallab", "Lmask_Curve_" + index_str, spot.Lmask_curve, keyFile);
saveToKeyfile(!pedited || spot_edited->LLmask_curvewav, "Locallab", "LLmask_Curvewav_" + index_str, spot.LLmask_curvewav, keyFile); saveToKeyfile(!pedited || spot_edited->LLmask_curvewav, "Locallab", "LLmask_Curvewav_" + index_str, spot.LLmask_curvewav, keyFile);
@ -7534,6 +7557,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || spot_edited->detailcie, "Locallab", "Detailcie_" + index_str, spot.detailcie, keyFile); saveToKeyfile(!pedited || spot_edited->detailcie, "Locallab", "Detailcie_" + index_str, spot.detailcie, keyFile);
saveToKeyfile(!pedited || spot_edited->strgradcie, "Locallab", "Strgradcie_" + index_str, spot.strgradcie, keyFile); saveToKeyfile(!pedited || spot_edited->strgradcie, "Locallab", "Strgradcie_" + index_str, spot.strgradcie, keyFile);
saveToKeyfile(!pedited || spot_edited->anggradcie, "Locallab", "Anggradcie_" + index_str, spot.anggradcie, keyFile); saveToKeyfile(!pedited || spot_edited->anggradcie, "Locallab", "Anggradcie_" + index_str, spot.anggradcie, keyFile);
saveToKeyfile(!pedited || spot_edited->feathercie, "Locallab", "Feathercie_" + index_str, spot.feathercie, keyFile);
saveToKeyfile(!pedited || spot_edited->surroundcie, "Locallab", "Surroundcie_" + index_str, spot.surroundcie, keyFile); saveToKeyfile(!pedited || spot_edited->surroundcie, "Locallab", "Surroundcie_" + index_str, spot.surroundcie, keyFile);
saveToKeyfile(!pedited || spot_edited->enacieMask, "Locallab", "EnacieMask_" + index_str, spot.enacieMask, keyFile); saveToKeyfile(!pedited || spot_edited->enacieMask, "Locallab", "EnacieMask_" + index_str, spot.enacieMask, keyFile);
saveToKeyfile(!pedited || spot_edited->enacieMaskall, "Locallab", "EnacieMaskall_" + index_str, spot.enacieMaskall, keyFile); saveToKeyfile(!pedited || spot_edited->enacieMaskall, "Locallab", "EnacieMaskall_" + index_str, spot.enacieMaskall, keyFile);
@ -9126,6 +9150,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Strcolab_" + index_str, spot.strcolab, spotEdited.strcolab); assignFromKeyfile(keyFile, "Locallab", "Strcolab_" + index_str, spot.strcolab, spotEdited.strcolab);
assignFromKeyfile(keyFile, "Locallab", "Strcolh_" + index_str, spot.strcolh, spotEdited.strcolh); assignFromKeyfile(keyFile, "Locallab", "Strcolh_" + index_str, spot.strcolh, spotEdited.strcolh);
assignFromKeyfile(keyFile, "Locallab", "Angcol_" + index_str, spot.angcol, spotEdited.angcol); assignFromKeyfile(keyFile, "Locallab", "Angcol_" + index_str, spot.angcol, spotEdited.angcol);
assignFromKeyfile(keyFile, "Locallab", "Fetahercol_" + index_str, spot.feathercol, spotEdited.feathercol);
assignFromKeyfile(keyFile, "Locallab", "Blurcolde_" + index_str, spot.blurcolde, spotEdited.blurcolde); assignFromKeyfile(keyFile, "Locallab", "Blurcolde_" + index_str, spot.blurcolde, spotEdited.blurcolde);
assignFromKeyfile(keyFile, "Locallab", "Blurcol_" + index_str, spot.blurcol, spotEdited.blurcol); assignFromKeyfile(keyFile, "Locallab", "Blurcol_" + index_str, spot.blurcol, spotEdited.blurcol);
assignFromKeyfile(keyFile, "Locallab", "Contcol_" + index_str, spot.contcol, spotEdited.contcol); assignFromKeyfile(keyFile, "Locallab", "Contcol_" + index_str, spot.contcol, spotEdited.contcol);
@ -9202,6 +9227,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Gamex_" + index_str, spot.gamex, spotEdited.gamex); assignFromKeyfile(keyFile, "Locallab", "Gamex_" + index_str, spot.gamex, spotEdited.gamex);
assignFromKeyfile(keyFile, "Locallab", "Strexp_" + index_str, spot.strexp, spotEdited.strexp); assignFromKeyfile(keyFile, "Locallab", "Strexp_" + index_str, spot.strexp, spotEdited.strexp);
assignFromKeyfile(keyFile, "Locallab", "Angexp_" + index_str, spot.angexp, spotEdited.angexp); assignFromKeyfile(keyFile, "Locallab", "Angexp_" + index_str, spot.angexp, spotEdited.angexp);
assignFromKeyfile(keyFile, "Locallab", "Featherexp_" + index_str, spot.featherexp, spotEdited.featherexp);
assignFromKeyfile(keyFile, "Locallab", "ExCurve_" + index_str, spot.excurve, spotEdited.excurve); assignFromKeyfile(keyFile, "Locallab", "ExCurve_" + index_str, spot.excurve, spotEdited.excurve);
assignFromKeyfile(keyFile, "Locallab", "Norm_" + index_str, spot.norm, spotEdited.norm); assignFromKeyfile(keyFile, "Locallab", "Norm_" + index_str, spot.norm, spotEdited.norm);
assignFromKeyfile(keyFile, "Locallab", "Inversex_" + index_str, spot.inversex, spotEdited.inversex); assignFromKeyfile(keyFile, "Locallab", "Inversex_" + index_str, spot.inversex, spotEdited.inversex);
@ -9266,6 +9292,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "BlurSHde_" + index_str, spot.blurSHde, spotEdited.blurSHde); assignFromKeyfile(keyFile, "Locallab", "BlurSHde_" + index_str, spot.blurSHde, spotEdited.blurSHde);
assignFromKeyfile(keyFile, "Locallab", "StrSH_" + index_str, spot.strSH, spotEdited.strSH); assignFromKeyfile(keyFile, "Locallab", "StrSH_" + index_str, spot.strSH, spotEdited.strSH);
assignFromKeyfile(keyFile, "Locallab", "AngSH_" + index_str, spot.angSH, spotEdited.angSH); assignFromKeyfile(keyFile, "Locallab", "AngSH_" + index_str, spot.angSH, spotEdited.angSH);
assignFromKeyfile(keyFile, "Locallab", "FeatherSH_" + index_str, spot.featherSH, spotEdited.featherSH);
assignFromKeyfile(keyFile, "Locallab", "Inverssh_" + index_str, spot.inverssh, spotEdited.inverssh); assignFromKeyfile(keyFile, "Locallab", "Inverssh_" + index_str, spot.inverssh, spotEdited.inverssh);
assignFromKeyfile(keyFile, "Locallab", "ChromaskSH_" + index_str, spot.chromaskSH, spotEdited.chromaskSH); assignFromKeyfile(keyFile, "Locallab", "ChromaskSH_" + index_str, spot.chromaskSH, spotEdited.chromaskSH);
assignFromKeyfile(keyFile, "Locallab", "GammaskSH_" + index_str, spot.gammaskSH, spotEdited.gammaskSH); assignFromKeyfile(keyFile, "Locallab", "GammaskSH_" + index_str, spot.gammaskSH, spotEdited.gammaskSH);
@ -9325,6 +9352,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Strvibab_" + index_str, spot.strvibab, spotEdited.strvibab); assignFromKeyfile(keyFile, "Locallab", "Strvibab_" + index_str, spot.strvibab, spotEdited.strvibab);
assignFromKeyfile(keyFile, "Locallab", "Strvibh_" + index_str, spot.strvibh, spotEdited.strvibh); assignFromKeyfile(keyFile, "Locallab", "Strvibh_" + index_str, spot.strvibh, spotEdited.strvibh);
assignFromKeyfile(keyFile, "Locallab", "Angvib_" + index_str, spot.angvib, spotEdited.angvib); assignFromKeyfile(keyFile, "Locallab", "Angvib_" + index_str, spot.angvib, spotEdited.angvib);
assignFromKeyfile(keyFile, "Locallab", "Feathervib_" + index_str, spot.feathervib, spotEdited.feathervib);
assignFromKeyfile(keyFile, "Locallab", "LmaskvibCurve_" + index_str, spot.Lmaskvibcurve, spotEdited.Lmaskvibcurve); assignFromKeyfile(keyFile, "Locallab", "LmaskvibCurve_" + index_str, spot.Lmaskvibcurve, spotEdited.Lmaskvibcurve);
assignFromKeyfile(keyFile, "Locallab", "Recothresv_" + index_str, spot.recothresv, spotEdited.recothresv); assignFromKeyfile(keyFile, "Locallab", "Recothresv_" + index_str, spot.recothresv, spotEdited.recothresv);
assignFromKeyfile(keyFile, "Locallab", "Lowthresv_" + index_str, spot.lowthresv, spotEdited.lowthresv); assignFromKeyfile(keyFile, "Locallab", "Lowthresv_" + index_str, spot.lowthresv, spotEdited.lowthresv);
@ -9574,6 +9602,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Sigmalc2_" + index_str, spot.sigmalc2, spotEdited.sigmalc2); assignFromKeyfile(keyFile, "Locallab", "Sigmalc2_" + index_str, spot.sigmalc2, spotEdited.sigmalc2);
assignFromKeyfile(keyFile, "Locallab", "Strwav_" + index_str, spot.strwav, spotEdited.strwav); assignFromKeyfile(keyFile, "Locallab", "Strwav_" + index_str, spot.strwav, spotEdited.strwav);
assignFromKeyfile(keyFile, "Locallab", "Angwav_" + index_str, spot.angwav, spotEdited.angwav); assignFromKeyfile(keyFile, "Locallab", "Angwav_" + index_str, spot.angwav, spotEdited.angwav);
assignFromKeyfile(keyFile, "Locallab", "Featherwav_" + index_str, spot.featherwav, spotEdited.featherwav);
assignFromKeyfile(keyFile, "Locallab", "Strengthw_" + index_str, spot.strengthw, spotEdited.strengthw); assignFromKeyfile(keyFile, "Locallab", "Strengthw_" + index_str, spot.strengthw, spotEdited.strengthw);
assignFromKeyfile(keyFile, "Locallab", "Sigmaed_" + index_str, spot.sigmaed, spotEdited.sigmaed); assignFromKeyfile(keyFile, "Locallab", "Sigmaed_" + index_str, spot.sigmaed, spotEdited.sigmaed);
assignFromKeyfile(keyFile, "Locallab", "Radiusw_" + index_str, spot.radiusw, spotEdited.radiusw); assignFromKeyfile(keyFile, "Locallab", "Radiusw_" + index_str, spot.radiusw, spotEdited.radiusw);
@ -9703,6 +9732,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Surround_" + index_str, spot.surround, spotEdited.surround); assignFromKeyfile(keyFile, "Locallab", "Surround_" + index_str, spot.surround, spotEdited.surround);
assignFromKeyfile(keyFile, "Locallab", "Strlog_" + index_str, spot.strlog, spotEdited.strlog); assignFromKeyfile(keyFile, "Locallab", "Strlog_" + index_str, spot.strlog, spotEdited.strlog);
assignFromKeyfile(keyFile, "Locallab", "Anglog_" + index_str, spot.anglog, spotEdited.anglog); assignFromKeyfile(keyFile, "Locallab", "Anglog_" + index_str, spot.anglog, spotEdited.anglog);
assignFromKeyfile(keyFile, "Locallab", "Featherlog_" + index_str, spot.featherlog, spotEdited.featherlog);
assignFromKeyfile(keyFile, "Locallab", "CCmaskCurveL_" + index_str, spot.CCmaskcurveL, spotEdited.CCmaskcurveL); assignFromKeyfile(keyFile, "Locallab", "CCmaskCurveL_" + index_str, spot.CCmaskcurveL, spotEdited.CCmaskcurveL);
assignFromKeyfile(keyFile, "Locallab", "LLmaskCurveL_" + index_str, spot.LLmaskcurveL, spotEdited.LLmaskcurveL); assignFromKeyfile(keyFile, "Locallab", "LLmaskCurveL_" + index_str, spot.LLmaskcurveL, spotEdited.LLmaskcurveL);
assignFromKeyfile(keyFile, "Locallab", "HHmaskCurveL_" + index_str, spot.HHmaskcurveL, spotEdited.HHmaskcurveL); assignFromKeyfile(keyFile, "Locallab", "HHmaskCurveL_" + index_str, spot.HHmaskcurveL, spotEdited.HHmaskcurveL);
@ -9740,6 +9770,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Shadmask_" + index_str, spot.shadmask, spotEdited.shadmask); assignFromKeyfile(keyFile, "Locallab", "Shadmask_" + index_str, spot.shadmask, spotEdited.shadmask);
assignFromKeyfile(keyFile, "Locallab", "Str_mask_" + index_str, spot.str_mask, spotEdited.str_mask); assignFromKeyfile(keyFile, "Locallab", "Str_mask_" + index_str, spot.str_mask, spotEdited.str_mask);
assignFromKeyfile(keyFile, "Locallab", "Ang_mask_" + index_str, spot.ang_mask, spotEdited.ang_mask); assignFromKeyfile(keyFile, "Locallab", "Ang_mask_" + index_str, spot.ang_mask, spotEdited.ang_mask);
assignFromKeyfile(keyFile, "Locallab", "Feather_mask_" + index_str, spot.feather_mask, spotEdited.feather_mask);
assignFromKeyfile(keyFile, "Locallab", "HHhmask_Curve_" + index_str, spot.HHhmask_curve, spotEdited.HHhmask_curve); assignFromKeyfile(keyFile, "Locallab", "HHhmask_Curve_" + index_str, spot.HHhmask_curve, spotEdited.HHhmask_curve);
assignFromKeyfile(keyFile, "Locallab", "Lmask_Curve_" + index_str, spot.Lmask_curve, spotEdited.Lmask_curve); assignFromKeyfile(keyFile, "Locallab", "Lmask_Curve_" + index_str, spot.Lmask_curve, spotEdited.Lmask_curve);
assignFromKeyfile(keyFile, "Locallab", "LLmask_Curvewav_" + index_str, spot.LLmask_curvewav, spotEdited.LLmask_curvewav); assignFromKeyfile(keyFile, "Locallab", "LLmask_Curvewav_" + index_str, spot.LLmask_curvewav, spotEdited.LLmask_curvewav);
@ -9902,7 +9933,8 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Surroundcie_" + index_str, spot.surroundcie, spotEdited.surroundcie); assignFromKeyfile(keyFile, "Locallab", "Surroundcie_" + index_str, spot.surroundcie, spotEdited.surroundcie);
assignFromKeyfile(keyFile, "Locallab", "Strgradcie_" + index_str, spot.strgradcie, spotEdited.strgradcie); assignFromKeyfile(keyFile, "Locallab", "Strgradcie_" + index_str, spot.strgradcie, spotEdited.strgradcie);
assignFromKeyfile(keyFile, "Locallab", "Anggradcie_" + index_str, spot.anggradcie, spotEdited.anggradcie); assignFromKeyfile(keyFile, "Locallab", "Anggradcie_" + index_str, spot.anggradcie, spotEdited.anggradcie);
assignFromKeyfile(keyFile, "Locallab", "Feathercie_" + index_str, spot.feathercie, spotEdited.feathercie);
assignFromKeyfile(keyFile, "Locallab", "EnacieMask_" + index_str, spot.enacieMask, spotEdited.enacieMask); assignFromKeyfile(keyFile, "Locallab", "EnacieMask_" + index_str, spot.enacieMask, spotEdited.enacieMask);
assignFromKeyfile(keyFile, "Locallab", "EnacieMaskall_" + index_str, spot.enacieMaskall, spotEdited.enacieMaskall); assignFromKeyfile(keyFile, "Locallab", "EnacieMaskall_" + index_str, spot.enacieMaskall, spotEdited.enacieMaskall);
assignFromKeyfile(keyFile, "Locallab", "CCmaskcieCurve_" + index_str, spot.CCmaskciecurve, spotEdited.CCmaskciecurve); assignFromKeyfile(keyFile, "Locallab", "CCmaskcieCurve_" + index_str, spot.CCmaskciecurve, spotEdited.CCmaskciecurve);

8
rtengine/procparams.h
View File

@ -1122,6 +1122,7 @@ struct LocallabParams {
double strcolab; double strcolab;
double strcolh; double strcolh;
double angcol; double angcol;
double feathercol;
int blurcolde; int blurcolde;
double blurcol; double blurcol;
double contcol; double contcol;
@ -1184,6 +1185,7 @@ struct LocallabParams {
double gamex; double gamex;
double strexp; double strexp;
double angexp; double angexp;
double featherexp;
std::vector<double> excurve; std::vector<double> excurve;
bool norm; bool norm;
bool inversex; bool inversex;
@ -1239,6 +1241,7 @@ struct LocallabParams {
int blurSHde; int blurSHde;
double strSH; double strSH;
double angSH; double angSH;
double featherSH;
bool inverssh; bool inverssh;
double chromaskSH; double chromaskSH;
double gammaskSH; double gammaskSH;
@ -1284,6 +1287,7 @@ struct LocallabParams {
double strvibab; double strvibab;
double strvibh; double strvibh;
double angvib; double angvib;
double feathervib;
std::vector<double> Lmaskvibcurve; std::vector<double> Lmaskvibcurve;
double recothresv; double recothresv;
double lowthresv; double lowthresv;
@ -1500,6 +1504,7 @@ struct LocallabParams {
double sigmalc2; double sigmalc2;
double strwav; double strwav;
double angwav; double angwav;
double featherwav;
double strengthw; double strengthw;
double sigmaed; double sigmaed;
double radiusw; double radiusw;
@ -1606,6 +1611,7 @@ struct LocallabParams {
double baselog; double baselog;
double strlog; double strlog;
double anglog; double anglog;
double featherlog;
std::vector<double> CCmaskcurveL; std::vector<double> CCmaskcurveL;
std::vector<double> LLmaskcurveL; std::vector<double> LLmaskcurveL;
std::vector<double> HHmaskcurveL; std::vector<double> HHmaskcurveL;
@ -1644,6 +1650,7 @@ struct LocallabParams {
double shadmask; double shadmask;
int str_mask; int str_mask;
int ang_mask; int ang_mask;
int feather_mask;
std::vector<double> HHhmask_curve; std::vector<double> HHhmask_curve;
std::vector<double> Lmask_curve; std::vector<double> Lmask_curve;
std::vector<double> LLmask_curvewav; std::vector<double> LLmask_curvewav;
@ -1780,6 +1787,7 @@ struct LocallabParams {
Glib::ustring surroundcie; Glib::ustring surroundcie;
double strgradcie; double strgradcie;
double anggradcie; double anggradcie;
double feathercie;
bool enacieMask; bool enacieMask;
bool enacieMaskall; bool enacieMaskall;
std::vector<double> CCmaskciecurve; std::vector<double> CCmaskciecurve;

5
rtgui/controlspotpanel.cc
View File

@ -70,7 +70,7 @@ ControlSpotPanel::ControlSpotPanel():
transit_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITVALUE"), 2., 100., 0.1, 60.))), transit_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITVALUE"), 2., 100., 0.1, 60.))),
transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 25.0, 0.1, 1.0))), transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 25.0, 0.1, 1.0))),
transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))), transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))),
feather_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))), feather_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE_MASK"), 10., 100., 0.1, 25.))),
struc_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRES"), 1.0, 12.0, 0.1, 4.0))), struc_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRES"), 1.0, 12.0, 0.1, 4.0))),
thresh_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESDELTAE"), 0.0, 15.0, 0.1, 2.0))), thresh_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESDELTAE"), 0.0, 15.0, 0.1, 2.0))),
iter_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_PROXI"), 0.2, 10.0, 0.1, 2.0))), iter_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_PROXI"), 0.2, 10.0, 0.1, 2.0))),
@ -351,7 +351,7 @@ ControlSpotPanel::ControlSpotPanel():
transitBox->pack_start(*transit_); transitBox->pack_start(*transit_);
transitBox->pack_start(*transitweak_); transitBox->pack_start(*transitweak_);
transitBox->pack_start(*transitgrad_); transitBox->pack_start(*transitgrad_);
transitBox->pack_start(*feather_); //transitBox->pack_start(*feather_);
expTransGrad_->add(*transitBox, false); expTransGrad_->add(*transitBox, false);
pack_start(*expTransGrad_, false, false); pack_start(*expTransGrad_, false, false);
@ -504,6 +504,7 @@ ControlSpotPanel::ControlSpotPanel():
maskBox->pack_start(*deltae_); maskBox->pack_start(*deltae_);
maskBox->pack_start(*scopemask_); maskBox->pack_start(*scopemask_);
maskBox->pack_start(*denoichmask_); maskBox->pack_start(*denoichmask_);
maskBox->pack_start(*feather_);
// maskBox->pack_start(*shortc_); // maskBox->pack_start(*shortc_);
maskBox->pack_start(*lumask_); maskBox->pack_start(*lumask_);
// maskBox->pack_start(*savrest_); // maskBox->pack_start(*savrest_);

63
rtgui/locallabtools.cc
View File

@ -476,6 +476,7 @@ LocallabColor::LocallabColor():
strcolab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRCHRO"), -6., 6., 0.05, 0.))), strcolab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRCHRO"), -6., 6., 0.05, 0.))),
strcolh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRHUE"), -6., 6., 0.05, 0.))), strcolh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRHUE"), -6., 6., 0.05, 0.))),
angcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), angcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
feathercol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
expcurvcol(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPCURV")))), expcurvcol(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPCURV")))),
labqualcurv(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_QUALCURV_METHOD") + ":"))), labqualcurv(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_QUALCURV_METHOD") + ":"))),
qualitycurveMethod(Gtk::manage(new MyComboBoxText())), qualitycurveMethod(Gtk::manage(new MyComboBoxText())),
@ -541,8 +542,9 @@ LocallabColor::LocallabColor():
csThresholdcol(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false))) csThresholdcol(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false)))
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
//rtengine::ProcEvent EvlocallabenacieMaskall;
Evlocallabfeathercol = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERCOL");
Evlocallabpreviewcol = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWCOL"); Evlocallabpreviewcol = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWCOL");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
float R, G, B; float R, G, B;
@ -609,6 +611,7 @@ LocallabColor::LocallabColor():
strcolh->set_tooltip_text(M("TP_LOCALLAB_GRADSTRHUE_TOOLTIP")); strcolh->set_tooltip_text(M("TP_LOCALLAB_GRADSTRHUE_TOOLTIP"));
angcol->setAdjusterListener(this); angcol->setAdjusterListener(this);
feathercol->setAdjusterListener(this);
setExpandAlignProperties(expcurvcol, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); setExpandAlignProperties(expcurvcol, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
@ -879,6 +882,7 @@ LocallabColor::LocallabColor():
gradcolBox->pack_start(*strcolab); gradcolBox->pack_start(*strcolab);
gradcolBox->pack_start(*strcolh); gradcolBox->pack_start(*strcolh);
gradcolBox->pack_start(*angcol); gradcolBox->pack_start(*angcol);
gradcolBox->pack_start(*feathercol);
expgradcol->add(*gradcolBox, false); expgradcol->add(*gradcolBox, false);
pack_start(*expgradcol, false, false); pack_start(*expgradcol, false, false);
ToolParamBlock* const curvBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const curvBox = Gtk::manage(new ToolParamBlock());
@ -1291,6 +1295,7 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param
strcolab->setValue(spot.strcolab); strcolab->setValue(spot.strcolab);
strcolh->setValue(spot.strcolh); strcolh->setValue(spot.strcolh);
angcol->setValue(spot.angcol); angcol->setValue(spot.angcol);
feathercol->setValue(spot.feathercol);
if (spot.qualitycurveMethod == "none") { if (spot.qualitycurveMethod == "none") {
qualitycurveMethod->set_active(0); qualitycurveMethod->set_active(0);
@ -1472,6 +1477,7 @@ void LocallabColor::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pe
spot.strcolab = strcolab->getValue(); spot.strcolab = strcolab->getValue();
spot.strcolh = strcolh->getValue(); spot.strcolh = strcolh->getValue();
spot.angcol = angcol->getValue(); spot.angcol = angcol->getValue();
spot.feathercol = feathercol->getValue();
spot.recothresc = recothresc->getValue(); spot.recothresc = recothresc->getValue();
spot.lowthresc = lowthresc->getValue(); spot.lowthresc = lowthresc->getValue();
@ -1626,6 +1632,7 @@ void LocallabColor::setDefaults(const rtengine::procparams::ProcParams* defParam
strcolab->setDefault(defSpot.strcolab); strcolab->setDefault(defSpot.strcolab);
strcolh->setDefault(defSpot.strcolh); strcolh->setDefault(defSpot.strcolh);
angcol->setDefault(defSpot.angcol); angcol->setDefault(defSpot.angcol);
feathercol->setDefault(defSpot.feathercol);
mercol->setDefault(defSpot.mercol); mercol->setDefault(defSpot.mercol);
opacol->setDefault(defSpot.opacol); opacol->setDefault(defSpot.opacol);
conthrcol->setDefault(defSpot.conthrcol); conthrcol->setDefault(defSpot.conthrcol);
@ -1786,6 +1793,13 @@ void LocallabColor::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == feathercol) {
if (listener) {
listener->panelChanged(Evlocallabfeathercol,
feathercol->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == mercol) { if (a == mercol) {
if (listener) { if (listener) {
listener->panelChanged(Evlocallabmercol, listener->panelChanged(Evlocallabmercol,
@ -2147,6 +2161,7 @@ void LocallabColor::convertParamToSimple()
softradiuscol->setValue(defSpot.softradiuscol); softradiuscol->setValue(defSpot.softradiuscol);
strcol->setValue(defSpot.strcol); strcol->setValue(defSpot.strcol);
angcol->setValue(defSpot.angcol); angcol->setValue(defSpot.angcol);
feathercol->setValue(defSpot.feathercol);
gamc->setValue(defSpot.gamc); gamc->setValue(defSpot.gamc);
if (defSpot.qualitycurveMethod == "none") { if (defSpot.qualitycurveMethod == "none") {
@ -2706,6 +2721,7 @@ LocallabExposure::LocallabExposure():
expgradexp(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))), expgradexp(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))),
strexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))), strexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))),
angexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), angexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
featherexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
softradiusexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.5, 0.))), softradiusexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.5, 0.))),
inversex(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))), inversex(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))),
expmaskexp(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWE")))), expmaskexp(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWE")))),
@ -2737,6 +2753,7 @@ LocallabExposure::LocallabExposure():
const LocallabParams::LocallabSpot defSpot; const LocallabParams::LocallabSpot defSpot;
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
Evlocallabpreviewexe = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWEXE"); Evlocallabpreviewexe = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWEXE");
Evlocallabfeatherexp = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHEREXE");
// Parameter Exposure specific widgets // Parameter Exposure specific widgets
expMethod->append(M("TP_LOCALLAB_STD")); expMethod->append(M("TP_LOCALLAB_STD"));
@ -2811,6 +2828,7 @@ LocallabExposure::LocallabExposure():
angexp->setAdjusterListener(this); angexp->setAdjusterListener(this);
angexp->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP")); angexp->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP"));
featherexp->setAdjusterListener(this);
softradiusexp->setLogScale(10, 0); softradiusexp->setLogScale(10, 0);
softradiusexp->setAdjusterListener(this); softradiusexp->setAdjusterListener(this);
@ -2954,6 +2972,7 @@ LocallabExposure::LocallabExposure():
ToolParamBlock* const gradBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const gradBox = Gtk::manage(new ToolParamBlock());
gradBox->pack_start(*strexp); gradBox->pack_start(*strexp);
gradBox->pack_start(*angexp); gradBox->pack_start(*angexp);
gradBox->pack_start(*featherexp);
expgradexp->add(*gradBox, false); expgradexp->add(*gradBox, false);
pack_start(*expgradexp); pack_start(*expgradexp);
pack_start(*softradiusexp); pack_start(*softradiusexp);
@ -3272,6 +3291,7 @@ void LocallabExposure::read(const rtengine::procparams::ProcParams* pp, const Pa
shapeexpos->setCurve(spot.excurve); shapeexpos->setCurve(spot.excurve);
strexp->setValue(spot.strexp); strexp->setValue(spot.strexp);
angexp->setValue(spot.angexp); angexp->setValue(spot.angexp);
featherexp->setValue(spot.featherexp);
softradiusexp->setValue(spot.softradiusexp); softradiusexp->setValue(spot.softradiusexp);
norm->set_active(spot.norm); norm->set_active(spot.norm);
fatsatur->set_active(spot.fatsatur); fatsatur->set_active(spot.fatsatur);
@ -3363,6 +3383,7 @@ void LocallabExposure::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
spot.excurve = shapeexpos->getCurve(); spot.excurve = shapeexpos->getCurve();
spot.strexp = strexp->getValue(); spot.strexp = strexp->getValue();
spot.angexp = angexp->getValue(); spot.angexp = angexp->getValue();
spot.featherexp = featherexp->getValue();
spot.softradiusexp = softradiusexp->getValue(); spot.softradiusexp = softradiusexp->getValue();
spot.inversex = inversex->get_active(); spot.inversex = inversex->get_active();
spot.norm = norm->get_active(); spot.norm = norm->get_active();
@ -3416,6 +3437,7 @@ void LocallabExposure::setDefaults(const rtengine::procparams::ProcParams* defPa
expchroma->setDefault((double)defSpot.expchroma); expchroma->setDefault((double)defSpot.expchroma);
strexp->setDefault(defSpot.strexp); strexp->setDefault(defSpot.strexp);
angexp->setDefault(defSpot.angexp); angexp->setDefault(defSpot.angexp);
featherexp->setDefault(defSpot.featherexp);
softradiusexp->setDefault(defSpot.softradiusexp); softradiusexp->setDefault(defSpot.softradiusexp);
blendmaskexp->setDefault((double)defSpot.blendmaskexp); blendmaskexp->setDefault((double)defSpot.blendmaskexp);
radmaskexp->setDefault(defSpot.radmaskexp); radmaskexp->setDefault(defSpot.radmaskexp);
@ -3640,6 +3662,13 @@ void LocallabExposure::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == featherexp) {
if (listener) {
listener->panelChanged(Evlocallabfeatherexp,
featherexp->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == softradiusexp) { if (a == softradiusexp) {
if (listener) { if (listener) {
listener->panelChanged(Evlocallabsoftradiusexp, listener->panelChanged(Evlocallabsoftradiusexp,
@ -3796,6 +3825,7 @@ void LocallabExposure::convertParamToSimple()
// Set hidden specific GUI widgets in Simple mode to default spot values // Set hidden specific GUI widgets in Simple mode to default spot values
strexp->setValue(defSpot.strexp); strexp->setValue(defSpot.strexp);
angexp->setValue(defSpot.angexp); angexp->setValue(defSpot.angexp);
featherexp->setValue(defSpot.featherexp);
softradiusexp->setValue(defSpot.softradiusexp); softradiusexp->setValue(defSpot.softradiusexp);
enaExpMask->set_active(defSpot.enaExpMask); enaExpMask->set_active(defSpot.enaExpMask);
enaExpMaskaft->set_active(defSpot.enaExpMaskaft); enaExpMaskaft->set_active(defSpot.enaExpMaskaft);
@ -4240,6 +4270,7 @@ LocallabShadow::LocallabShadow():
expgradsh(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))), expgradsh(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))),
strSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))), strSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))),
angSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), angSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
featherSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
inverssh(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))), inverssh(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))),
expmasksh(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWS")))), expmasksh(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWS")))),
showmaskSHMethod(Gtk::manage(new MyComboBoxText())), showmaskSHMethod(Gtk::manage(new MyComboBoxText())),
@ -4265,6 +4296,7 @@ LocallabShadow::LocallabShadow():
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
Evlocallabpreviewsh = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWSH"); Evlocallabpreviewsh = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWSH");
EvlocallabfeatherSH = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERSH");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
@ -4316,6 +4348,7 @@ LocallabShadow::LocallabShadow():
angSH->setAdjusterListener(this); angSH->setAdjusterListener(this);
angSH->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP")); angSH->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP"));
featherSH->setAdjusterListener(this);
inversshConn = inverssh->signal_toggled().connect(sigc::mem_fun(*this, &LocallabShadow::inversshChanged)); inversshConn = inverssh->signal_toggled().connect(sigc::mem_fun(*this, &LocallabShadow::inversshChanged));
inverssh->set_tooltip_text(M("TP_LOCALLAB_INVERS_TOOLTIP")); inverssh->set_tooltip_text(M("TP_LOCALLAB_INVERS_TOOLTIP"));
@ -4427,6 +4460,7 @@ LocallabShadow::LocallabShadow():
ToolParamBlock* const gradSHBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const gradSHBox = Gtk::manage(new ToolParamBlock());
gradSHBox->pack_start(*strSH); gradSHBox->pack_start(*strSH);
gradSHBox->pack_start(*angSH); gradSHBox->pack_start(*angSH);
gradSHBox->pack_start(*featherSH);
expgradsh->add(*gradSHBox, false); expgradsh->add(*gradSHBox, false);
pack_start(*expgradsh); pack_start(*expgradsh);
// pack_start(*inverssh); // pack_start(*inverssh);
@ -4718,6 +4752,7 @@ void LocallabShadow::read(const rtengine::procparams::ProcParams* pp, const Para
sloSH->setValue(spot.sloSH); sloSH->setValue(spot.sloSH);
strSH->setValue(spot.strSH); strSH->setValue(spot.strSH);
angSH->setValue(spot.angSH); angSH->setValue(spot.angSH);
featherSH->setValue(spot.featherSH);
inverssh->set_active(spot.inverssh); inverssh->set_active(spot.inverssh);
enaSHMask->set_active(spot.enaSHMask); enaSHMask->set_active(spot.enaSHMask);
CCmaskSHshape->setCurve(spot.CCmaskSHcurve); CCmaskSHshape->setCurve(spot.CCmaskSHcurve);
@ -4784,6 +4819,7 @@ void LocallabShadow::write(rtengine::procparams::ProcParams* pp, ParamsEdited* p
spot.sloSH = sloSH->getValue(); spot.sloSH = sloSH->getValue();
spot.strSH = strSH->getValue(); spot.strSH = strSH->getValue();
spot.angSH = angSH->getValue(); spot.angSH = angSH->getValue();
spot.featherSH = featherSH->getValue();
spot.inverssh = inverssh->get_active(); spot.inverssh = inverssh->get_active();
spot.enaSHMask = enaSHMask->get_active(); spot.enaSHMask = enaSHMask->get_active();
spot.LLmaskSHcurve = LLmaskSHshape->getCurve(); spot.LLmaskSHcurve = LLmaskSHshape->getCurve();
@ -4833,6 +4869,7 @@ void LocallabShadow::setDefaults(const rtengine::procparams::ProcParams* defPara
sloSH->setDefault(defSpot.sloSH); sloSH->setDefault(defSpot.sloSH);
strSH->setDefault(defSpot.strSH); strSH->setDefault(defSpot.strSH);
angSH->setDefault(defSpot.angSH); angSH->setDefault(defSpot.angSH);
featherSH->setDefault(defSpot.featherSH);
blendmaskSH->setDefault((double)defSpot.blendmaskSH); blendmaskSH->setDefault((double)defSpot.blendmaskSH);
radmaskSH->setDefault(defSpot.radmaskSH); radmaskSH->setDefault(defSpot.radmaskSH);
lapmaskSH->setDefault(defSpot.lapmaskSH); lapmaskSH->setDefault(defSpot.lapmaskSH);
@ -4994,6 +5031,13 @@ void LocallabShadow::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == featherSH) {
if (listener) {
listener->panelChanged(EvlocallabfeatherSH,
featherSH->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == blendmaskSH) { if (a == blendmaskSH) {
if (listener) { if (listener) {
listener->panelChanged(EvlocallabblendmaskSH, listener->panelChanged(EvlocallabblendmaskSH,
@ -5133,6 +5177,7 @@ void LocallabShadow::convertParamToSimple()
sloSH->setValue(defSpot.sloSH); sloSH->setValue(defSpot.sloSH);
strSH->setValue(defSpot.strSH); strSH->setValue(defSpot.strSH);
angSH->setValue(defSpot.angSH); angSH->setValue(defSpot.angSH);
featherSH->setValue(defSpot.featherSH);
showmaskSHMethod->set_active(0); showmaskSHMethod->set_active(0);
showmaskSHMethodinv->set_active(0); showmaskSHMethodinv->set_active(0);
enaSHMask->set_active(defSpot.enaSHMask); enaSHMask->set_active(defSpot.enaSHMask);
@ -5450,6 +5495,7 @@ LocallabVibrance::LocallabVibrance():
strvibab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRCHRO"), -4., 4., 0.05, 0.))), strvibab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRCHRO"), -4., 4., 0.05, 0.))),
strvibh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRHUE2"), -6., 6., 0.05, 0.))), strvibh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTRHUE2"), -6., 6., 0.05, 0.))),
angvib(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), angvib(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
feathervib(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
expmaskvib(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWVI")))), expmaskvib(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWVI")))),
showmaskvibMethod(Gtk::manage(new MyComboBoxText())), showmaskvibMethod(Gtk::manage(new MyComboBoxText())),
enavibMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), enavibMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))),
@ -5469,7 +5515,7 @@ LocallabVibrance::LocallabVibrance():
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
Evlocallabpreviewvib = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWVIB"); Evlocallabpreviewvib = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWVIB");
Evlocallabfeathervib = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERVIB");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
float R, G, B; float R, G, B;
@ -5533,6 +5579,7 @@ LocallabVibrance::LocallabVibrance():
angvib->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP")); angvib->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP"));
angvib->setAdjusterListener(this); angvib->setAdjusterListener(this);
feathervib->setAdjusterListener(this);
previewvib->set_active(false); previewvib->set_active(false);
previewvibConn = previewvib->signal_clicked().connect( previewvibConn = previewvib->signal_clicked().connect(
@ -5620,6 +5667,7 @@ LocallabVibrance::LocallabVibrance():
gradvibBox->pack_start(*strvibab); gradvibBox->pack_start(*strvibab);
gradvibBox->pack_start(*strvibh); gradvibBox->pack_start(*strvibh);
gradvibBox->pack_start(*angvib); gradvibBox->pack_start(*angvib);
gradvibBox->pack_start(*feathervib);
expgradvib->add(*gradvibBox, false); expgradvib->add(*gradvibBox, false);
pack_start(*expgradvib); pack_start(*expgradvib);
ToolParamBlock* const maskvibBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const maskvibBox = Gtk::manage(new ToolParamBlock());
@ -5872,6 +5920,7 @@ void LocallabVibrance::read(const rtengine::procparams::ProcParams* pp, const Pa
strvibab->setValue(spot.strvibab); strvibab->setValue(spot.strvibab);
strvibh->setValue(spot.strvibh); strvibh->setValue(spot.strvibh);
angvib->setValue(spot.angvib); angvib->setValue(spot.angvib);
feathervib->setValue(spot.feathervib);
enavibMask->set_active(spot.enavibMask); enavibMask->set_active(spot.enavibMask);
CCmaskvibshape->setCurve(spot.CCmaskvibcurve); CCmaskvibshape->setCurve(spot.CCmaskvibcurve);
LLmaskvibshape->setCurve(spot.LLmaskvibcurve); LLmaskvibshape->setCurve(spot.LLmaskvibcurve);
@ -5926,6 +5975,7 @@ void LocallabVibrance::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
spot.strvibab = strvibab->getValue(); spot.strvibab = strvibab->getValue();
spot.strvibh = strvibh->getValue(); spot.strvibh = strvibh->getValue();
spot.angvib = angvib->getValue(); spot.angvib = angvib->getValue();
spot.feathervib = feathervib->getValue();
spot.enavibMask = enavibMask->get_active(); spot.enavibMask = enavibMask->get_active();
spot.CCmaskvibcurve = CCmaskvibshape->getCurve(); spot.CCmaskvibcurve = CCmaskvibshape->getCurve();
spot.LLmaskvibcurve = LLmaskvibshape->getCurve(); spot.LLmaskvibcurve = LLmaskvibshape->getCurve();
@ -5964,6 +6014,7 @@ void LocallabVibrance::setDefaults(const rtengine::procparams::ProcParams* defPa
strvibab->setDefault(defSpot.strvibab); strvibab->setDefault(defSpot.strvibab);
strvibh->setDefault(defSpot.strvibh); strvibh->setDefault(defSpot.strvibh);
angvib->setDefault(defSpot.angvib); angvib->setDefault(defSpot.angvib);
feathervib->setDefault(defSpot.feathervib);
blendmaskvib->setDefault((double)defSpot.blendmaskvib); blendmaskvib->setDefault((double)defSpot.blendmaskvib);
radmaskvib->setDefault(defSpot.radmaskvib); radmaskvib->setDefault(defSpot.radmaskvib);
lapmaskvib->setDefault(defSpot.lapmaskvib); lapmaskvib->setDefault(defSpot.lapmaskvib);
@ -6079,6 +6130,13 @@ void LocallabVibrance::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == feathervib) {
if (listener) {
listener->panelChanged(Evlocallabfeathervib,
feathervib->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == blendmaskvib) { if (a == blendmaskvib) {
if (listener) { if (listener) {
listener->panelChanged(Evlocallabblendmaskvi, listener->panelChanged(Evlocallabblendmaskvi,
@ -6277,6 +6335,7 @@ void LocallabVibrance::convertParamToSimple()
// Set hidden specific GUI widgets in Simple mode to default spot values // Set hidden specific GUI widgets in Simple mode to default spot values
strvib->setValue(defSpot.strvib); strvib->setValue(defSpot.strvib);
angvib->setValue(defSpot.angvib); angvib->setValue(defSpot.angvib);
feathervib->setValue(defSpot.feathervib);
showmaskvibMethod->set_active(0); showmaskvibMethod->set_active(0);
enavibMask->set_active(defSpot.enavibMask); enavibMask->set_active(defSpot.enavibMask);
// CCmaskvibshape->setCurve(defSpot.CCmaskvibcurve); // CCmaskvibshape->setCurve(defSpot.CCmaskvibcurve);

16
rtgui/locallabtools.h
View File

@ -123,6 +123,14 @@ protected:
rtengine::ProcEvent Evlocallabstrgradcie; rtengine::ProcEvent Evlocallabstrgradcie;
rtengine::ProcEvent Evlocallabdetailciejz; rtengine::ProcEvent Evlocallabdetailciejz;
rtengine::ProcEvent EvlocallabenacieMaskall; rtengine::ProcEvent EvlocallabenacieMaskall;
rtengine::ProcEvent Evlocallabfeathercol;
rtengine::ProcEvent Evlocallabfeathervib;
rtengine::ProcEvent Evlocallabfeatherexp;
rtengine::ProcEvent Evlocallabfeatherwav;
rtengine::ProcEvent Evlocallabfeatherlog;
rtengine::ProcEvent Evlocallabfeathercie;
rtengine::ProcEvent EvlocallabfeatherSH;
rtengine::ProcEvent Evlocallabfeather_mask;
// LocallabTool parameters // LocallabTool parameters
bool needMode; bool needMode;
bool isLocActivated; bool isLocActivated;
@ -278,6 +286,7 @@ private:
Adjuster* const strcolab; Adjuster* const strcolab;
Adjuster* const strcolh; Adjuster* const strcolh;
Adjuster* const angcol; Adjuster* const angcol;
Adjuster* const feathercol;
MyExpander* const expcurvcol; MyExpander* const expcurvcol;
Gtk::Label* const labqualcurv; Gtk::Label* const labqualcurv;
MyComboBoxText* const qualitycurveMethod; MyComboBoxText* const qualitycurveMethod;
@ -451,6 +460,7 @@ private:
MyExpander* const expgradexp; MyExpander* const expgradexp;
Adjuster* const strexp; Adjuster* const strexp;
Adjuster* const angexp; Adjuster* const angexp;
Adjuster* const featherexp;
Adjuster* const softradiusexp; Adjuster* const softradiusexp;
Gtk::CheckButton* const inversex; Gtk::CheckButton* const inversex;
MyExpander* const expmaskexp; MyExpander* const expmaskexp;
@ -559,6 +569,7 @@ private:
MyExpander* const expgradsh; MyExpander* const expgradsh;
Adjuster* const strSH; Adjuster* const strSH;
Adjuster* const angSH; Adjuster* const angSH;
Adjuster* const featherSH;
Gtk::CheckButton* const inverssh; Gtk::CheckButton* const inverssh;
MyExpander* const expmasksh; MyExpander* const expmasksh;
MyComboBoxText* const showmaskSHMethod; MyComboBoxText* const showmaskSHMethod;
@ -661,6 +672,7 @@ private:
Adjuster* const strvibab; Adjuster* const strvibab;
Adjuster* const strvibh; Adjuster* const strvibh;
Adjuster* const angvib; Adjuster* const angvib;
Adjuster* const feathervib;
MyExpander* const expmaskvib; MyExpander* const expmaskvib;
MyComboBoxText* const showmaskvibMethod; MyComboBoxText* const showmaskvibMethod;
Gtk::CheckButton* const enavibMask; Gtk::CheckButton* const enavibMask;
@ -1240,6 +1252,7 @@ private:
Adjuster* const sigmalc2; Adjuster* const sigmalc2;
Adjuster* const strwav; Adjuster* const strwav;
Adjuster* const angwav; Adjuster* const angwav;
Adjuster* const featherwav;
Gtk::CheckButton* const wavedg; Gtk::CheckButton* const wavedg;
Adjuster* const strengthw; Adjuster* const strengthw;
Adjuster* const sigmaed; Adjuster* const sigmaed;
@ -1506,6 +1519,7 @@ private:
Gtk::Frame* const gradlogFrame; Gtk::Frame* const gradlogFrame;
Adjuster* const strlog; Adjuster* const strlog;
Adjuster* const anglog; Adjuster* const anglog;
Adjuster* const featherlog;
MyExpander* const expmaskL; MyExpander* const expmaskL;
MyComboBoxText* const showmaskLMethod; MyComboBoxText* const showmaskLMethod;
Gtk::CheckButton* const enaLMask; Gtk::CheckButton* const enaLMask;
@ -1613,6 +1627,7 @@ private:
ThresholdAdjuster* const csThresholdmask; ThresholdAdjuster* const csThresholdmask;
Gtk::Frame* const gradFramemask; Gtk::Frame* const gradFramemask;
Adjuster* const str_mask; Adjuster* const str_mask;
Adjuster* const feather_mask;
Adjuster* const ang_mask; Adjuster* const ang_mask;
sigc::connection showmask_MethodConn, previewmasConn, enamaskConn, toolmaskConn, fftmaskConn; sigc::connection showmask_MethodConn, previewmasConn, enamaskConn, toolmaskConn, fftmaskConn;
@ -1866,6 +1881,7 @@ private:
MyExpander* const expgradcie; MyExpander* const expgradcie;
Adjuster* const strgradcie; Adjuster* const strgradcie;
Adjuster* const anggradcie; Adjuster* const anggradcie;
Adjuster* const feathercie;
MyExpander* const exprecovcie; MyExpander* const exprecovcie;
Gtk::Label* const maskusablecie; Gtk::Label* const maskusablecie;

60
rtgui/locallabtools2.cc
View File

@ -2534,6 +2534,7 @@ LocallabContrast::LocallabContrast():
sigmalc2(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))), sigmalc2(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))),
strwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4.0, 4.0, 0.05, 0.))), strwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4.0, 4.0, 0.05, 0.))),
angwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), angwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
featherwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
wavedg(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_EDGFRA")))), wavedg(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_EDGFRA")))),
strengthw(Gtk::manage(new Adjuster(M("TP_WAVELET_EDVAL"), 0., 100.0, 0.5, 0.))), strengthw(Gtk::manage(new Adjuster(M("TP_WAVELET_EDVAL"), 0., 100.0, 0.5, 0.))),
sigmaed(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))), sigmaed(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))),
@ -2602,6 +2603,7 @@ LocallabContrast::LocallabContrast():
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
Evlocallabpreviewlc = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWLC"); Evlocallabpreviewlc = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWLC");
Evlocallabfeatherwav = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERWAV");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
@ -2708,6 +2710,7 @@ LocallabContrast::LocallabContrast():
strwav->setAdjusterListener(this); strwav->setAdjusterListener(this);
angwav->setAdjusterListener(this); angwav->setAdjusterListener(this);
featherwav->setAdjusterListener(this);
wavedgConn = wavedg->signal_toggled().connect(sigc::mem_fun(*this, &LocallabContrast::wavedgChanged)); wavedgConn = wavedg->signal_toggled().connect(sigc::mem_fun(*this, &LocallabContrast::wavedgChanged));
@ -2949,6 +2952,7 @@ LocallabContrast::LocallabContrast():
gradwavBox->pack_start(*sigmalc2); gradwavBox->pack_start(*sigmalc2);
gradwavBox->pack_start(*strwav); gradwavBox->pack_start(*strwav);
gradwavBox->pack_start(*angwav); gradwavBox->pack_start(*angwav);
gradwavBox->pack_start(*featherwav);
gradwavFrame->add(*gradwavBox); gradwavFrame->add(*gradwavBox);
blurcontBox->pack_start(*gradwavFrame); blurcontBox->pack_start(*gradwavFrame);
Gtk::Frame* const edgFrame = Gtk::manage(new Gtk::Frame()); Gtk::Frame* const edgFrame = Gtk::manage(new Gtk::Frame());
@ -3400,6 +3404,7 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa
sigmalc2->setValue(spot.sigmalc2); sigmalc2->setValue(spot.sigmalc2);
strwav->setValue(spot.strwav); strwav->setValue(spot.strwav);
angwav->setValue(spot.angwav); angwav->setValue(spot.angwav);
featherwav->setValue(spot.featherwav);
wavedg->set_active(spot.wavedg); wavedg->set_active(spot.wavedg);
strengthw->setValue(spot.strengthw); strengthw->setValue(spot.strengthw);
sigmaed->setValue(spot.sigmaed); sigmaed->setValue(spot.sigmaed);
@ -3525,6 +3530,7 @@ void LocallabContrast::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
spot.sigmalc2 = sigmalc2->getValue(); spot.sigmalc2 = sigmalc2->getValue();
spot.strwav = strwav->getValue(); spot.strwav = strwav->getValue();
spot.angwav = angwav->getValue(); spot.angwav = angwav->getValue();
spot.featherwav = featherwav->getValue();
spot.wavedg = wavedg->get_active(); spot.wavedg = wavedg->get_active();
spot.strengthw = strengthw->getValue(); spot.strengthw = strengthw->getValue();
spot.sigmaed = sigmaed->getValue(); spot.sigmaed = sigmaed->getValue();
@ -3627,6 +3633,7 @@ void LocallabContrast::setDefaults(const rtengine::procparams::ProcParams* defPa
sigmalc2->setDefault(defSpot.sigmalc2); sigmalc2->setDefault(defSpot.sigmalc2);
strwav->setDefault(defSpot.strwav); strwav->setDefault(defSpot.strwav);
angwav->setDefault(defSpot.angwav); angwav->setDefault(defSpot.angwav);
featherwav->setDefault(defSpot.featherwav);
strengthw->setDefault(defSpot.strengthw); strengthw->setDefault(defSpot.strengthw);
sigmaed->setDefault(defSpot.sigmaed); sigmaed->setDefault(defSpot.sigmaed);
gradw->setDefault(defSpot.gradw); gradw->setDefault(defSpot.gradw);
@ -3825,6 +3832,13 @@ void LocallabContrast::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == featherwav) {
if (listener) {
listener->panelChanged(Evlocallabfeatherwav,
featherwav->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == strengthw) { if (a == strengthw) {
if (listener) { if (listener) {
listener->panelChanged(Evlocallabstrengthw, listener->panelChanged(Evlocallabstrengthw,
@ -4146,6 +4160,7 @@ void LocallabContrast::convertParamToNormal()
sigmalc2->setValue(defSpot.sigmalc2); sigmalc2->setValue(defSpot.sigmalc2);
strwav->setValue(defSpot.strwav); strwav->setValue(defSpot.strwav);
angwav->setValue(defSpot.angwav); angwav->setValue(defSpot.angwav);
featherwav->setValue(defSpot.featherwav);
wavedg->set_active(defSpot.wavedg); wavedg->set_active(defSpot.wavedg);
strengthw->setValue(defSpot.strengthw); strengthw->setValue(defSpot.strengthw);
sigmaed->setValue(defSpot.sigmaed); sigmaed->setValue(defSpot.sigmaed);
@ -5516,6 +5531,7 @@ LocallabLog::LocallabLog():
gradlogFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GRADLOGFRA")))), gradlogFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GRADLOGFRA")))),
strlog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2.0, 2.0, 0.05, 0.))), strlog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2.0, 2.0, 0.05, 0.))),
anglog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), anglog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
featherlog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
expmaskL(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWC")))), expmaskL(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWC")))),
showmaskLMethod(Gtk::manage(new MyComboBoxText())), showmaskLMethod(Gtk::manage(new MyComboBoxText())),
enaLMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), enaLMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))),
@ -5539,6 +5555,7 @@ LocallabLog::LocallabLog():
Evlocallabcomprlog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_COMPR"); Evlocallabcomprlog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_COMPR");
Evlocallabstrelog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_STRE"); Evlocallabstrelog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_STRE");
Evlocallabsatlog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_SAT"); Evlocallabsatlog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_LOG_SAT");
Evlocallabfeatherlog = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERLOG");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
@ -5619,6 +5636,7 @@ LocallabLog::LocallabLog():
strlog->setAdjusterListener(this); strlog->setAdjusterListener(this);
anglog->setAdjusterListener(this); anglog->setAdjusterListener(this);
featherlog->setAdjusterListener(this);
surHBox->set_spacing(2); surHBox->set_spacing(2);
surHBox->set_tooltip_markup(M("TP_LOCALLAB_LOGSURSOUR_TOOLTIP")); surHBox->set_tooltip_markup(M("TP_LOCALLAB_LOGSURSOUR_TOOLTIP"));
@ -5788,6 +5806,7 @@ LocallabLog::LocallabLog():
ToolParamBlock* const gradlogBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const gradlogBox = Gtk::manage(new ToolParamBlock());
gradlogBox->pack_start(*strlog); gradlogBox->pack_start(*strlog);
gradlogBox->pack_start(*anglog); gradlogBox->pack_start(*anglog);
gradlogBox->pack_start(*featherlog);
gradlogFrame->add(*gradlogBox); gradlogFrame->add(*gradlogBox);
pack_start(*gradlogFrame); pack_start(*gradlogFrame);
} }
@ -6101,6 +6120,7 @@ void LocallabLog::read(const rtengine::procparams::ProcParams* pp, const ParamsE
sensilog->setValue((double)spot.sensilog); sensilog->setValue((double)spot.sensilog);
strlog->setValue(spot.strlog); strlog->setValue(spot.strlog);
anglog->setValue(spot.anglog); anglog->setValue(spot.anglog);
featherlog->setValue(spot.featherlog);
CCmaskshapeL->setCurve(spot.CCmaskcurveL); CCmaskshapeL->setCurve(spot.CCmaskcurveL);
LLmaskshapeL->setCurve(spot.LLmaskcurveL); LLmaskshapeL->setCurve(spot.LLmaskcurveL);
HHmaskshapeL->setCurve(spot.HHmaskcurveL); HHmaskshapeL->setCurve(spot.HHmaskcurveL);
@ -6168,6 +6188,7 @@ void LocallabLog::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
spot.sensilog = sensilog->getIntValue(); spot.sensilog = sensilog->getIntValue();
spot.strlog = strlog->getValue(); spot.strlog = strlog->getValue();
spot.anglog = anglog->getValue(); spot.anglog = anglog->getValue();
spot.featherlog = featherlog->getValue();
spot.CCmaskcurveL = CCmaskshapeL->getCurve(); spot.CCmaskcurveL = CCmaskshapeL->getCurve();
spot.LLmaskcurveL = LLmaskshapeL->getCurve(); spot.LLmaskcurveL = LLmaskshapeL->getCurve();
spot.HHmaskcurveL = HHmaskshapeL->getCurve(); spot.HHmaskcurveL = HHmaskshapeL->getCurve();
@ -6354,6 +6375,7 @@ void LocallabLog::convertParamToSimple()
sursour->set_active(0); sursour->set_active(0);
strlog->setValue(defSpot.strlog); strlog->setValue(defSpot.strlog);
anglog->setValue(defSpot.anglog); anglog->setValue(defSpot.anglog);
featherlog->setValue(defSpot.featherlog);
enaLMask->set_active(false); enaLMask->set_active(false);
showmaskLMethod->set_active(0); showmaskLMethod->set_active(0);
recothresl->setValue(defSpot.recothresl); recothresl->setValue(defSpot.recothresl);
@ -6476,6 +6498,7 @@ void LocallabLog::setDefaults(const rtengine::procparams::ProcParams* defParams,
sensilog->setDefault((double)defSpot.sensilog); sensilog->setDefault((double)defSpot.sensilog);
strlog->setDefault(defSpot.strlog); strlog->setDefault(defSpot.strlog);
anglog->setDefault(defSpot.anglog); anglog->setDefault(defSpot.anglog);
featherlog->setDefault(defSpot.featherlog);
blendmaskL->setDefault(defSpot.blendmaskL); blendmaskL->setDefault(defSpot.blendmaskL);
radmaskL->setDefault(defSpot.radmaskL); radmaskL->setDefault(defSpot.radmaskL);
chromaskL->setDefault(defSpot.chromaskL); chromaskL->setDefault(defSpot.chromaskL);
@ -6699,6 +6722,13 @@ void LocallabLog::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == featherlog) {
if (listener) {
listener->panelChanged(Evlocallabfeatherlog,
featherlog->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
if (a == blendmaskL) { if (a == blendmaskL) {
if (listener) { if (listener) {
listener->panelChanged(EvLocallabblendmaskL, listener->panelChanged(EvLocallabblendmaskL,
@ -7011,11 +7041,13 @@ LocallabMask::LocallabMask():
csThresholdmask(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false))), csThresholdmask(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false))),
gradFramemask(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GRADFRA")))), gradFramemask(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GRADFRA")))),
str_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2., 2., 0.05, 0.))), str_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2., 2., 0.05, 0.))),
feather_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
ang_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180., 180., 0.1, 0.))) ang_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180., 180., 0.1, 0.)))
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
Evlocallabpreviewmas = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWMAS"); Evlocallabpreviewmas = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_PREVIEWMAS");
Evlocallabfeather_mask = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERMAS");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
@ -7125,6 +7157,7 @@ LocallabMask::LocallabMask():
ang_mask->setAdjusterListener(this); ang_mask->setAdjusterListener(this);
ang_mask->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP")); ang_mask->set_tooltip_text(M("TP_LOCALLAB_GRADANG_TOOLTIP"));
feather_mask->setAdjusterListener(this);
// Add Common mask specific widgets to GUI // Add Common mask specific widgets to GUI
pack_start(*sensimask); pack_start(*sensimask);
@ -7160,6 +7193,7 @@ LocallabMask::LocallabMask():
ToolParamBlock* const gradmaskBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const gradmaskBox = Gtk::manage(new ToolParamBlock());
gradmaskBox->pack_start(*str_mask); gradmaskBox->pack_start(*str_mask);
gradmaskBox->pack_start(*ang_mask); gradmaskBox->pack_start(*ang_mask);
gradmaskBox->pack_start(*feather_mask);
gradFramemask->add(*gradmaskBox); gradFramemask->add(*gradmaskBox);
toolmaskBox->pack_start(*gradFramemask, Gtk::PACK_SHRINK, 0); toolmaskBox->pack_start(*gradFramemask, Gtk::PACK_SHRINK, 0);
toolmaskFrame->add(*toolmaskBox); toolmaskFrame->add(*toolmaskBox);
@ -7375,6 +7409,7 @@ void LocallabMask::read(const rtengine::procparams::ProcParams* pp, const Params
csThresholdmask->setValue<int>(spot.csthresholdmask); csThresholdmask->setValue<int>(spot.csthresholdmask);
str_mask->setValue((double)spot.str_mask); str_mask->setValue((double)spot.str_mask);
ang_mask->setValue((double)spot.ang_mask); ang_mask->setValue((double)spot.ang_mask);
feather_mask->setValue((double)spot.feather_mask);
} }
// Enable all listeners // Enable all listeners
@ -7422,6 +7457,7 @@ void LocallabMask::write(rtengine::procparams::ProcParams* pp, ParamsEdited* ped
spot.csthresholdmask = csThresholdmask->getValue<int>(); spot.csthresholdmask = csThresholdmask->getValue<int>();
spot.str_mask = str_mask->getIntValue(); spot.str_mask = str_mask->getIntValue();
spot.ang_mask = ang_mask->getIntValue(); spot.ang_mask = ang_mask->getIntValue();
spot.feather_mask = feather_mask->getIntValue();
} }
// Note: No need to manage pedited as batch mode is deactivated for Locallab // Note: No need to manage pedited as batch mode is deactivated for Locallab
@ -7451,6 +7487,7 @@ void LocallabMask::setDefaults(const rtengine::procparams::ProcParams* defParams
csThresholdmask->setDefault<int>(defSpot.csthresholdmask); csThresholdmask->setDefault<int>(defSpot.csthresholdmask);
str_mask->setDefault((double)defSpot.str_mask); str_mask->setDefault((double)defSpot.str_mask);
ang_mask->setDefault((double)defSpot.ang_mask); ang_mask->setDefault((double)defSpot.ang_mask);
feather_mask->setDefault((double)defSpot.feather_mask);
} }
// Note: No need to manage pedited as batch mode is deactivated for Locallab // Note: No need to manage pedited as batch mode is deactivated for Locallab
@ -7565,6 +7602,13 @@ void LocallabMask::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == feather_mask) {
if (listener) {
listener->panelChanged(Evlocallabfeather_mask,
feather_mask->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")");
}
}
} }
} }
@ -7700,6 +7744,7 @@ void LocallabMask::convertParamToNormal()
csThresholdmask->setValue<int>(defSpot.csthresholdmask); csThresholdmask->setValue<int>(defSpot.csthresholdmask);
str_mask->setValue((double)defSpot.str_mask); str_mask->setValue((double)defSpot.str_mask);
ang_mask->setValue((double)defSpot.ang_mask); ang_mask->setValue((double)defSpot.ang_mask);
feather_mask->setValue((double)defSpot.feather_mask);
// Enable all listeners // Enable all listeners
enableListener(); enableListener();
@ -8067,6 +8112,7 @@ Locallabcie::Locallabcie():
expgradcie(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))), expgradcie(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))),
strgradcie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))), strgradcie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))),
anggradcie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))), anggradcie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),
feathercie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
exprecovcie(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI2_EXP")))), exprecovcie(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI2_EXP")))),
maskusablecie(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_MASKUSABLE")))), maskusablecie(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_MASKUSABLE")))),
@ -8167,6 +8213,7 @@ Locallabcie::Locallabcie():
Evlocallabdetailciejz = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_DETAILJZ"); Evlocallabdetailciejz = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_DETAILJZ");
EvlocallabenacieMaskall = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_ENAMASKALL"); EvlocallabenacieMaskall = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_ENAMASKALL");
Evlocallabsmoothciemet = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_SMOOTHMET"); Evlocallabsmoothciemet = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_CIE_SMOOTHMET");
Evlocallabfeathercie = m->newEvent(AUTOEXP, "HISTORY_MSG_LOCAL_FEATHERCIE");
set_orientation(Gtk::ORIENTATION_VERTICAL); set_orientation(Gtk::ORIENTATION_VERTICAL);
@ -8984,9 +9031,11 @@ Locallabcie::Locallabcie():
strgradcie->setAdjusterListener(this); strgradcie->setAdjusterListener(this);
anggradcie->setAdjusterListener(this); anggradcie->setAdjusterListener(this);
feathercie->setAdjusterListener(this);
ToolParamBlock* const cieBoxgrad = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const cieBoxgrad = Gtk::manage(new ToolParamBlock());
cieBoxgrad->pack_start(*strgradcie); cieBoxgrad->pack_start(*strgradcie);
cieBoxgrad->pack_start(*anggradcie); cieBoxgrad->pack_start(*anggradcie);
cieBoxgrad->pack_start(*feathercie);
expgradcie->add(*cieBoxgrad, false); expgradcie->add(*cieBoxgrad, false);
pack_start(*expgradcie, false, false); pack_start(*expgradcie, false, false);
@ -9875,6 +9924,7 @@ void Locallabcie::read(const rtengine::procparams::ProcParams* pp, const ParamsE
strgradcie->setValue((double)spot.strgradcie); strgradcie->setValue((double)spot.strgradcie);
anggradcie->setValue((double)spot.anggradcie); anggradcie->setValue((double)spot.anggradcie);
feathercie->setValue((double)spot.feathercie);
enacieMask->set_active(spot.enacieMask); enacieMask->set_active(spot.enacieMask);
enacieMaskall->set_active(spot.enacieMaskall); enacieMaskall->set_active(spot.enacieMaskall);
@ -10178,6 +10228,7 @@ void Locallabcie::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
spot.detailcie = detailcie->getValue(); spot.detailcie = detailcie->getValue();
spot.strgradcie = strgradcie->getValue(); spot.strgradcie = strgradcie->getValue();
spot.anggradcie = anggradcie->getValue(); spot.anggradcie = anggradcie->getValue();
spot.feathercie = feathercie->getValue();
spot.enacieMask = enacieMask->get_active(); spot.enacieMask = enacieMask->get_active();
spot.enacieMaskall = enacieMaskall->get_active(); spot.enacieMaskall = enacieMaskall->get_active();
@ -11886,6 +11937,7 @@ void Locallabcie::convertParamToSimple()
enacieMaskall->set_active(defSpot.enacieMaskall); enacieMaskall->set_active(defSpot.enacieMaskall);
strgradcie->setValue(defSpot.strgradcie); strgradcie->setValue(defSpot.strgradcie);
anggradcie->setValue(defSpot.anggradcie); anggradcie->setValue(defSpot.anggradcie);
feathercie->setValue(defSpot.feathercie);
refi->setValue(defSpot.refi); refi->setValue(defSpot.refi);
modecie->set_active(0); modecie->set_active(0);
primMethod->set_active(0);//Prophoto primMethod->set_active(0);//Prophoto
@ -12050,6 +12102,7 @@ void Locallabcie::setDefaults(const rtengine::procparams::ProcParams* defParams,
// detailcie->setDefault(defSpot.detailcie); // detailcie->setDefault(defSpot.detailcie);
strgradcie->setDefault((double)defSpot.strgradcie); strgradcie->setDefault((double)defSpot.strgradcie);
anggradcie->setDefault((double)defSpot.anggradcie); anggradcie->setDefault((double)defSpot.anggradcie);
feathercie->setDefault((double)defSpot.feathercie);
blendmaskcie->setDefault((double)defSpot.blendmaskcie); blendmaskcie->setDefault((double)defSpot.blendmaskcie);
radmaskcie->setDefault(defSpot.radmaskcie); radmaskcie->setDefault(defSpot.radmaskcie);
chromaskcie->setDefault(defSpot.chromaskcie); chromaskcie->setDefault(defSpot.chromaskcie);
@ -12758,6 +12811,13 @@ void Locallabcie::adjusterChanged(Adjuster* a, double newval)
} }
} }
if (a == feathercie) {
if (listener) {
listener->panelChanged(Evlocallabfeathercie,
feathercie->getTextValue() + spName);
}
}
if (a == blendmaskcie) { if (a == blendmaskcie) {
if (listener) { if (listener) {
listener->panelChanged(Evlocallabblendmaskcie, listener->panelChanged(Evlocallabblendmaskcie,

58
rtgui/paramsedited.cc
View File

@ -1185,6 +1185,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).strcolab = locallab.spots.at(j).strcolab && pSpot.strcolab == otherSpot.strcolab; locallab.spots.at(j).strcolab = locallab.spots.at(j).strcolab && pSpot.strcolab == otherSpot.strcolab;
locallab.spots.at(j).strcolh = locallab.spots.at(j).strcolh && pSpot.strcolh == otherSpot.strcolh; locallab.spots.at(j).strcolh = locallab.spots.at(j).strcolh && pSpot.strcolh == otherSpot.strcolh;
locallab.spots.at(j).angcol = locallab.spots.at(j).angcol && pSpot.angcol == otherSpot.angcol; locallab.spots.at(j).angcol = locallab.spots.at(j).angcol && pSpot.angcol == otherSpot.angcol;
locallab.spots.at(j).feathercol = locallab.spots.at(j).feathercol && pSpot.feathercol == otherSpot.feathercol;
locallab.spots.at(j).blurcolde = locallab.spots.at(j).blurcolde && pSpot.blurcolde == otherSpot.blurcolde; locallab.spots.at(j).blurcolde = locallab.spots.at(j).blurcolde && pSpot.blurcolde == otherSpot.blurcolde;
locallab.spots.at(j).blurcol = locallab.spots.at(j).blurcol && pSpot.blurcol == otherSpot.blurcol; locallab.spots.at(j).blurcol = locallab.spots.at(j).blurcol && pSpot.blurcol == otherSpot.blurcol;
locallab.spots.at(j).contcol = locallab.spots.at(j).contcol && pSpot.contcol == otherSpot.contcol; locallab.spots.at(j).contcol = locallab.spots.at(j).contcol && pSpot.contcol == otherSpot.contcol;
@ -1247,6 +1248,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).blurexpde = locallab.spots.at(j).blurexpde && pSpot.blurexpde == otherSpot.blurexpde; locallab.spots.at(j).blurexpde = locallab.spots.at(j).blurexpde && pSpot.blurexpde == otherSpot.blurexpde;
locallab.spots.at(j).strexp = locallab.spots.at(j).strexp && pSpot.strexp == otherSpot.strexp; locallab.spots.at(j).strexp = locallab.spots.at(j).strexp && pSpot.strexp == otherSpot.strexp;
locallab.spots.at(j).angexp = locallab.spots.at(j).angexp && pSpot.angexp == otherSpot.angexp; locallab.spots.at(j).angexp = locallab.spots.at(j).angexp && pSpot.angexp == otherSpot.angexp;
locallab.spots.at(j).featherexp = locallab.spots.at(j).featherexp && pSpot.featherexp == otherSpot.featherexp;
locallab.spots.at(j).excurve = locallab.spots.at(j).excurve && pSpot.excurve == otherSpot.excurve; locallab.spots.at(j).excurve = locallab.spots.at(j).excurve && pSpot.excurve == otherSpot.excurve;
locallab.spots.at(j).norm = locallab.spots.at(j).norm && pSpot.norm == otherSpot.norm; locallab.spots.at(j).norm = locallab.spots.at(j).norm && pSpot.norm == otherSpot.norm;
locallab.spots.at(j).inversex = locallab.spots.at(j).inversex && pSpot.inversex == otherSpot.inversex; locallab.spots.at(j).inversex = locallab.spots.at(j).inversex && pSpot.inversex == otherSpot.inversex;
@ -1306,6 +1308,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).blurSHde = locallab.spots.at(j).blurSHde && pSpot.blurSHde == otherSpot.blurSHde; locallab.spots.at(j).blurSHde = locallab.spots.at(j).blurSHde && pSpot.blurSHde == otherSpot.blurSHde;
locallab.spots.at(j).strSH = locallab.spots.at(j).strSH && pSpot.strSH == otherSpot.strSH; locallab.spots.at(j).strSH = locallab.spots.at(j).strSH && pSpot.strSH == otherSpot.strSH;
locallab.spots.at(j).angSH = locallab.spots.at(j).angSH && pSpot.angSH == otherSpot.angSH; locallab.spots.at(j).angSH = locallab.spots.at(j).angSH && pSpot.angSH == otherSpot.angSH;
locallab.spots.at(j).featherSH = locallab.spots.at(j).featherSH && pSpot.featherSH == otherSpot.featherSH;
locallab.spots.at(j).inverssh = locallab.spots.at(j).inverssh && pSpot.inverssh == otherSpot.inverssh; locallab.spots.at(j).inverssh = locallab.spots.at(j).inverssh && pSpot.inverssh == otherSpot.inverssh;
locallab.spots.at(j).chromaskSH = locallab.spots.at(j).chromaskSH && pSpot.chromaskSH == otherSpot.chromaskSH; locallab.spots.at(j).chromaskSH = locallab.spots.at(j).chromaskSH && pSpot.chromaskSH == otherSpot.chromaskSH;
locallab.spots.at(j).gammaskSH = locallab.spots.at(j).gammaskSH && pSpot.gammaskSH == otherSpot.gammaskSH; locallab.spots.at(j).gammaskSH = locallab.spots.at(j).gammaskSH && pSpot.gammaskSH == otherSpot.gammaskSH;
@ -1351,6 +1354,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).strvibab = locallab.spots.at(j).strvibab && pSpot.strvibab == otherSpot.strvibab; locallab.spots.at(j).strvibab = locallab.spots.at(j).strvibab && pSpot.strvibab == otherSpot.strvibab;
locallab.spots.at(j).strvibh = locallab.spots.at(j).strvibh && pSpot.strvibh == otherSpot.strvibh; locallab.spots.at(j).strvibh = locallab.spots.at(j).strvibh && pSpot.strvibh == otherSpot.strvibh;
locallab.spots.at(j).angvib = locallab.spots.at(j).angvib && pSpot.angvib == otherSpot.angvib; locallab.spots.at(j).angvib = locallab.spots.at(j).angvib && pSpot.angvib == otherSpot.angvib;
locallab.spots.at(j).feathervib = locallab.spots.at(j).feathervib && pSpot.feathervib == otherSpot.feathervib;
locallab.spots.at(j).Lmaskvibcurve = locallab.spots.at(j).Lmaskvibcurve && pSpot.Lmaskvibcurve == otherSpot.Lmaskvibcurve; locallab.spots.at(j).Lmaskvibcurve = locallab.spots.at(j).Lmaskvibcurve && pSpot.Lmaskvibcurve == otherSpot.Lmaskvibcurve;
locallab.spots.at(j).recothresv = locallab.spots.at(j).recothresv && pSpot.recothresv == otherSpot.recothresv; locallab.spots.at(j).recothresv = locallab.spots.at(j).recothresv && pSpot.recothresv == otherSpot.recothresv;
locallab.spots.at(j).lowthresv = locallab.spots.at(j).lowthresv && pSpot.lowthresv == otherSpot.lowthresv; locallab.spots.at(j).lowthresv = locallab.spots.at(j).lowthresv && pSpot.lowthresv == otherSpot.lowthresv;
@ -1567,6 +1571,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).sigmalc2 = locallab.spots.at(j).sigmalc2 && pSpot.sigmalc2 == otherSpot.sigmalc2; locallab.spots.at(j).sigmalc2 = locallab.spots.at(j).sigmalc2 && pSpot.sigmalc2 == otherSpot.sigmalc2;
locallab.spots.at(j).strwav = locallab.spots.at(j).strwav && pSpot.strwav == otherSpot.strwav; locallab.spots.at(j).strwav = locallab.spots.at(j).strwav && pSpot.strwav == otherSpot.strwav;
locallab.spots.at(j).angwav = locallab.spots.at(j).angwav && pSpot.angwav == otherSpot.angwav; locallab.spots.at(j).angwav = locallab.spots.at(j).angwav && pSpot.angwav == otherSpot.angwav;
locallab.spots.at(j).featherwav = locallab.spots.at(j).featherwav && pSpot.featherwav == otherSpot.featherwav;
locallab.spots.at(j).strengthw = locallab.spots.at(j).strengthw && pSpot.strengthw == otherSpot.strengthw; locallab.spots.at(j).strengthw = locallab.spots.at(j).strengthw && pSpot.strengthw == otherSpot.strengthw;
locallab.spots.at(j).sigmaed = locallab.spots.at(j).sigmaed && pSpot.sigmaed == otherSpot.sigmaed; locallab.spots.at(j).sigmaed = locallab.spots.at(j).sigmaed && pSpot.sigmaed == otherSpot.sigmaed;
locallab.spots.at(j).radiusw = locallab.spots.at(j).radiusw && pSpot.radiusw == otherSpot.radiusw; locallab.spots.at(j).radiusw = locallab.spots.at(j).radiusw && pSpot.radiusw == otherSpot.radiusw;
@ -1678,6 +1683,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).baselog = locallab.spots.at(j).baselog && pSpot.baselog == otherSpot.baselog; locallab.spots.at(j).baselog = locallab.spots.at(j).baselog && pSpot.baselog == otherSpot.baselog;
locallab.spots.at(j).strlog = locallab.spots.at(j).strlog && pSpot.strlog == otherSpot.strlog; locallab.spots.at(j).strlog = locallab.spots.at(j).strlog && pSpot.strlog == otherSpot.strlog;
locallab.spots.at(j).anglog = locallab.spots.at(j).anglog && pSpot.anglog == otherSpot.anglog; locallab.spots.at(j).anglog = locallab.spots.at(j).anglog && pSpot.anglog == otherSpot.anglog;
locallab.spots.at(j).featherlog = locallab.spots.at(j).featherlog && pSpot.featherlog == otherSpot.featherlog;
locallab.spots.at(j).CCmaskcurveL = locallab.spots.at(j).CCmaskcurveL && pSpot.CCmaskcurveL == otherSpot.CCmaskcurveL; locallab.spots.at(j).CCmaskcurveL = locallab.spots.at(j).CCmaskcurveL && pSpot.CCmaskcurveL == otherSpot.CCmaskcurveL;
locallab.spots.at(j).LLmaskcurveL = locallab.spots.at(j).LLmaskcurveL && pSpot.LLmaskcurveL == otherSpot.LLmaskcurveL; locallab.spots.at(j).LLmaskcurveL = locallab.spots.at(j).LLmaskcurveL && pSpot.LLmaskcurveL == otherSpot.LLmaskcurveL;
locallab.spots.at(j).HHmaskcurveL = locallab.spots.at(j).HHmaskcurveL && pSpot.HHmaskcurveL == otherSpot.HHmaskcurveL; locallab.spots.at(j).HHmaskcurveL = locallab.spots.at(j).HHmaskcurveL && pSpot.HHmaskcurveL == otherSpot.HHmaskcurveL;
@ -1716,6 +1722,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).shadmask = locallab.spots.at(j).shadmask && pSpot.shadmask == otherSpot.shadmask; locallab.spots.at(j).shadmask = locallab.spots.at(j).shadmask && pSpot.shadmask == otherSpot.shadmask;
locallab.spots.at(j).str_mask = locallab.spots.at(j).str_mask && pSpot.str_mask == otherSpot.str_mask; locallab.spots.at(j).str_mask = locallab.spots.at(j).str_mask && pSpot.str_mask == otherSpot.str_mask;
locallab.spots.at(j).ang_mask = locallab.spots.at(j).ang_mask && pSpot.ang_mask == otherSpot.ang_mask; locallab.spots.at(j).ang_mask = locallab.spots.at(j).ang_mask && pSpot.ang_mask == otherSpot.ang_mask;
locallab.spots.at(j).feather_mask = locallab.spots.at(j).feather_mask && pSpot.feather_mask == otherSpot.feather_mask;
locallab.spots.at(j).HHhmask_curve = locallab.spots.at(j).HHhmask_curve && pSpot.HHhmask_curve == otherSpot.HHhmask_curve; locallab.spots.at(j).HHhmask_curve = locallab.spots.at(j).HHhmask_curve && pSpot.HHhmask_curve == otherSpot.HHhmask_curve;
locallab.spots.at(j).Lmask_curve = locallab.spots.at(j).Lmask_curve && pSpot.Lmask_curve == otherSpot.Lmask_curve; locallab.spots.at(j).Lmask_curve = locallab.spots.at(j).Lmask_curve && pSpot.Lmask_curve == otherSpot.Lmask_curve;
locallab.spots.at(j).LLmask_curvewav = locallab.spots.at(j).LLmask_curvewav && pSpot.LLmask_curvewav == otherSpot.LLmask_curvewav; locallab.spots.at(j).LLmask_curvewav = locallab.spots.at(j).LLmask_curvewav && pSpot.LLmask_curvewav == otherSpot.LLmask_curvewav;
@ -1848,7 +1855,8 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).strgradcie = locallab.spots.at(j).strgradcie && pSpot.strgradcie == otherSpot.strgradcie; locallab.spots.at(j).strgradcie = locallab.spots.at(j).strgradcie && pSpot.strgradcie == otherSpot.strgradcie;
locallab.spots.at(j).anggradcie = locallab.spots.at(j).anggradcie && pSpot.anggradcie == otherSpot.anggradcie; locallab.spots.at(j).anggradcie = locallab.spots.at(j).anggradcie && pSpot.anggradcie == otherSpot.anggradcie;
locallab.spots.at(j).feathercie = locallab.spots.at(j).feathercie && pSpot.feathercie == otherSpot.feathercie;
locallab.spots.at(j).enacieMask = locallab.spots.at(j).enacieMask && pSpot.enacieMask == otherSpot.enacieMask; locallab.spots.at(j).enacieMask = locallab.spots.at(j).enacieMask && pSpot.enacieMask == otherSpot.enacieMask;
locallab.spots.at(j).enacieMaskall = locallab.spots.at(j).enacieMaskall && pSpot.enacieMaskall == otherSpot.enacieMaskall; locallab.spots.at(j).enacieMaskall = locallab.spots.at(j).enacieMaskall && pSpot.enacieMaskall == otherSpot.enacieMaskall;
locallab.spots.at(j).CCmaskciecurve = locallab.spots.at(j).CCmaskciecurve && pSpot.CCmaskciecurve == otherSpot.CCmaskciecurve; locallab.spots.at(j).CCmaskciecurve = locallab.spots.at(j).CCmaskciecurve && pSpot.CCmaskciecurve == otherSpot.CCmaskciecurve;
@ -3832,6 +3840,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).angcol = mods.locallab.spots.at(i).angcol; toEdit.locallab.spots.at(i).angcol = mods.locallab.spots.at(i).angcol;
} }
if (locallab.spots.at(i).feathercol) {
toEdit.locallab.spots.at(i).feathercol = mods.locallab.spots.at(i).feathercol;
}
if (locallab.spots.at(i).blurcolde) { if (locallab.spots.at(i).blurcolde) {
toEdit.locallab.spots.at(i).blurcolde = mods.locallab.spots.at(i).blurcolde; toEdit.locallab.spots.at(i).blurcolde = mods.locallab.spots.at(i).blurcolde;
} }
@ -4081,6 +4093,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).angexp = mods.locallab.spots.at(i).angexp; toEdit.locallab.spots.at(i).angexp = mods.locallab.spots.at(i).angexp;
} }
if (locallab.spots.at(i).featherexp) {
toEdit.locallab.spots.at(i).featherexp = mods.locallab.spots.at(i).featherexp;
}
if (locallab.spots.at(i).excurve) { if (locallab.spots.at(i).excurve) {
toEdit.locallab.spots.at(i).excurve = mods.locallab.spots.at(i).excurve; toEdit.locallab.spots.at(i).excurve = mods.locallab.spots.at(i).excurve;
} }
@ -4300,6 +4316,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).angSH = mods.locallab.spots.at(i).angSH; toEdit.locallab.spots.at(i).angSH = mods.locallab.spots.at(i).angSH;
} }
if (locallab.spots.at(i).featherSH) {
toEdit.locallab.spots.at(i).featherSH = mods.locallab.spots.at(i).featherSH;
}
if (locallab.spots.at(i).inverssh) { if (locallab.spots.at(i).inverssh) {
toEdit.locallab.spots.at(i).inverssh = mods.locallab.spots.at(i).inverssh; toEdit.locallab.spots.at(i).inverssh = mods.locallab.spots.at(i).inverssh;
} }
@ -4477,6 +4497,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).angvib = mods.locallab.spots.at(i).angvib; toEdit.locallab.spots.at(i).angvib = mods.locallab.spots.at(i).angvib;
} }
if (locallab.spots.at(i).feathervib) {
toEdit.locallab.spots.at(i).feathervib = mods.locallab.spots.at(i).feathervib;
}
if (locallab.spots.at(i).Lmaskvibcurve) { if (locallab.spots.at(i).Lmaskvibcurve) {
toEdit.locallab.spots.at(i).Lmaskvibcurve = mods.locallab.spots.at(i).Lmaskvibcurve; toEdit.locallab.spots.at(i).Lmaskvibcurve = mods.locallab.spots.at(i).Lmaskvibcurve;
} }
@ -5325,6 +5349,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).angwav = mods.locallab.spots.at(i).angwav; toEdit.locallab.spots.at(i).angwav = mods.locallab.spots.at(i).angwav;
} }
if (locallab.spots.at(i).featherwav) {
toEdit.locallab.spots.at(i).featherwav = mods.locallab.spots.at(i).featherwav;
}
if (locallab.spots.at(i).strengthw) { if (locallab.spots.at(i).strengthw) {
toEdit.locallab.spots.at(i).strengthw = mods.locallab.spots.at(i).strengthw; toEdit.locallab.spots.at(i).strengthw = mods.locallab.spots.at(i).strengthw;
} }
@ -5749,6 +5777,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).anglog = mods.locallab.spots.at(i).anglog; toEdit.locallab.spots.at(i).anglog = mods.locallab.spots.at(i).anglog;
} }
if (locallab.spots.at(i).featherlog) {
toEdit.locallab.spots.at(i).featherlog = mods.locallab.spots.at(i).featherlog;
}
if (locallab.spots.at(i).CCmaskcurveL) { if (locallab.spots.at(i).CCmaskcurveL) {
toEdit.locallab.spots.at(i).CCmaskcurveL = mods.locallab.spots.at(i).CCmaskcurveL; toEdit.locallab.spots.at(i).CCmaskcurveL = mods.locallab.spots.at(i).CCmaskcurveL;
} }
@ -5890,6 +5922,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).ang_mask = mods.locallab.spots.at(i).ang_mask; toEdit.locallab.spots.at(i).ang_mask = mods.locallab.spots.at(i).ang_mask;
} }
if (locallab.spots.at(i).feather_mask) {
toEdit.locallab.spots.at(i).feather_mask = mods.locallab.spots.at(i).feather_mask;
}
if (locallab.spots.at(i).HHhmask_curve) { if (locallab.spots.at(i).HHhmask_curve) {
toEdit.locallab.spots.at(i).HHhmask_curve = mods.locallab.spots.at(i).HHhmask_curve; toEdit.locallab.spots.at(i).HHhmask_curve = mods.locallab.spots.at(i).HHhmask_curve;
} }
@ -6423,6 +6459,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).anggradcie = mods.locallab.spots.at(i).anggradcie; toEdit.locallab.spots.at(i).anggradcie = mods.locallab.spots.at(i).anggradcie;
} }
if (locallab.spots.at(i).feathercie) {
toEdit.locallab.spots.at(i).feathercie = mods.locallab.spots.at(i).feathercie;
}
if (locallab.spots.at(i).enacieMask) { if (locallab.spots.at(i).enacieMask) {
toEdit.locallab.spots.at(i).enacieMask = mods.locallab.spots.at(i).enacieMask; toEdit.locallab.spots.at(i).enacieMask = mods.locallab.spots.at(i).enacieMask;
} }
@ -7938,6 +7978,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
strcolab(v), strcolab(v),
strcolh(v), strcolh(v),
angcol(v), angcol(v),
feathercol(v),
blurcolde(v), blurcolde(v),
blurcol(v), blurcol(v),
contcol(v), contcol(v),
@ -8000,6 +8041,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
blurexpde(v), blurexpde(v),
strexp(v), strexp(v),
angexp(v), angexp(v),
featherexp(v),
excurve(v), excurve(v),
norm(v), norm(v),
inversex(v), inversex(v),
@ -8055,6 +8097,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
blurSHde(v), blurSHde(v),
strSH(v), strSH(v),
angSH(v), angSH(v),
featherSH(v),
inverssh(v), inverssh(v),
chromaskSH(v), chromaskSH(v),
gammaskSH(v), gammaskSH(v),
@ -8100,6 +8143,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
strvibab(v), strvibab(v),
strvibh(v), strvibh(v),
angvib(v), angvib(v),
feathervib(v),
Lmaskvibcurve(v), Lmaskvibcurve(v),
recothresv(v), recothresv(v),
lowthresv(v), lowthresv(v),
@ -8316,6 +8360,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
sigmalc2(v), sigmalc2(v),
strwav(v), strwav(v),
angwav(v), angwav(v),
featherwav(v),
strengthw(v), strengthw(v),
sigmaed(v), sigmaed(v),
radiusw(v), radiusw(v),
@ -8422,6 +8467,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
baselog(v), baselog(v),
strlog(v), strlog(v),
anglog(v), anglog(v),
featherlog(v),
CCmaskcurveL(v), CCmaskcurveL(v),
LLmaskcurveL(v), LLmaskcurveL(v),
HHmaskcurveL(v), HHmaskcurveL(v),
@ -8459,6 +8505,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
shadmask(v), shadmask(v),
str_mask(v), str_mask(v),
ang_mask(v), ang_mask(v),
feather_mask(v),
HHhmask_curve(v), HHhmask_curve(v),
Lmask_curve(v), Lmask_curve(v),
LLmask_curvewav(v), LLmask_curvewav(v),
@ -8588,6 +8635,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
surroundcie(v), surroundcie(v),
strgradcie(v), strgradcie(v),
anggradcie(v), anggradcie(v),
feathercie(v),
enacieMask(v), enacieMask(v),
enacieMaskall(v), enacieMaskall(v),
CCmaskciecurve(v), CCmaskciecurve(v),
@ -8690,6 +8738,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
strcolab = v; strcolab = v;
strcolh = v; strcolh = v;
angcol = v; angcol = v;
feathercol = v;
blurcolde = v; blurcolde = v;
blurcol = v; blurcol = v;
contcol = v; contcol = v;
@ -8752,6 +8801,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
blurexpde = v; blurexpde = v;
strexp = v; strexp = v;
angexp = v; angexp = v;
featherexp = v;
excurve = v; excurve = v;
norm = v; norm = v;
inversex = v; inversex = v;
@ -8811,6 +8861,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
blurSHde = v; blurSHde = v;
strSH = v; strSH = v;
angSH = v; angSH = v;
featherSH = v;
inverssh = v; inverssh = v;
chromaskSH = v; chromaskSH = v;
gammaskSH = v; gammaskSH = v;
@ -8856,6 +8907,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
strvibab = v; strvibab = v;
strvibh = v; strvibh = v;
angvib = v; angvib = v;
feathervib = v;
Lmaskvibcurve = v; Lmaskvibcurve = v;
recothresv = v; recothresv = v;
lowthresv = v; lowthresv = v;
@ -9071,6 +9123,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
sigmalc2 = v; sigmalc2 = v;
strwav = v; strwav = v;
angwav = v; angwav = v;
featherwav = v;
strengthw = v; strengthw = v;
sigmaed = v; sigmaed = v;
radiusw = v; radiusw = v;
@ -9181,6 +9234,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
baselog = v; baselog = v;
strlog = v; strlog = v;
anglog = v; anglog = v;
featherlog = v;
CCmaskcurveL = v; CCmaskcurveL = v;
LLmaskcurveL = v; LLmaskcurveL = v;
HHmaskcurveL = v; HHmaskcurveL = v;
@ -9218,6 +9272,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
shadmask = v; shadmask = v;
str_mask = v; str_mask = v;
ang_mask = v; ang_mask = v;
feather_mask = v;
HHhmask_curve = v; HHhmask_curve = v;
Lmask_curve = v; Lmask_curve = v;
LLmask_curvewav = v; LLmask_curvewav = v;
@ -9346,6 +9401,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
detailcie = v; detailcie = v;
surroundcie = v; surroundcie = v;
anggradcie = v; anggradcie = v;
feathercie = v;
strgradcie = v; strgradcie = v;
enacieMask = v; enacieMask = v;
enacieMaskall = v; enacieMaskall = v;

8
rtgui/paramsedited.h
View File

@ -476,6 +476,7 @@ public:
bool strcolab; bool strcolab;
bool strcolh; bool strcolh;
bool angcol; bool angcol;
bool feathercol;
bool blurcolde; bool blurcolde;
bool blurcol; bool blurcol;
bool contcol; bool contcol;
@ -538,6 +539,7 @@ public:
bool blurexpde; bool blurexpde;
bool strexp; bool strexp;
bool angexp; bool angexp;
bool featherexp;
bool excurve; bool excurve;
bool norm; bool norm;
bool inversex; bool inversex;
@ -593,6 +595,7 @@ public:
bool blurSHde; bool blurSHde;
bool strSH; bool strSH;
bool angSH; bool angSH;
bool featherSH;
bool inverssh; bool inverssh;
bool chromaskSH; bool chromaskSH;
bool gammaskSH; bool gammaskSH;
@ -638,6 +641,7 @@ public:
bool strvibab; bool strvibab;
bool strvibh; bool strvibh;
bool angvib; bool angvib;
bool feathervib;
bool Lmaskvibcurve; bool Lmaskvibcurve;
bool recothresv; bool recothresv;
bool lowthresv; bool lowthresv;
@ -854,6 +858,7 @@ public:
bool sigmalc2; bool sigmalc2;
bool strwav; bool strwav;
bool angwav; bool angwav;
bool featherwav;
bool strengthw; bool strengthw;
bool sigmaed; bool sigmaed;
bool radiusw; bool radiusw;
@ -960,6 +965,7 @@ public:
bool baselog; bool baselog;
bool strlog; bool strlog;
bool anglog; bool anglog;
bool featherlog;
bool CCmaskcurveL; bool CCmaskcurveL;
bool LLmaskcurveL; bool LLmaskcurveL;
bool HHmaskcurveL; bool HHmaskcurveL;
@ -997,6 +1003,7 @@ public:
bool shadmask; bool shadmask;
bool str_mask; bool str_mask;
bool ang_mask; bool ang_mask;
bool feather_mask;
bool HHhmask_curve; bool HHhmask_curve;
bool Lmask_curve; bool Lmask_curve;
bool LLmask_curvewav; bool LLmask_curvewav;
@ -1127,6 +1134,7 @@ public:
bool surroundcie; bool surroundcie;
bool strgradcie; bool strgradcie;
bool anggradcie; bool anggradcie;
bool feathercie;
bool enacieMask; bool enacieMask;
bool enacieMaskall; bool enacieMaskall;