From 2b4fcfe0e77857859a491ef803cc662098895b59 Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 08:32:05 +0200 Subject: [PATCH 1/6] Reenable preview deltaE sharp --- rtgui/locallabtools2.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 853624050..0b0e8b228 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -1765,6 +1765,7 @@ LocallabSharp::LocallabSharp(): showmasksharMethod->append(M("TP_LOCALLAB_SHOWMNONE")); showmasksharMethod->append(M("TP_LOCALLAB_SHOWMODIF")); + showmasksharMethod->append(M("TP_LOCALLAB_SHOWREF")); showmasksharMethod->set_active(0); showmasksharMethod->set_tooltip_markup(M("TP_LOCALLAB_SHOWMASKCOL_TOOLTIP")); showmasksharMethodConn = showmasksharMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabSharp::showmasksharMethodChanged)); From e19dad80c11be6432c33010102f457ca8aa3e4f1 Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 14:29:32 +0200 Subject: [PATCH 2/6] Fixed bug mask when merge = 0 --- rtengine/iplocallab.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 5540ec187..4d00048f4 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -6539,8 +6539,10 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag gaussianBlur(origblur->b, origblur->b, bfw, bfh, radius); } + + //choice between original and mask - const LabImage *maskptr = usemaskexp ? origblurmask.get() : origblur.get(); + const LabImage *maskptr = usemaskall ? origblurmask.get() : origblur.get(); //parameters deltaE const int limscope = 80; From a577679fe9ddd8601d6d1b436f28099473d233cf Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 15:46:36 +0200 Subject: [PATCH 3/6] Adde tooltip rgb curve special --- rtdata/languages/default | 3 ++- rtgui/locallabtools.cc | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 99768a559..7a3e5d9c6 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2729,7 +2729,8 @@ TP_LOCALLAB_SOFTRADIUSCOL;Soft radius TP_LOCALLAB_SOFTRETI;Reduce artifact ΔE TP_LOCALLAB_SOFTRETI_TOOLTIP;Take into account deltaE to improve Transmission map 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_STD;Standard TP_LOCALLAB_STR;Strength diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 46fa4f052..4f781bde9 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -901,6 +901,7 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips) maskHCurveEditorG->set_tooltip_text(M("TP_LOCALLAB_HHMASK_TOOLTIP")); mask2CurveEditorGwav->set_tooltip_text(M("TP_LOCALLAB_WAVMASK_TOOLTIP")); mask2CurveEditorG->set_tooltip_text(M("TP_LOCALLAB_CONTRASTCURVMASK_TOOLTIP")); + special->set_tooltip_text(M("TP_LOCALLAB_SPECIAL_TOOLTIP")); } else { exp->set_tooltip_text(""); lightness->set_tooltip_text(""); @@ -928,6 +929,7 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips) maskHCurveEditorG->set_tooltip_text(M("")); mask2CurveEditorGwav->set_tooltip_text(M("")); mask2CurveEditorG->set_tooltip_text(M("")); + special->set_tooltip_text(M("")); } } From 53848f71983134191cae4e37f97facd22e50bbd6 Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 17:24:06 +0200 Subject: [PATCH 4/6] Change some labels --- rtdata/languages/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 7a3e5d9c6..cc50eb4eb 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2466,14 +2466,14 @@ TP_LOCALLAB_GAMMASKCOL;Gamma mask TP_LOCALLAB_GAMSH;Gamma TP_LOCALLAB_GRADANG;Gradient angle 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_GRADLOGFRA;Graduated Filter Luminance TP_LOCALLAB_GRADSTR;Gradient strength TP_LOCALLAB_GRADSTRAB_TOOLTIP;Filter chroma strength TP_LOCALLAB_GRADSTRCHRO;Gradient strength Chrominance 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_GRADSTRLUM;Gradient strength Luminance TP_LOCALLAB_GRADSTR_TOOLTIP;Filter strength in stops From 456b391866008249f2435217dc265873ca99ccbb Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 18:02:55 +0200 Subject: [PATCH 5/6] Fixed bug in tone mapping equalizer --- rtengine/iplocallab.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 4d00048f4..be624499e 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -5208,9 +5208,10 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage * bufexpo gaussianBlur(originalmask->b, origblurmask->b, bfw, bfh, radius); } } - +if(lp.equtm) {printf("equtm\n"); +} else printf("NON equtm\n"); if (lp.equtm && senstype == 8) //normalize luminance for Tone mapping , at this place we can use for others senstype! - { + { printf("OK equalize TM\n"); float *datain = new float[bfh * bfw]; float *data = new float[bfh * bfw]; @@ -6501,7 +6502,7 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag for (int y = ystart; y < yend; y++) for (int x = xstart; x < xend; 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); @@ -6511,7 +6512,7 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag for (int y = ystart; y < yend; y++) 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; From f79990090b25e65bbb915a7a35b412a4885206a9 Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 2 Jun 2020 18:07:03 +0200 Subject: [PATCH 6/6] Suppress unused code --- rtengine/iplocallab.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index be624499e..37fd892fb 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -5208,10 +5208,8 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage * bufexpo gaussianBlur(originalmask->b, origblurmask->b, bfw, bfh, radius); } } -if(lp.equtm) {printf("equtm\n"); -} else printf("NON equtm\n"); if (lp.equtm && senstype == 8) //normalize luminance for Tone mapping , at this place we can use for others senstype! - { printf("OK equalize TM\n"); + { float *datain = new float[bfh * bfw]; float *data = new float[bfh * bfw];