From 6abab61a6740b92976eb50842bdb8f00517ca69d Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 4 Jan 2016 12:32:31 +0100 Subject: [PATCH 1/5] Init newretinex --- rtdata/languages/default | 7 ++--- rtgui/retinex.cc | 57 +++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 8a43155c9..7cc23d133 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1686,10 +1686,11 @@ TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Va TP_RETINEX_GRADS;Strength gradient TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely. TP_RETINEX_LABEL;Retinex +TP_RETINEX_LABEL_MASK;Mask TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Low TP_RETINEX_MAP;Mask method -TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. +TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function (Radius, Method) to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. TP_RETINEX_MAP_NONE;None TP_RETINEX_MAP_CURV;Curve only TP_RETINEX_MAP_GAUS;Gaussian mask @@ -1697,7 +1698,7 @@ TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) TP_RETINEX_MEDIAN;Transmission median filter TP_RETINEX_METHOD;Method -TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights. +TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light.\nUniform = Equalize action.\nHigh = Reinforce high light.\nHighlights = Remove magenta in highlights. TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2 TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture. TP_RETINEX_NEIGHBOR;Radius @@ -1713,7 +1714,7 @@ TP_RETINEX_THRESHOLD;Threshold TP_RETINEX_THRESHOLD_TOOLTIP;Limits in/out.\nIn = image source,\nOut = image gauss. TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4 TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2 -TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma\nTm=Min TM=Max of transmission map. +TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma.\nTm=Min TM=Max of transmission map. TP_RETINEX_TRANSMISSION;Transmission map TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction. TP_RETINEX_UNIFORM;Uniform diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index fb69de3e3..e604d866f 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -175,7 +175,16 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), limd->set_tooltip_markup (M("TP_RETINEX_THRESHOLD_TOOLTIP")); baselog->set_tooltip_markup (M("TP_RETINEX_BASELOG_TOOLTIP")); + Gtk::Frame *p1Frame; + p1Frame = Gtk::manage (new Gtk::Frame(M("TP_RETINEX_LABEL_MASK")) ); + p1Frame->set_border_width(0); + p1Frame->set_label_align(0.025, 0.5); + Gtk::VBox *p1VBox; + p1VBox = Gtk::manage ( new Gtk::VBox()); + p1VBox->set_border_width(4); + p1VBox->set_spacing(2); + mapbox = Gtk::manage (new Gtk::HBox ()); labmap = Gtk::manage (new Gtk::Label (M("TP_RETINEX_MAP") + ":")); mapbox->pack_start (*labmap, Gtk::PACK_SHRINK, 1); @@ -288,29 +297,32 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), settingsVBox->pack_start (*limd); limd->show (); - settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); - - mapbox->pack_start(*mapMethod); - settingsVBox->pack_start(*mapbox); - - settingsVBox->pack_start (*curveEditormap, Gtk::PACK_SHRINK, 4); - curveEditormap->show(); - - settingsVBox->pack_start (*highlights); - highlights->show(); - settingsVBox->pack_start (*h_tonalwidth); - h_tonalwidth->show(); - settingsVBox->pack_start (*shadows); - shadows->show(); - settingsVBox->pack_start (*s_tonalwidth); - s_tonalwidth->show(); - settingsVBox->pack_start (*radius); - radius->show(); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); viewbox->pack_start(*viewMethod); - settingsVBox->pack_start(*viewbox); - + // settingsVBox->pack_start(*viewbox); + retinexVBox->pack_start(*viewbox); //settingsVBox->pack_start (*viewMethod); + + mapbox->pack_start(*mapMethod); + // settingsVBox->pack_start(*mapbox); + p1VBox->pack_start(*mapbox); + + p1VBox->pack_start (*curveEditormap, Gtk::PACK_SHRINK, 4); + curveEditormap->show(); + + p1VBox->pack_start (*highlights); + highlights->show(); + p1VBox->pack_start (*h_tonalwidth); + h_tonalwidth->show(); + p1VBox->pack_start (*shadows); + shadows->show(); + p1VBox->pack_start (*s_tonalwidth); + s_tonalwidth->show(); + p1VBox->pack_start (*radius); + radius->show(); + + // settingsVBox->pack_start (*highl); // highl->show (); @@ -320,7 +332,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), // settingsVBox->pack_start (*grbl); // grbl->show (); - settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); settingsVBox->pack_start( *transmissionCurveEditorG, Gtk::PACK_SHRINK, 2); transmissionCurveEditorG->show(); @@ -459,6 +471,9 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), } */ pack_start (*retinexVBox); + p1Frame->add(*p1VBox); + pack_start (*p1Frame, Gtk::PACK_EXPAND_WIDGET, 4); + pack_start (*expsettings); pack_start (*neutrHBox); From 6420467006ef0b8b4a1eee54b55127da1fdda5ef Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 4 Jan 2016 14:09:39 +0100 Subject: [PATCH 2/5] Fixed also issue3026 --- rtdata/languages/default | 2 +- rtengine/refreshmap.cc | 2 +- rtgui/retinex.cc | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 7cc23d133..415c27896 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1707,7 +1707,7 @@ TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values. TP_RETINEX_OFFSET;Brightness TP_RETINEX_SETTINGS;Settings TP_RETINEX_SCALES;Gaussian gradient -TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and Neighboring pixels are reduced when iterations increase, and conversely. +TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and radius are reduced when iterations increase, and conversely. TP_RETINEX_SLOPE;Free gamma slope TP_RETINEX_STRENGTH;Strength TP_RETINEX_THRESHOLD;Threshold diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index b23212aeb..6a2925be9 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -95,7 +95,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = { ALLNORAW, // EvHREnabled, ALLNORAW, // EvHRAmount, ALLNORAW, // EvHRMethod, - ALLNORAW, // EvWProfile, + DEMOSAIC, // EvWProfile, OUTPUTPROFILE, // EvOProfile, ALLNORAW, // EvIProfile, TRANSFORM, // EvVignettingAmount, diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index e604d866f..0cad28377 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -184,7 +184,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), p1VBox = Gtk::manage ( new Gtk::VBox()); p1VBox->set_border_width(4); p1VBox->set_spacing(2); - + mapbox = Gtk::manage (new Gtk::HBox ()); labmap = Gtk::manage (new Gtk::Label (M("TP_RETINEX_MAP") + ":")); mapbox->pack_start (*labmap, Gtk::PACK_SHRINK, 1); @@ -297,15 +297,15 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), settingsVBox->pack_start (*limd); limd->show (); - // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); viewbox->pack_start(*viewMethod); - // settingsVBox->pack_start(*viewbox); +// settingsVBox->pack_start(*viewbox); retinexVBox->pack_start(*viewbox); //settingsVBox->pack_start (*viewMethod); - + mapbox->pack_start(*mapMethod); - // settingsVBox->pack_start(*mapbox); + // settingsVBox->pack_start(*mapbox); p1VBox->pack_start(*mapbox); p1VBox->pack_start (*curveEditormap, Gtk::PACK_SHRINK, 4); @@ -322,7 +322,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), p1VBox->pack_start (*radius); radius->show(); - + // settingsVBox->pack_start (*highl); // highl->show (); @@ -332,7 +332,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), // settingsVBox->pack_start (*grbl); // grbl->show (); - // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); settingsVBox->pack_start( *transmissionCurveEditorG, Gtk::PACK_SHRINK, 2); transmissionCurveEditorG->show(); @@ -473,7 +473,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), pack_start (*retinexVBox); p1Frame->add(*p1VBox); pack_start (*p1Frame, Gtk::PACK_EXPAND_WIDGET, 4); - + pack_start (*expsettings); pack_start (*neutrHBox); From 0fdcff3057ef65880f09bc34a5dec7c7967c38b2 Mon Sep 17 00:00:00 2001 From: Desmis Date: Tue, 5 Jan 2016 16:27:29 +0100 Subject: [PATCH 3/5] clean dots in ipretinex --- rtengine/ipretinex.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc index b24cc9bb3..5995c3e83 100644 --- a/rtengine/ipretinex.cc +++ b/rtengine/ipretinex.cc @@ -468,7 +468,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e gaussianBlur (out, out, W_L, H_L, sqrtf(SQR(RetinexScales[scale]) - SQR(RetinexScales[scale + 1])), buffer); } //printf("scal=%d RetinexScales=%f\n",scale, RetinexScales[scale]); - printf(".."); + // printf(".."); if(mapmet==4) shradius /= 1.; @@ -565,7 +565,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e } } } - printf(".\n"); + // printf(".\n"); if(mapmet > 1) { if(shmap) { delete shmap; From 2d77d783e0855e479654a75a9a7f7bb3177fa62c Mon Sep 17 00:00:00 2001 From: Desmis Date: Sun, 17 Jan 2016 10:06:22 +0100 Subject: [PATCH 4/5] Fixed various bug issue 2969 --- rtdata/languages/default | 4 ++-- rtgui/partialpastedlg.cc | 4 ++++ rtgui/retinex.cc | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 415c27896..3a64f25fe 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1664,7 +1664,7 @@ TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorre TP_RETINEX_CURVEEDITOR_LH;Strength=f(H) TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method. TP_RETINEX_FREEGAMMA;Free gamma -TP_RETINEX_GAIN;Contrast +TP_RETINEX_GAIN;Gain TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram. TP_RETINEX_GAMMA;Gamma TP_RETINEX_GAMMA_FREE;Free @@ -1720,7 +1720,7 @@ TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbsciss TP_RETINEX_UNIFORM;Uniform TP_RETINEX_VARIANCE;Contrast TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts. -TP_RETINEX_VIEW;Process (Preview) +TP_RETINEX_VIEW;Process TP_RETINEX_VIEW_NONE;Standard TP_RETINEX_VIEW_MASK;Mask TP_RETINEX_VIEW_UNSHARP;Unsharp mask diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index bbfdd0701..d017b5409 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -505,6 +505,7 @@ void PartialPasteDlg::basicToggled () gradientConn.block (true); labcurveConn.block (true); colorappearanceConn.block (true); + retinexConn.block (true); basic->set_inconsistent (false); @@ -514,6 +515,7 @@ void PartialPasteDlg::basicToggled () epd->set_active (basic->get_active ()); pcvignette->set_active (basic->get_active ()); gradient->set_active (basic->get_active ()); + retinex->set_active (basic->get_active ()); labcurve->set_active (basic->get_active ()); colorappearance->set_active (basic->get_active ()); @@ -523,6 +525,8 @@ void PartialPasteDlg::basicToggled () epdConn.block (false); pcvignetteConn.block (false); gradientConn.block (false); + retinexConn.block (false); + labcurveConn.block (false); colorappearanceConn.block (false); } diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index 0cad28377..0a2da4af3 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -993,7 +993,7 @@ void Retinex::mapMethodChanged() void Retinex::viewMethodChanged() { if(viewMethod->get_active_row_number() == 1 || viewMethod->get_active_row_number() == 2) { - vart->hide(); + // vart->hide(); gain->hide(); offs->hide(); limd->hide(); @@ -1008,7 +1008,7 @@ void Retinex::viewMethodChanged() else if(viewMethod->get_active_row_number() == 3 || viewMethod->get_active_row_number() == 4) { gain->hide(); offs->hide(); - vart->hide(); + // vart->hide(); curveEditorGH->hide(); } else { From c50a4bb7a933f4ea2075c9af5da2caef885fe2c2 Mon Sep 17 00:00:00 2001 From: Desmis Date: Sun, 17 Jan 2016 18:46:48 +0100 Subject: [PATCH 5/5] Simplify interface Process and Mask --- rtdata/languages/default | 2 +- rtengine/ipretinex.cc | 2 +- rtgui/retinex.cc | 34 +++++++++++++++++----------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 3a64f25fe..67eeaf8df 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1690,7 +1690,7 @@ TP_RETINEX_LABEL_MASK;Mask TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Low TP_RETINEX_MAP;Mask method -TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function (Radius, Method) to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. +TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function (Radius, Method) to reduce halos and artifacts.\n\nCurve apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. TP_RETINEX_MAP_NONE;None TP_RETINEX_MAP_CURV;Curve only TP_RETINEX_MAP_GAUS;Gaussian mask diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc index 5995c3e83..0704fc40d 100644 --- a/rtengine/ipretinex.cc +++ b/rtengine/ipretinex.cc @@ -409,7 +409,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e int mapmet=0; if(deh.mapMethod=="map") mapmet=2; if(deh.mapMethod=="mapT") mapmet=3; - if(deh.mapMethod=="curv") mapmet=1; + // if(deh.mapMethod=="curv") mapmet=1; if(deh.mapMethod=="gaus") mapmet=4; double shradius = (double) deh.radius; // printf("shrad=%f\n",shradius); diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index 0a2da4af3..277533ad0 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -191,7 +191,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), mapMethod = Gtk::manage (new MyComboBoxText ()); mapMethod->append_text (M("TP_RETINEX_MAP_NONE")); - mapMethod->append_text (M("TP_RETINEX_MAP_CURV")); +// mapMethod->append_text (M("TP_RETINEX_MAP_CURV")); mapMethod->append_text (M("TP_RETINEX_MAP_GAUS")); mapMethod->append_text (M("TP_RETINEX_MAP_MAPP")); mapMethod->append_text (M("TP_RETINEX_MAP_MAPT")); @@ -211,8 +211,8 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), viewMethod = Gtk::manage (new MyComboBoxText ()); viewMethod->append_text (M("TP_RETINEX_VIEW_NONE")); - viewMethod->append_text (M("TP_RETINEX_VIEW_MASK")); viewMethod->append_text (M("TP_RETINEX_VIEW_UNSHARP")); + viewMethod->append_text (M("TP_RETINEX_VIEW_MASK")); viewMethod->append_text (M("TP_RETINEX_VIEW_TRAN")); viewMethod->append_text (M("TP_RETINEX_VIEW_TRAN2")); viewMethod->set_active(0); @@ -743,21 +743,21 @@ void Retinex::read (const ProcParams* pp, const ParamsEdited* pedited) if (pp->retinex.mapMethod == "none") { mapMethod->set_active (0); - } else if (pp->retinex.mapMethod == "curv") { - mapMethod->set_active (1); +// } else if (pp->retinex.mapMethod == "curv") { +// mapMethod->set_active (1); } else if (pp->retinex.mapMethod == "gaus") { - mapMethod->set_active (2); + mapMethod->set_active (1); } else if (pp->retinex.mapMethod == "map") { - mapMethod->set_active (3); + mapMethod->set_active (2); } else if (pp->retinex.mapMethod == "mapT") { - mapMethod->set_active (4); + mapMethod->set_active (3); } if (pp->retinex.viewMethod == "none") { viewMethod->set_active (0); - } else if (pp->retinex.viewMethod == "mask") { - viewMethod->set_active (1); } else if (pp->retinex.viewMethod == "unsharp") { + viewMethod->set_active (1); + } else if (pp->retinex.viewMethod == "mask") { viewMethod->set_active (2); } else if (pp->retinex.viewMethod == "tran") { viewMethod->set_active (3); @@ -898,22 +898,22 @@ void Retinex::write (ProcParams* pp, ParamsEdited* pedited) if (mapMethod->get_active_row_number() == 0) { pp->retinex.mapMethod = "none"; + // } else if (mapMethod->get_active_row_number() == 1) { + // pp->retinex.mapMethod = "curv"; } else if (mapMethod->get_active_row_number() == 1) { - pp->retinex.mapMethod = "curv"; - } else if (mapMethod->get_active_row_number() == 2) { pp->retinex.mapMethod = "gaus"; - } else if (mapMethod->get_active_row_number() == 3) { + } else if (mapMethod->get_active_row_number() == 2) { pp->retinex.mapMethod = "map"; - } else if (mapMethod->get_active_row_number() == 4) { + } else if (mapMethod->get_active_row_number() == 3) { pp->retinex.mapMethod = "mapT"; } if (viewMethod->get_active_row_number() == 0) { pp->retinex.viewMethod = "none"; } else if (viewMethod->get_active_row_number() == 1) { - pp->retinex.viewMethod = "mask"; - } else if (viewMethod->get_active_row_number() == 2) { pp->retinex.viewMethod = "unsharp"; + } else if (viewMethod->get_active_row_number() == 2) { + pp->retinex.viewMethod = "mask"; } else if (viewMethod->get_active_row_number() == 3) { pp->retinex.viewMethod = "tran"; } else if (viewMethod->get_active_row_number() == 4) { @@ -961,14 +961,14 @@ void Retinex::retinexMethodChanged() void Retinex::mapMethodChanged() { - if(mapMethod->get_active_row_number() == 1 || mapMethod->get_active_row_number() == 2) { + if(mapMethod->get_active_row_number() == 1 /*|| mapMethod->get_active_row_number() == 2*/) { curveEditormap->show(); highlights->show(); h_tonalwidth->show(); shadows->show(); s_tonalwidth->show(); radius->show(); - } else if(mapMethod->get_active_row_number() == 3 || mapMethod->get_active_row_number() == 4) { + } else if(mapMethod->get_active_row_number() == 2 || mapMethod->get_active_row_number() == 3) { curveEditormap->show(); highlights->show(); h_tonalwidth->show();