diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 35379433b..f2ae9febc 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -615,6 +615,7 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall lp.enavibMask = locallab.spots.at(sp).enavibMask && llvibMask == 0 && lllcMask == 0 && llColorMask == 0 && llExpMask == 0 && llcbMask == 0 && llretiMask == 0 && lltmMask == 0 && llblMask == 0 && llSHMask == 0; lp.enalcMask = locallab.spots.at(sp).enalcMask && lllcMask == 0 && llcbMask == 0 && llColorMask == 0 && llExpMask == 0 && llSHMask == 0 && llretiMask == 0 && lltmMask == 0 && llblMask == 0 && llvibMask == 0; + // 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); if (locallab.spots.at(sp).softMethod == "soft") { lp.softmet = 0; } else if (locallab.spots.at(sp).softMethod == "reti") { @@ -7269,7 +7270,7 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel // float thresref = mean[level]; // float thresreal = 0.1f * thres * thresref;//small values to take into account noise and artifacts - printf("mean=%f level=%i\n", mean[level], level); + //printf("mean=%f level=%i\n", mean[level], level); Compresslevels(templevel[dir - 1][level], W_L, H_L, compression, detailattenuator, thres, mean[level], MaxP[level], meanN[level], MaxN[level], madL[level][dir - 1]); } diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index ae601a017..f2d2fe222 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -1909,7 +1909,7 @@ pe(nullptr) exptrcsh->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), exptrcsh)); exptrcsh->setLevel(2); - exptrcsh->add(*gammBox, false); +// exptrcsh->add(*gammBox, false); // gradSHFrame->set_label_align(0.025, 0.5); ToolParamBlock* const gradSHBox = Gtk::manage(new ToolParamBlock()); @@ -1924,11 +1924,11 @@ pe(nullptr) expgradsh->add(*gradSHBox, false); shadhighBox->pack_start(*detailSH); - shadhighBox->pack_start(*gamFrame); + // shadhighBox->pack_start(*gamFrame); if (complexsoft < 2) { // shadhighBox->pack_start(*gamFrame); - shadhighBox->pack_start(*exptrcsh); + // shadhighBox->pack_start(*exptrcsh); } shadhighBox->pack_start(*highlights); @@ -1941,6 +1941,7 @@ pe(nullptr) if (complexsoft < 2) { shadhighBox->pack_start(*blurSHde); } + shadhighBox->pack_start(*gamFrame); // shadhighBox->pack_start(*gradSHFrame); shadhighBox->pack_start(*expgradsh); @@ -7299,7 +7300,7 @@ void Locallab::shMethodChanged() } detailSH->hide(); - gamFrame->hide(); +// gamFrame->hide(); highlights->show(); h_tonalwidth->show(); shadows->show(); @@ -7312,7 +7313,7 @@ void Locallab::shMethodChanged() } detailSH->show(); - gamFrame->show(); +// gamFrame->show(); highlights->hide(); h_tonalwidth->hide(); shadows->hide(); @@ -13270,7 +13271,7 @@ void Locallab::updateSpecificGUIState() expgradsh->hide(); detailSH->hide(); - gamFrame->hide(); + // gamFrame->hide(); highlights->show(); h_tonalwidth->show(); shadows->show(); @@ -13281,7 +13282,7 @@ void Locallab::updateSpecificGUIState() multipliersh[i]->show(); } - gamFrame->show(); +// gamFrame->show(); expgradsh->hide(); detailSH->show(); @@ -13357,7 +13358,7 @@ void Locallab::updateSpecificGUIState() } detailSH->hide(); - gamFrame->hide(); +// gamFrame->hide(); highlights->show(); h_tonalwidth->show(); shadows->show(); @@ -13369,7 +13370,7 @@ void Locallab::updateSpecificGUIState() } detailSH->show(); - gamFrame->show(); +// gamFrame->show(); highlights->hide(); h_tonalwidth->hide(); shadows->hide();