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

Merge branch 'newlocallab2' of https://github.com/Beep6581/RawTherapee into newlocallab2

Browse Source
This commit is contained in:
Ingo Weyrich 2020-06-02 19:46:27 +02:00
commit 9c3039b394
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtdata/languages/default
View File

@ -2466,14 +2466,14 @@ TP_LOCALLAB_GAMMASKCOL;Gamma mask
TP_LOCALLAB_GAMSH;Gamma TP_LOCALLAB_GAMSH;Gamma
TP_LOCALLAB_GRADANG;Gradient angle TP_LOCALLAB_GRADANG;Gradient angle
TP_LOCALLAB_GRADANG_TOOLTIP;Rotation angle in degrees : -180 0 +180 TP_LOCALLAB_GRADANG_TOOLTIP;Rotation angle in degrees : -180 0 +180
TP_LOCALLAB_GRADFRA;Graduated Filter TP_LOCALLAB_GRADFRA;Graduated Filter Mask
TP_LOCALLAB_GRADGEN_TOOLTIP;Graduated filter is supplied with Color and Light & merge file, Exposure & mask, Shadows Highlight, Vibrance, Encoding log.\n\nVibrance, Color and Light & merge file, are provided with GF luminance, chrominance, Hue.\nFeather is located in settings. TP_LOCALLAB_GRADGEN_TOOLTIP;Graduated filter is supplied with Color and Light & merge file, Exposure & mask, Shadows Highlight, Vibrance, Encoding log.\n\nVibrance, Color and Light & merge file, are provided with GF luminance, chrominance, Hue.\nFeather is located in settings.
TP_LOCALLAB_GRADLOGFRA;Graduated Filter Luminance TP_LOCALLAB_GRADLOGFRA;Graduated Filter Luminance
TP_LOCALLAB_GRADSTR;Gradient strength TP_LOCALLAB_GRADSTR;Gradient strength
TP_LOCALLAB_GRADSTRAB_TOOLTIP;Filter chroma strength TP_LOCALLAB_GRADSTRAB_TOOLTIP;Filter chroma strength
TP_LOCALLAB_GRADSTRCHRO;Gradient strength Chrominance TP_LOCALLAB_GRADSTRCHRO;Gradient strength Chrominance
TP_LOCALLAB_GRADSTRHUE2;Gradient strength Hue TP_LOCALLAB_GRADSTRHUE2;Gradient strength Hue
TP_LOCALLAB_GRADSTRHUE;Gradient strength Hue (merge file) TP_LOCALLAB_GRADSTRHUE;Gradient strength Hue
TP_LOCALLAB_GRADSTRHUE_TOOLTIP;Filter Hue strength TP_LOCALLAB_GRADSTRHUE_TOOLTIP;Filter Hue strength
TP_LOCALLAB_GRADSTRLUM;Gradient strength Luminance TP_LOCALLAB_GRADSTRLUM;Gradient strength Luminance
TP_LOCALLAB_GRADSTR_TOOLTIP;Filter strength in stops TP_LOCALLAB_GRADSTR_TOOLTIP;Filter strength in stops
@ -2729,7 +2729,8 @@ TP_LOCALLAB_SOFTRADIUSCOL;Soft radius
TP_LOCALLAB_SOFTRETI;Reduce artifact ΔE TP_LOCALLAB_SOFTRETI;Reduce artifact ΔE
TP_LOCALLAB_SOFTRETI_TOOLTIP;Take into account deltaE to improve Transmission map TP_LOCALLAB_SOFTRETI_TOOLTIP;Take into account deltaE to improve Transmission map
TP_LOCALLAB_SOURCE_GRAY;Value TP_LOCALLAB_SOURCE_GRAY;Value
TP_LOCALLAB_SPECIAL;Special use of RGB curves TP_LOCALLAB_SPECIAL;Special use of RGB curves
TP_LOCALLAB_SPECIAL_TOOLTIP;Only for this RGB curve, disabled (or reduce effects) of Scope, mask...for example, if you want to have a negative effect.
TP_LOCALLAB_SPOTNAME;Control Spot # TP_LOCALLAB_SPOTNAME;Control Spot #
TP_LOCALLAB_STD;Standard TP_LOCALLAB_STD;Standard
TP_LOCALLAB_STR;Strength TP_LOCALLAB_STR;Strength

9
rtengine/iplocallab.cc
View File

