Clean code and tooltip
This commit is contained in:
parent
8c927a5bba
commit
e3af94e499
@ -2516,8 +2516,8 @@ TP_LOCALLAB_CONTCOL;Contrast threshold
|
|||||||
TP_LOCALLAB_CONTFRA;Contrast by level
|
TP_LOCALLAB_CONTFRA;Contrast by level
|
||||||
TP_LOCALLAB_CONTL;Contrast (J)
|
TP_LOCALLAB_CONTL;Contrast (J)
|
||||||
TP_LOCALLAB_CONTRAST;Contrast
|
TP_LOCALLAB_CONTRAST;Contrast
|
||||||
TP_LOCALLAB_CONTRASTCURVMASK1_TOOLTIP;Allows you to freely modify the contrast of the mask (gamma & slope), instead of using a continuous & progressive curve. However it can create artifacts that have to be dealt with using the “Smooth radius” or “Laplacian threshold sliders”.
|
TP_LOCALLAB_CONTRASTCURVMASK1_TOOLTIP;Allows you to freely modify the contrast of the mask (gamma and slope), instead of using a continuous and progressive curve. However it can create artifacts that have to be dealt with using the “Smooth radius” or “Laplacian threshold sliders”.
|
||||||
TP_LOCALLAB_CONTRASTCURVMASK_TOOLTIP;Allows you to freely change the contrast of the mask.\n Has a similar function to the Gamma and Slope sliders. It allows you to target certain parts of the image (usually the lightest parts of the mask by using the curve to exclude the darker parts).May create artifacts.
|
TP_LOCALLAB_CONTRASTCURVMASK_TOOLTIP;Allows you to freely change the contrast of the mask.\n Has a similar function to the Gamma and Slope sliders.\n It allows you to target certain parts of the image (usually the lightest parts of the mask by using the curve to exclude the darker parts).May create artifacts.
|
||||||
TP_LOCALLAB_CONTRESID;Contrast
|
TP_LOCALLAB_CONTRESID;Contrast
|
||||||
TP_LOCALLAB_CONTTHMASK_TOOLTIP;Allows you to determine which parts of the image will be impacted based on the texture.
|
TP_LOCALLAB_CONTTHMASK_TOOLTIP;Allows you to determine which parts of the image will be impacted based on the texture.
|
||||||
TP_LOCALLAB_CONTTHR;Contrast Threshold
|
TP_LOCALLAB_CONTTHR;Contrast Threshold
|
||||||
@ -2697,11 +2697,9 @@ TP_LOCALLAB_LIGHTN_TOOLTIP;In inverse mode: selection = -100 forces luminance to
|
|||||||
TP_LOCALLAB_LIGHTRETI;Lightness
|
TP_LOCALLAB_LIGHTRETI;Lightness
|
||||||
TP_LOCALLAB_LINEAR;Linearity
|
TP_LOCALLAB_LINEAR;Linearity
|
||||||
TP_LOCALLAB_LIST_NAME;Add tool to current spot...
|
TP_LOCALLAB_LIST_NAME;Add tool to current spot...
|
||||||
TP_LOCALLAB_LIST_TOOLTIP;You can select 3 levels of complexity for each tool: Basic, Standard & Advanced.\nThe default setting for all tools is Basic but this can be changed in the Preferences window.\nYou can also change the level of complexity on a per-tool basis while you are editing
|
TP_LOCALLAB_LIST_TOOLTIP;You can select 3 levels of complexity for each tool: Basic, Standard and Advanced.\nThe default setting for all tools is Basic but this can be changed in the Preferences window.\nYou can also change the level of complexity on a per-tool basis while you are editing
|
||||||
//TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Give priority to action on midtones and high lights and by choosing the concerned wavelet levels
|
|
||||||
TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Allows you to decrease or increase the effect on particular levels of detail in the mask by targeting certain luminance zones (in general the lightest).
|
TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Allows you to decrease or increase the effect on particular levels of detail in the mask by targeting certain luminance zones (in general the lightest).
|
||||||
//TP_LOCALLAB_LMASK_LL_TOOLTIP;Allows you to freely change the contrast of the mask. May create artifacts.
|
TP_LOCALLAB_LMASK_LL_TOOLTIP;Allows you to freely change the contrast of the mask.\n Has a similar function to the Gamma and Slope sliders.\n It allows you to target certain parts of the image (usually the lightest parts of the mask by using the curve to exclude the darker parts). May create artifacts.
|
||||||
TP_LOCALLAB_LMASK_LL_TOOLTIP;Allows you to freely change the contrast of the mask.\n Has a similar function to the Gamma and Slope sliders. It allows you to target certain parts of the image (usually the lightest parts of the mask by using the curve to exclude the darker parts).May create artifacts.
|
|
||||||
TP_LOCALLAB_LOCCONT;Unsharp Mask
|
TP_LOCALLAB_LOCCONT;Unsharp Mask
|
||||||
TP_LOCALLAB_LOC_CONTRAST;Local Contrast & Wavelets
|
TP_LOCALLAB_LOC_CONTRAST;Local Contrast & Wavelets
|
||||||
TP_LOCALLAB_LOC_CONTRASTPYR;Ψ Pyramid 1:
|
TP_LOCALLAB_LOC_CONTRASTPYR;Ψ Pyramid 1:
|
||||||
@ -2762,7 +2760,7 @@ TP_LOCALLAB_MASKCOM_TOOLNAME;Common Color Mask - 13
|
|||||||
TP_LOCALLAB_MASKCOM_TOOLTIP;A tool in its own right.\nCan be used to adjust the image appearance (chrominance, luminance, contrast) and texture as a function of Scope.
|
TP_LOCALLAB_MASKCOM_TOOLTIP;A tool in its own right.\nCan be used to adjust the image appearance (chrominance, luminance, contrast) and texture as a function of Scope.
|
||||||
TP_LOCALLAB_MASKCURVE_TOOLTIP;The 3 curves are set to 1 (maximum) by default:\nC=f(C) the chroma varies according to the chrominance. You can decrease the chroma to improve the selection. By setting this curve close to zero (with a low value of C to activate the curve) you can desaturate the background in Inverse mode.\nL=f(L) the luminance varies according to the luminance, so you can decrease the brightness to improve the selection.\nL and C = f(H) luminance and chroma vary with hue, so you can decrease luminance and chroma to improve selection
|
TP_LOCALLAB_MASKCURVE_TOOLTIP;The 3 curves are set to 1 (maximum) by default:\nC=f(C) the chroma varies according to the chrominance. You can decrease the chroma to improve the selection. By setting this curve close to zero (with a low value of C to activate the curve) you can desaturate the background in Inverse mode.\nL=f(L) the luminance varies according to the luminance, so you can decrease the brightness to improve the selection.\nL and C = f(H) luminance and chroma vary with hue, so you can decrease luminance and chroma to improve selection
|
||||||
TP_LOCALLAB_MASKH;Hue curve
|
TP_LOCALLAB_MASKH;Hue curve
|
||||||
TP_LOCALLAB_MASKLC_TOOLTIP;This allows you to target the denoise based on the image luminance information contained in the L(L) or LC(H) mask (Mask and Modifications). The L(L) mask or the LC(H) mask must be enabled to use this function. \n if the mask is very dark - below the threshold 'dark' - denoise will be increased if reinforce > 1.\n if the mask is clear - above the threshold 'light' - denoise will be progressively cancelled.\n between the two, denoise will be maintained at the settings without mask.
|
TP_LOCALLAB_MASKLC_TOOLTIP;This allows you to target the denoise based on the image luminance information contained in the L(L) or LC(H) mask (Mask and Modifications.\n The L(L) mask or the LC(H) mask must be enabled to use this function.\n if the mask is very dark - below the threshold 'dark' - denoise will be increased if reinforce > 1.\n if the mask is clear - above the threshold 'light' - denoise will be progressively cancelled.\n between the two, denoise will be maintained at the settings without mask.
|
||||||
TP_LOCALLAB_MASKLCTHR;Light area luminance % threshold
|
TP_LOCALLAB_MASKLCTHR;Light area luminance % threshold
|
||||||
TP_LOCALLAB_MASKLCTHRLOW; Dark area luminance % threshold
|
TP_LOCALLAB_MASKLCTHRLOW; Dark area luminance % threshold
|
||||||
TP_LOCALLAB_MASKLNOISELOW;Reinforce denoise in dark areas
|
TP_LOCALLAB_MASKLNOISELOW;Reinforce denoise in dark areas
|
||||||
@ -2899,7 +2897,7 @@ TP_LOCALLAB_SCOPEMASK_TOOLTIP;Enabled if DeltaE Image Mask is enabled.\nLow valu
|
|||||||
TP_LOCALLAB_SENSI;Scope
|
TP_LOCALLAB_SENSI;Scope
|
||||||
TP_LOCALLAB_SENSIEXCLU;Scope
|
TP_LOCALLAB_SENSIEXCLU;Scope
|
||||||
TP_LOCALLAB_SENSIEXCLU_TOOLTIP;Adjust the colors to be excluded
|
TP_LOCALLAB_SENSIEXCLU_TOOLTIP;Adjust the colors to be excluded
|
||||||
TP_LOCALLAB_SENSIMASK_TOOLTIP;Scope adjustment specific to common mask tool.\nActs on the difference between the original image and the mask.\nUses the luma, chroma & hue references from the center of the RT-spot\n\nYou can also adjust the deltaE of the mask itself by using 'Scope (deltaE image mask)' in 'Settings' > ‘Mask & Merge’
|
TP_LOCALLAB_SENSIMASK_TOOLTIP;Scope adjustment specific to common mask tool.\nActs on the difference between the original image and the mask.\nUses the luma, chroma and hue references from the center of the RT-spot\n\nYou can also adjust the deltaE of the mask itself by using 'Scope (deltaE image mask)' in 'Settings' > ‘Mask and Merge’
|
||||||
TP_LOCALLAB_SENSI_TOOLTIP;Adjusts the scope of the action:\nSmall values limit the action to colors similar to those in the center of the spot.\nHigh values let the tool act on a wider range of colors
|
TP_LOCALLAB_SENSI_TOOLTIP;Adjusts the scope of the action:\nSmall values limit the action to colors similar to those in the center of the spot.\nHigh values let the tool act on a wider range of colors
|
||||||
TP_LOCALLAB_SETTINGS;Settings
|
TP_LOCALLAB_SETTINGS;Settings
|
||||||
TP_LOCALLAB_SH1;Shadows Highlights
|
TP_LOCALLAB_SH1;Shadows Highlights
|
||||||
@ -2909,7 +2907,7 @@ TP_LOCALLAB_SHADEXCOMP;Shadow compression & tonal width
|
|||||||
TP_LOCALLAB_SHADHIGH;Shadows/Highlights & Tone equalizer
|
TP_LOCALLAB_SHADHIGH;Shadows/Highlights & Tone equalizer
|
||||||
TP_LOCALLAB_SHADHMASK_TOOLTIP;Lowers the highlights of the mask in the same way as the shadows/highlights algorithm
|
TP_LOCALLAB_SHADHMASK_TOOLTIP;Lowers the highlights of the mask in the same way as the shadows/highlights algorithm
|
||||||
TP_LOCALLAB_SHADMASK_TOOLTIP;Lifts the shadows of the mask in the same way as the shadows/highlights algorithm
|
TP_LOCALLAB_SHADMASK_TOOLTIP;Lifts the shadows of the mask in the same way as the shadows/highlights algorithm
|
||||||
TP_LOCALLAB_SHADOWHIGHLIGHT_TOOLTIP;Adjust shadows & highlights either with shadows & highlights sliders or with a tone equalizer.\nCan be used instead of, or in conjunction with the Exposure module.\nCan also be used as a graduated filter.
|
TP_LOCALLAB_SHADOWHIGHLIGHT_TOOLTIP;Adjust shadows and highlights either with shadows & highlights sliders or with a tone equalizer.\nCan be used instead of, or in conjunction with the Exposure module.\nCan also be used as a graduated filter.
|
||||||
TP_LOCALLAB_SHAMASKCOL;Shadows
|
TP_LOCALLAB_SHAMASKCOL;Shadows
|
||||||
TP_LOCALLAB_SHAPETYPE;RT-spot shape
|
TP_LOCALLAB_SHAPETYPE;RT-spot shape
|
||||||
TP_LOCALLAB_SHAPE_TOOLTIP;”Ellipse” is the normal mode.\n “Rectangle” can be used in certain cases, for example to work in full-image mode by placing the delimiters outside the preview area. In this case, set transition = 100.\n\nFuture developments will include polygon shapes and Bezier curves.
|
TP_LOCALLAB_SHAPE_TOOLTIP;”Ellipse” is the normal mode.\n “Rectangle” can be used in certain cases, for example to work in full-image mode by placing the delimiters outside the preview area. In this case, set transition = 100.\n\nFuture developments will include polygon shapes and Bezier curves.
|
||||||
@ -3024,7 +3022,7 @@ TP_LOCALLAB_TRANSIT_TOOLTIP;Adjust smoothness of transition between affected and
|
|||||||
TP_LOCALLAB_TRANSMISSIONGAIN;Transmission gain
|
TP_LOCALLAB_TRANSMISSIONGAIN;Transmission gain
|
||||||
TP_LOCALLAB_TRANSMISSIONMAP;Transmission map
|
TP_LOCALLAB_TRANSMISSIONMAP;Transmission map
|
||||||
TP_LOCALLAB_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positive values (max).\nOrdinate: amplification or reduction.\nYou can adjust this curve to change the Transmission and reduce artifacts
|
TP_LOCALLAB_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positive values (max).\nOrdinate: amplification or reduction.\nYou can adjust this curve to change the Transmission and reduce artifacts
|
||||||
TP_LOCALLAB_USEMASK;Use mask
|
//TP_LOCALLAB_USEMASK;Use mask
|
||||||
TP_LOCALLAB_VART;Variance (contrast)
|
TP_LOCALLAB_VART;Variance (contrast)
|
||||||
TP_LOCALLAB_VIBRANCE;Vibrance & Warm/Cool
|
TP_LOCALLAB_VIBRANCE;Vibrance & Warm/Cool
|
||||||
TP_LOCALLAB_VIBRA_TOOLTIP;Adjusts vibrance (essentially the same as the global adjustment).\nCarries out the equivalent of a white-balance adjustment using a CIECAM algorithm.
|
TP_LOCALLAB_VIBRA_TOOLTIP;Adjusts vibrance (essentially the same as the global adjustment).\nCarries out the equivalent of a white-balance adjustment using a CIECAM algorithm.
|
||||||
|
@ -659,7 +659,7 @@ struct local_params {
|
|||||||
bool activspot;
|
bool activspot;
|
||||||
float thrlow;
|
float thrlow;
|
||||||
float thrhigh;
|
float thrhigh;
|
||||||
bool usemask;
|
// bool usemask;
|
||||||
float lnoiselow;
|
float lnoiselow;
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -780,7 +780,7 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
|
|||||||
|
|
||||||
lp.thrlow = locallab.spots.at(sp).levelthrlow;
|
lp.thrlow = locallab.spots.at(sp).levelthrlow;
|
||||||
lp.thrhigh = locallab.spots.at(sp).levelthr;
|
lp.thrhigh = locallab.spots.at(sp).levelthr;
|
||||||
lp.usemask = locallab.spots.at(sp).usemask;
|
// lp.usemask = locallab.spots.at(sp).usemask;
|
||||||
lp.lnoiselow = locallab.spots.at(sp).lnoiselow;
|
lp.lnoiselow = locallab.spots.at(sp).lnoiselow;
|
||||||
|
|
||||||
// printf("llColorMask=%i lllcMask=%i llExpMask=%i llSHMask=%i llcbMask=%i llretiMask=%i lltmMask=%i llblMask=%i llvibMask=%i\n", llColorMask, lllcMask, llExpMask, llSHMask, llcbMask, llretiMask, lltmMask, llblMask, llvibMask);
|
// printf("llColorMask=%i lllcMask=%i llExpMask=%i llSHMask=%i llcbMask=%i llretiMask=%i lltmMask=%i llblMask=%i llvibMask=%i\n", llColorMask, lllcMask, llExpMask, llSHMask, llcbMask, llretiMask, lltmMask, llblMask, llvibMask);
|
||||||
|
@ -1007,8 +1007,8 @@ enum ProcEventCode {
|
|||||||
EvlocallabwavCurvehue = 981,
|
EvlocallabwavCurvehue = 981,
|
||||||
Evlocallablevelthr = 982,
|
Evlocallablevelthr = 982,
|
||||||
Evlocallablevelthrlow = 983,
|
Evlocallablevelthrlow = 983,
|
||||||
Evlocallabusemask1 = 984,
|
// Evlocallabusemask1 = 984,
|
||||||
Evlocallablnoiselow = 985,
|
Evlocallablnoiselow = 984,
|
||||||
NUMOFEVENTS
|
NUMOFEVENTS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3307,7 +3307,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
|
|||||||
quamethod("cons"),
|
quamethod("cons"),
|
||||||
blurMethod("norm"),
|
blurMethod("norm"),
|
||||||
medMethod("33"),
|
medMethod("33"),
|
||||||
usemask(false),
|
// usemask(false),
|
||||||
levelthr(40.),
|
levelthr(40.),
|
||||||
lnoiselow(1.),
|
lnoiselow(1.),
|
||||||
levelthrlow(12.),
|
levelthrlow(12.),
|
||||||
@ -4350,7 +4350,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
|
|||||||
&& chroMethod == other.chroMethod
|
&& chroMethod == other.chroMethod
|
||||||
&& quamethod == other.quamethod
|
&& quamethod == other.quamethod
|
||||||
&& blurMethod == other.blurMethod
|
&& blurMethod == other.blurMethod
|
||||||
&& usemask == other.usemask
|
// && usemask == other.usemask
|
||||||
&& levelthr == other.levelthr
|
&& levelthr == other.levelthr
|
||||||
&& lnoiselow == other.lnoiselow
|
&& lnoiselow == other.lnoiselow
|
||||||
&& levelthrlow == other.levelthrlow
|
&& levelthrlow == other.levelthrlow
|
||||||
@ -5936,7 +5936,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
|
|||||||
saveToKeyfile(!pedited || spot_edited->chroMethod, "Locallab", "ChroMethod_" + index_str, spot.chroMethod, keyFile);
|
saveToKeyfile(!pedited || spot_edited->chroMethod, "Locallab", "ChroMethod_" + index_str, spot.chroMethod, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->quamethod, "Locallab", "QuaMethod_" + index_str, spot.quamethod, keyFile);
|
saveToKeyfile(!pedited || spot_edited->quamethod, "Locallab", "QuaMethod_" + index_str, spot.quamethod, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->blurMethod, "Locallab", "BlurMethod_" + index_str, spot.blurMethod, keyFile);
|
saveToKeyfile(!pedited || spot_edited->blurMethod, "Locallab", "BlurMethod_" + index_str, spot.blurMethod, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->usemask, "Locallab", "Usemaskb_" + index_str, spot.usemask, keyFile);
|
// saveToKeyfile(!pedited || spot_edited->usemask, "Locallab", "Usemaskb_" + index_str, spot.usemask, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->levelthr, "Locallab", "Levelthr_" + index_str, spot.levelthr, keyFile);
|
saveToKeyfile(!pedited || spot_edited->levelthr, "Locallab", "Levelthr_" + index_str, spot.levelthr, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->lnoiselow, "Locallab", "Lnoiselow_" + index_str, spot.lnoiselow, keyFile);
|
saveToKeyfile(!pedited || spot_edited->lnoiselow, "Locallab", "Lnoiselow_" + index_str, spot.lnoiselow, keyFile);
|
||||||
saveToKeyfile(!pedited || spot_edited->levelthrlow, "Locallab", "Levelthrlow_" + index_str, spot.levelthrlow, keyFile);
|
saveToKeyfile(!pedited || spot_edited->levelthrlow, "Locallab", "Levelthrlow_" + index_str, spot.levelthrlow, keyFile);
|
||||||
@ -7738,7 +7738,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
|
|||||||
assignFromKeyfile(keyFile, "Locallab", "ChroMethod_" + index_str, pedited, spot.chroMethod, spotEdited.chroMethod);
|
assignFromKeyfile(keyFile, "Locallab", "ChroMethod_" + index_str, pedited, spot.chroMethod, spotEdited.chroMethod);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "QuaMethod_" + index_str, pedited, spot.quamethod, spotEdited.quamethod);
|
assignFromKeyfile(keyFile, "Locallab", "QuaMethod_" + index_str, pedited, spot.quamethod, spotEdited.quamethod);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "BlurMethod_" + index_str, pedited, spot.blurMethod, spotEdited.blurMethod);
|
assignFromKeyfile(keyFile, "Locallab", "BlurMethod_" + index_str, pedited, spot.blurMethod, spotEdited.blurMethod);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "Usemaskb_" + index_str, pedited, spot.usemask, spotEdited.usemask);
|
// assignFromKeyfile(keyFile, "Locallab", "Usemaskb_" + index_str, pedited, spot.usemask, spotEdited.usemask);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "Levelthr_" + index_str, pedited, spot.levelthr, spotEdited.levelthr);
|
assignFromKeyfile(keyFile, "Locallab", "Levelthr_" + index_str, pedited, spot.levelthr, spotEdited.levelthr);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "Lnoiselow_" + index_str, pedited, spot.lnoiselow, spotEdited.lnoiselow);
|
assignFromKeyfile(keyFile, "Locallab", "Lnoiselow_" + index_str, pedited, spot.lnoiselow, spotEdited.lnoiselow);
|
||||||
assignFromKeyfile(keyFile, "Locallab", "Levelthrlow_" + index_str, pedited, spot.levelthrlow, spotEdited.levelthrlow);
|
assignFromKeyfile(keyFile, "Locallab", "Levelthrlow_" + index_str, pedited, spot.levelthrlow, spotEdited.levelthrlow);
|
||||||
|
@ -1214,7 +1214,7 @@ struct LocallabParams {
|
|||||||
Glib::ustring quamethod; // cons agre
|
Glib::ustring quamethod; // cons agre
|
||||||
Glib::ustring blurMethod; // norm, inv
|
Glib::ustring blurMethod; // norm, inv
|
||||||
Glib::ustring medMethod; // none, 33, 55, 77, 99
|
Glib::ustring medMethod; // none, 33, 55, 77, 99
|
||||||
bool usemask;
|
// bool usemask;
|
||||||
double levelthr;
|
double levelthr;
|
||||||
double lnoiselow;
|
double lnoiselow;
|
||||||
double levelthrlow;
|
double levelthrlow;
|
||||||
|
@ -1011,7 +1011,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
|
|||||||
LUMINANCECURVE, //EvlocallabwavCurvehue
|
LUMINANCECURVE, //EvlocallabwavCurvehue
|
||||||
LUMINANCECURVE, // Evlocallablevelthr
|
LUMINANCECURVE, // Evlocallablevelthr
|
||||||
LUMINANCECURVE, // Evlocallablevelthrlow
|
LUMINANCECURVE, // Evlocallablevelthrlow
|
||||||
LUMINANCECURVE, //Evlocallabusemask1
|
// LUMINANCECURVE, //Evlocallabusemask1
|
||||||
LUMINANCECURVE // Evlocallablnoiselow
|
LUMINANCECURVE // Evlocallablnoiselow
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -5761,7 +5761,7 @@ LocallabBlur::LocallabBlur():
|
|||||||
LocalcurveEditorwavden(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_WAVDEN"))),
|
LocalcurveEditorwavden(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_WAVDEN"))),
|
||||||
wavshapeden(static_cast<FlatCurveEditor*>(LocalcurveEditorwavden->addCurve(CT_Flat, "", nullptr, false, false))),
|
wavshapeden(static_cast<FlatCurveEditor*>(LocalcurveEditorwavden->addCurve(CT_Flat, "", nullptr, false, false))),
|
||||||
expdenoise1(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI1_EXP")))),
|
expdenoise1(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI1_EXP")))),
|
||||||
usemask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_USEMASK")))),
|
// usemask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_USEMASK")))),
|
||||||
lnoiselow(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLNOISELOW"), 0.7, 2., 0.01, 1.))),
|
lnoiselow(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLNOISELOW"), 0.7, 2., 0.01, 1.))),
|
||||||
levelthr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLCTHR"), 10., 100., 1., 40.))),
|
levelthr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLCTHR"), 10., 100., 1., 40.))),
|
||||||
levelthrlow(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLCTHRLOW"), 1., 100., 1., 12.))),
|
levelthrlow(Gtk::manage(new Adjuster(M("TP_LOCALLAB_MASKLCTHRLOW"), 1., 100., 1., 12.))),
|
||||||
@ -5826,7 +5826,7 @@ LocallabBlur::LocallabBlur():
|
|||||||
blMethodConn = blMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabBlur::blMethodChanged));
|
blMethodConn = blMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabBlur::blMethodChanged));
|
||||||
|
|
||||||
fftwblConn = fftwbl->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::fftwblChanged));
|
fftwblConn = fftwbl->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::fftwblChanged));
|
||||||
usemaskConn = usemask->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::usemaskChanged));
|
// usemaskConn = usemask->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::usemaskChanged));
|
||||||
invblConn = invbl->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::invblChanged));
|
invblConn = invbl->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::invblChanged));
|
||||||
|
|
||||||
radius->setAdjusterListener(this);
|
radius->setAdjusterListener(this);
|
||||||
@ -6136,6 +6136,7 @@ void LocallabBlur::updateAdviceTooltips(const bool showTooltips)
|
|||||||
quamethod->set_tooltip_markup(M("TP_LOCALLAB_DENOIQUA_TOOLTIP"));
|
quamethod->set_tooltip_markup(M("TP_LOCALLAB_DENOIQUA_TOOLTIP"));
|
||||||
wavshapeden->setTooltip(M("TP_LOCALLAB_WASDEN_TOOLTIP"));
|
wavshapeden->setTooltip(M("TP_LOCALLAB_WASDEN_TOOLTIP"));
|
||||||
wavhue->setTooltip(M("TP_LOCALLAB_WAVHUE_TOOLTIP"));
|
wavhue->setTooltip(M("TP_LOCALLAB_WAVHUE_TOOLTIP"));
|
||||||
|
expdenoise1->set_tooltip_markup(M("TP_LOCALLAB_MASKLC_TOOLTIP"));
|
||||||
LocalcurveEditorwavden->setTooltip(M("TP_LOCALLAB_WASDEN_TOOLTIP"));
|
LocalcurveEditorwavden->setTooltip(M("TP_LOCALLAB_WASDEN_TOOLTIP"));
|
||||||
noiselequal->set_tooltip_text(M("TP_LOCALLAB_DENOIEQUAL_TOOLTIP"));
|
noiselequal->set_tooltip_text(M("TP_LOCALLAB_DENOIEQUAL_TOOLTIP"));
|
||||||
noiselumdetail->set_tooltip_text(M("TP_LOCALLAB_DENOILUMDETAIL_TOOLTIP"));
|
noiselumdetail->set_tooltip_text(M("TP_LOCALLAB_DENOILUMDETAIL_TOOLTIP"));
|
||||||
@ -6168,7 +6169,6 @@ void LocallabBlur::updateAdviceTooltips(const bool showTooltips)
|
|||||||
lapmaskbl->set_tooltip_text(M("TP_LOCALLAB_LAPRAD1_TOOLTIP"));
|
lapmaskbl->set_tooltip_text(M("TP_LOCALLAB_LAPRAD1_TOOLTIP"));
|
||||||
csThresholdblur->set_tooltip_text(M("TP_LOCALLAB_WAVEMASK_LEVEL_TOOLTIP"));
|
csThresholdblur->set_tooltip_text(M("TP_LOCALLAB_WAVEMASK_LEVEL_TOOLTIP"));
|
||||||
sensiden->set_tooltip_text(M("TP_LOCALLAB_SENSI_TOOLTIP"));
|
sensiden->set_tooltip_text(M("TP_LOCALLAB_SENSI_TOOLTIP"));
|
||||||
expdenoise1->set_tooltip_markup(M("TP_LOCALLAB_MASKLC_TOOLTIP"));
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
expblnoise->set_tooltip_markup("");
|
expblnoise->set_tooltip_markup("");
|
||||||
@ -6184,6 +6184,8 @@ void LocallabBlur::updateAdviceTooltips(const bool showTooltips)
|
|||||||
epsbl->set_tooltip_text("");
|
epsbl->set_tooltip_text("");
|
||||||
blurMethod->set_tooltip_markup("");
|
blurMethod->set_tooltip_markup("");
|
||||||
quamethod->set_tooltip_markup("");
|
quamethod->set_tooltip_markup("");
|
||||||
|
wavhue->setTooltip("");
|
||||||
|
expdenoise1->set_tooltip_markup("");
|
||||||
LocalcurveEditorwavden->setTooltip("");
|
LocalcurveEditorwavden->setTooltip("");
|
||||||
noiselequal->set_tooltip_text("");
|
noiselequal->set_tooltip_text("");
|
||||||
noiselumdetail->set_tooltip_text("");
|
noiselumdetail->set_tooltip_text("");
|
||||||
@ -6218,9 +6220,7 @@ void LocallabBlur::updateAdviceTooltips(const bool showTooltips)
|
|||||||
shadmaskbl->set_tooltip_text("");
|
shadmaskbl->set_tooltip_text("");
|
||||||
shadmaskblsha->set_tooltip_text("");
|
shadmaskblsha->set_tooltip_text("");
|
||||||
csThresholdblur->set_tooltip_text("");
|
csThresholdblur->set_tooltip_text("");
|
||||||
wavhue->setTooltip("");
|
|
||||||
sensiden->set_tooltip_text("");
|
sensiden->set_tooltip_text("");
|
||||||
expdenoise1->set_tooltip_markup("");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -6239,7 +6239,7 @@ void LocallabBlur::disableListener()
|
|||||||
|
|
||||||
blMethodConn.block(true);
|
blMethodConn.block(true);
|
||||||
fftwblConn.block(true);
|
fftwblConn.block(true);
|
||||||
usemaskConn.block(true);
|
// usemaskConn.block(true);
|
||||||
invblConn.block(true);
|
invblConn.block(true);
|
||||||
medMethodConn.block(true);
|
medMethodConn.block(true);
|
||||||
blurMethodConn.block(true);
|
blurMethodConn.block(true);
|
||||||
@ -6258,7 +6258,7 @@ void LocallabBlur::enableListener()
|
|||||||
|
|
||||||
blMethodConn.block(false);
|
blMethodConn.block(false);
|
||||||
fftwblConn.block(false);
|
fftwblConn.block(false);
|
||||||
usemaskConn.block(false);
|
// usemaskConn.block(false);
|
||||||
invblConn.block(false);
|
invblConn.block(false);
|
||||||
medMethodConn.block(false);
|
medMethodConn.block(false);
|
||||||
blurMethodConn.block(false);
|
blurMethodConn.block(false);
|
||||||
@ -6297,7 +6297,7 @@ void LocallabBlur::read(const rtengine::procparams::ProcParams* pp, const Params
|
|||||||
}
|
}
|
||||||
|
|
||||||
fftwbl->set_active(spot.fftwbl);
|
fftwbl->set_active(spot.fftwbl);
|
||||||
usemask->set_active(spot.usemask);
|
// usemask->set_active(spot.usemask);
|
||||||
invbl->set_active(spot.invbl);
|
invbl->set_active(spot.invbl);
|
||||||
radius->setValue(spot.radius);
|
radius->setValue(spot.radius);
|
||||||
strength->setValue(spot.strength);
|
strength->setValue(spot.strength);
|
||||||
@ -6422,7 +6422,7 @@ void LocallabBlur::write(rtengine::procparams::ProcParams* pp, ParamsEdited* ped
|
|||||||
}
|
}
|
||||||
|
|
||||||
spot.fftwbl = fftwbl->get_active();
|
spot.fftwbl = fftwbl->get_active();
|
||||||
spot.usemask = usemask->get_active();
|
// spot.usemask = usemask->get_active();
|
||||||
spot.invbl = invbl->get_active();
|
spot.invbl = invbl->get_active();
|
||||||
spot.radius = radius->getValue();
|
spot.radius = radius->getValue();
|
||||||
spot.strength = strength->getIntValue();
|
spot.strength = strength->getIntValue();
|
||||||
@ -6952,7 +6952,7 @@ void LocallabBlur::convertParamToSimple()
|
|||||||
levelthr->setValue(defSpot.levelthr);
|
levelthr->setValue(defSpot.levelthr);
|
||||||
lnoiselow->setValue(defSpot.lnoiselow);
|
lnoiselow->setValue(defSpot.lnoiselow);
|
||||||
levelthrlow->setValue(defSpot.levelthrlow);
|
levelthrlow->setValue(defSpot.levelthrlow);
|
||||||
usemask->set_active(defSpot.usemask);
|
// usemask->set_active(defSpot.usemask);
|
||||||
|
|
||||||
// Enable all listeners
|
// Enable all listeners
|
||||||
enableListener();
|
enableListener();
|
||||||
@ -7061,7 +7061,7 @@ void LocallabBlur::fftwblChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
void LocallabBlur::usemaskChanged()
|
void LocallabBlur::usemaskChanged()
|
||||||
{
|
{
|
||||||
if (isLocActivated && exp->getEnabled()) {
|
if (isLocActivated && exp->getEnabled()) {
|
||||||
@ -7076,7 +7076,7 @@ void LocallabBlur::usemaskChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
void LocallabBlur::invblChanged()
|
void LocallabBlur::invblChanged()
|
||||||
{
|
{
|
||||||
const LocallabParams::LocallabSpot defSpot;
|
const LocallabParams::LocallabSpot defSpot;
|
||||||
|
@ -664,7 +664,7 @@ private:
|
|||||||
CurveEditorGroup* const LocalcurveEditorwavden;
|
CurveEditorGroup* const LocalcurveEditorwavden;
|
||||||
FlatCurveEditor* const wavshapeden;
|
FlatCurveEditor* const wavshapeden;
|
||||||
MyExpander* const expdenoise1;
|
MyExpander* const expdenoise1;
|
||||||
Gtk::CheckButton* const usemask;
|
// Gtk::CheckButton* const usemask;
|
||||||
Adjuster* const lnoiselow;
|
Adjuster* const lnoiselow;
|
||||||
Adjuster* const levelthr;
|
Adjuster* const levelthr;
|
||||||
Adjuster* const levelthrlow;
|
Adjuster* const levelthrlow;
|
||||||
|
@ -1284,7 +1284,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
|||||||
locallab.spots.at(j).chroMethod = locallab.spots.at(j).chroMethod && pSpot.chroMethod == otherSpot.chroMethod;
|
locallab.spots.at(j).chroMethod = locallab.spots.at(j).chroMethod && pSpot.chroMethod == otherSpot.chroMethod;
|
||||||
locallab.spots.at(j).quamethod = locallab.spots.at(j).quamethod && pSpot.quamethod == otherSpot.quamethod;
|
locallab.spots.at(j).quamethod = locallab.spots.at(j).quamethod && pSpot.quamethod == otherSpot.quamethod;
|
||||||
locallab.spots.at(j).blurMethod = locallab.spots.at(j).blurMethod && pSpot.blurMethod == otherSpot.blurMethod;
|
locallab.spots.at(j).blurMethod = locallab.spots.at(j).blurMethod && pSpot.blurMethod == otherSpot.blurMethod;
|
||||||
locallab.spots.at(j).usemask = locallab.spots.at(j).usemask && pSpot.usemask == otherSpot.usemask;
|
// locallab.spots.at(j).usemask = locallab.spots.at(j).usemask && pSpot.usemask == otherSpot.usemask;
|
||||||
locallab.spots.at(j).levelthr = locallab.spots.at(j).levelthr && pSpot.levelthr == otherSpot.levelthr;
|
locallab.spots.at(j).levelthr = locallab.spots.at(j).levelthr && pSpot.levelthr == otherSpot.levelthr;
|
||||||
locallab.spots.at(j).lnoiselow = locallab.spots.at(j).lnoiselow && pSpot.lnoiselow == otherSpot.lnoiselow;
|
locallab.spots.at(j).lnoiselow = locallab.spots.at(j).lnoiselow && pSpot.lnoiselow == otherSpot.lnoiselow;
|
||||||
locallab.spots.at(j).levelthrlow = locallab.spots.at(j).levelthrlow && pSpot.levelthrlow == otherSpot.levelthrlow;
|
locallab.spots.at(j).levelthrlow = locallab.spots.at(j).levelthrlow && pSpot.levelthrlow == otherSpot.levelthrlow;
|
||||||
@ -4056,9 +4056,9 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
|||||||
toEdit.locallab.spots.at(i).blurMethod = mods.locallab.spots.at(i).blurMethod;
|
toEdit.locallab.spots.at(i).blurMethod = mods.locallab.spots.at(i).blurMethod;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (locallab.spots.at(i).usemask) {
|
// if (locallab.spots.at(i).usemask) {
|
||||||
toEdit.locallab.spots.at(i).usemask = mods.locallab.spots.at(i).usemask;
|
// toEdit.locallab.spots.at(i).usemask = mods.locallab.spots.at(i).usemask;
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (locallab.spots.at(i).levelthr) {
|
if (locallab.spots.at(i).levelthr) {
|
||||||
toEdit.locallab.spots.at(i).levelthr = mods.locallab.spots.at(i).levelthr;
|
toEdit.locallab.spots.at(i).levelthr = mods.locallab.spots.at(i).levelthr;
|
||||||
@ -6587,7 +6587,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
|
|||||||
blMethod(v),
|
blMethod(v),
|
||||||
chroMethod(v),
|
chroMethod(v),
|
||||||
quamethod(v),
|
quamethod(v),
|
||||||
usemask(v),
|
// usemask(v),
|
||||||
levelthr(v),
|
levelthr(v),
|
||||||
lnoiselow(v),
|
lnoiselow(v),
|
||||||
levelthrlow(v),
|
levelthrlow(v),
|
||||||
@ -7106,7 +7106,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
|
|||||||
blMethod = v;
|
blMethod = v;
|
||||||
chroMethod = v;
|
chroMethod = v;
|
||||||
quamethod = v;
|
quamethod = v;
|
||||||
usemask = v;
|
// usemask = v;
|
||||||
levelthr = v;
|
levelthr = v;
|
||||||
lnoiselow = v;
|
lnoiselow = v;
|
||||||
levelthrlow = v;
|
levelthrlow = v;
|
||||||
|
@ -620,7 +620,7 @@ public:
|
|||||||
bool blMethod;
|
bool blMethod;
|
||||||
bool chroMethod;
|
bool chroMethod;
|
||||||
bool quamethod;
|
bool quamethod;
|
||||||
bool usemask;
|
// bool usemask;
|
||||||
bool levelthr;
|
bool levelthr;
|
||||||
bool lnoiselow;
|
bool lnoiselow;
|
||||||
bool levelthrlow;
|
bool levelthrlow;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user