@ -5208,7 +5208,6 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage * bufexpo
gaussianBlur(originalmask->b, origblurmask->b, bfw, bfh, radius); gaussianBlur(originalmask->b, origblurmask->b, bfw, bfh, radius);
} }
} }
if (lp.equtm && senstype == 8) //normalize luminance for Tone mapping , at this place we can use for others senstype! if (lp.equtm && senstype == 8) //normalize luminance for Tone mapping , at this place we can use for others senstype!
{ {
float *datain = new float[bfh * bfw]; float *datain = new float[bfh * bfw];
@ -6501,7 +6500,7 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag
for (int y = ystart; y < yend; y++) for (int y = ystart; y < yend; y++)
for (int x = xstart; x < xend; x++) { for (int x = xstart; x < xend; x++) {
datain[(y - ystart) * bfw + (x - xstart)] = original->L[y][x]; datain[(y - ystart) * bfw + (x - xstart)] = original->L[y][x];
data[(y - ystart)* bfw + (x - xstart)] = bufexporig->L[y - ystart][x - xstart]; data[(y - ystart)* bfw + (x - xstart)] = bufexpfin->L[y - ystart][x - xstart];
} }
normalize_mean_dt(data, datain, bfh * bfw, 1.f, 1.f); normalize_mean_dt(data, datain, bfh * bfw, 1.f, 1.f);
@ -6511,7 +6510,7 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag
for (int y = ystart; y < yend; y++) for (int y = ystart; y < yend; y++)
for (int x = xstart; x < xend; x++) { for (int x = xstart; x < xend; x++) {
bufexporig->L[y - ystart][x - xstart] = data[(y - ystart) * bfw + x - xstart]; bufexpfin->L[y - ystart][x - xstart] = data[(y - ystart) * bfw + x - xstart];
} }
delete [] datain; delete [] datain;
@ -6539,8 +6538,10 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag
gaussianBlur(origblur->b, origblur->b, bfw, bfh, radius); gaussianBlur(origblur->b, origblur->b, bfw, bfh, radius);
} }
//choice between original and mask //choice between original and mask
const LabImage *maskptr = usemaskexp ? origblurmask.get() : origblur.get(); const LabImage *maskptr = usemaskall ? origblurmask.get() : origblur.get();
//parameters deltaE //parameters deltaE
const int limscope = 80; const int limscope = 80;

2
rtgui/locallabtools.cc
View File

@ -901,6 +901,7 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips)
maskHCurveEditorG->set_tooltip_text(M("TP_LOCALLAB_HHMASK_TOOLTIP")); maskHCurveEditorG->set_tooltip_text(M("TP_LOCALLAB_HHMASK_TOOLTIP"));
mask2CurveEditorGwav->set_tooltip_text(M("TP_LOCALLAB_WAVMASK_TOOLTIP")); mask2CurveEditorGwav->set_tooltip_text(M("TP_LOCALLAB_WAVMASK_TOOLTIP"));
mask2CurveEditorG->set_tooltip_text(M("TP_LOCALLAB_CONTRASTCURVMASK_TOOLTIP")); mask2CurveEditorG->set_tooltip_text(M("TP_LOCALLAB_CONTRASTCURVMASK_TOOLTIP"));
special->set_tooltip_text(M("TP_LOCALLAB_SPECIAL_TOOLTIP"));
} else { } else {
exp->set_tooltip_text(""); exp->set_tooltip_text("");
lightness->set_tooltip_text(""); lightness->set_tooltip_text("");
@ -928,6 +929,7 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips)
maskHCurveEditorG->set_tooltip_text(M("")); maskHCurveEditorG->set_tooltip_text(M(""));
mask2CurveEditorGwav->set_tooltip_text(M("")); mask2CurveEditorGwav->set_tooltip_text(M(""));
mask2CurveEditorG->set_tooltip_text(M("")); mask2CurveEditorG->set_tooltip_text(M(""));
special->set_tooltip_text(M(""));
} }
} }

1
rtgui/locallabtools2.cc
View File

@ -1765,6 +1765,7 @@ LocallabSharp::LocallabSharp():
showmasksharMethod->append(M("TP_LOCALLAB_SHOWMNONE")); showmasksharMethod->append(M("TP_LOCALLAB_SHOWMNONE"));
showmasksharMethod->append(M("TP_LOCALLAB_SHOWMODIF")); showmasksharMethod->append(M("TP_LOCALLAB_SHOWMODIF"));
showmasksharMethod->append(M("TP_LOCALLAB_SHOWREF"));
showmasksharMethod->set_active(0); showmasksharMethod->set_active(0);
showmasksharMethod->set_tooltip_markup(M("TP_LOCALLAB_SHOWMASKCOL_TOOLTIP")); showmasksharMethod->set_tooltip_markup(M("TP_LOCALLAB_SHOWMASKCOL_TOOLTIP"));
showmasksharMethodConn = showmasksharMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabSharp::showmasksharMethodChanged)); showmasksharMethodConn = showmasksharMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabSharp::showmasksharMethodChanged));