diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 199a71094..039ef49e0 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -90,6 +90,7 @@ ControlSpotPanel::ControlSpotPanel(): excluFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_EXCLUF")))) { bool showtooltip = options.showtooltip; + int complexsoft = options.complexity; Gtk::HBox* const hbox1_ = Gtk::manage(new Gtk::HBox(true, 4)); buttonaddconn_ = button_add_->signal_clicked().connect( @@ -230,7 +231,7 @@ ControlSpotPanel::ControlSpotPanel(): sigc::mem_fun( *this, &ControlSpotPanel::shapeMethodChanged)); ctboxshapemethod->pack_start(*shapeMethod_); - pack_start(*ctboxshapemethod); + if(complexsoft < 2) pack_start(*ctboxshapemethod); pack_start(*locX_); locX_->setAdjusterListener(this); @@ -268,7 +269,7 @@ ControlSpotPanel::ControlSpotPanel(): sigc::mem_fun( *this, &ControlSpotPanel::qualityMethodChanged)); ctboxqualitymethod->pack_start(*qualityMethod_); - pack_start(*ctboxqualitymethod); + if(complexsoft < 2) pack_start(*ctboxqualitymethod); Gtk::HBox* const ctboxcomplexmethod = Gtk::manage(new Gtk::HBox()); @@ -334,8 +335,8 @@ ControlSpotPanel::ControlSpotPanel(): lumask_->setAdjusterListener(this); transitBox->pack_start(*transit_); - transitBox->pack_start(*transitweak_); - transitBox->pack_start(*transitgrad_); + if(complexsoft < 2) transitBox->pack_start(*transitweak_); + if(complexsoft < 2)transitBox->pack_start(*transitgrad_); transitBox->pack_start(*feather_); transitFrame->add(*transitBox); pack_start(*transitFrame); @@ -350,10 +351,10 @@ ControlSpotPanel::ControlSpotPanel(): ToolParamBlock* const artifBox = Gtk::manage(new ToolParamBlock()); thresh_->setAdjusterListener(this); struc_->setAdjusterListener(this); - artifBox->pack_start(*struc_); - artifBox->pack_start(*thresh_); + if(complexsoft < 2) artifBox->pack_start(*struc_); + if(complexsoft < 2) artifBox->pack_start(*thresh_); artifBox->pack_start(*iter_); - artifBox->pack_start(*balan_); + if(complexsoft < 2) artifBox->pack_start(*balan_); iter_->setAdjusterListener(this); balan_->setAdjusterListener(this); artifFrame->add(*artifBox); diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index efa91ebd5..3f7377ee2 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -2194,7 +2194,7 @@ pe(nullptr) retiFrame->add(*deharetiBox); auxBox->add(*dehaFrame); - if(complexsoft < 2) auxBox->add(*retiFrame); + if(complexsoft < 1) auxBox->add(*retiFrame); ToolParamBlock* const scopeBox = Gtk::manage(new ToolParamBlock()); scopeBox->pack_start(*sensih); @@ -2507,10 +2507,10 @@ pe(nullptr) maskcbBox->pack_start(*maskcbCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor maskcbBox->pack_start(*blendmaskcb, Gtk::PACK_SHRINK, 0); maskcbBox->pack_start(*radmaskcb, Gtk::PACK_SHRINK, 0); - maskcbBox->pack_start(*lapmaskcb, Gtk::PACK_SHRINK, 0); + if(complexsoft < 1) maskcbBox->pack_start(*lapmaskcb, Gtk::PACK_SHRINK, 0); maskcbBox->pack_start(*chromaskcb, Gtk::PACK_SHRINK, 0); - maskcbBox->pack_start(*gammaskcb, Gtk::PACK_SHRINK, 0); - maskcbBox->pack_start(*slomaskcb, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) maskcbBox->pack_start(*gammaskcb, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) maskcbBox->pack_start(*slomaskcb, Gtk::PACK_SHRINK, 0); maskcbBox->pack_start(*mask2cbCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor expmaskcb->add(*maskcbBox, false); @@ -2715,20 +2715,20 @@ pe(nullptr) ToolParamBlock* const maskblBox = Gtk::manage(new ToolParamBlock()); maskblBox->pack_start(*showmaskblMethod, Gtk::PACK_SHRINK, 4); maskblBox->pack_start(*enablMask, Gtk::PACK_SHRINK, 0); - maskblBox->pack_start(*maskblCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor - maskblBox->pack_start(*strumaskbl, Gtk::PACK_SHRINK, 0); - maskblBox->pack_start(*toolbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) maskblBox->pack_start(*maskblCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor + if(complexsoft < 2) maskblBox->pack_start(*strumaskbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) maskblBox->pack_start(*toolbl, Gtk::PACK_SHRINK, 0); maskblBox->pack_start(*separatorstrubl, Gtk::PACK_SHRINK, 2); maskblBox->pack_start(*blendmaskbl, Gtk::PACK_SHRINK, 0); toolblBox->pack_start(*radmaskbl, Gtk::PACK_SHRINK, 0); - toolblBox->pack_start(*lapmaskbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 1) toolblBox->pack_start(*lapmaskbl, Gtk::PACK_SHRINK, 0); toolblBox->pack_start(*chromaskbl, Gtk::PACK_SHRINK, 0); - toolblBox->pack_start(*gammaskbl, Gtk::PACK_SHRINK, 0); - toolblBox->pack_start(*slomaskbl, Gtk::PACK_SHRINK, 0); - toolblBox->pack_start(*shadmaskbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) toolblBox->pack_start(*gammaskbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) toolblBox->pack_start(*slomaskbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) toolblBox->pack_start(*shadmaskbl, Gtk::PACK_SHRINK, 0); toolblBox->pack_start(*mask2blCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor - toolblBox->pack_start(*mask2blCurveEditorGwav, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor - toolblBox->pack_start(*csThresholdblur, Gtk::PACK_SHRINK, 0); + if(complexsoft < 1) toolblBox->pack_start(*mask2blCurveEditorGwav, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor + if(complexsoft < 1) toolblBox->pack_start(*csThresholdblur, Gtk::PACK_SHRINK, 0); toolblFrame->add(*toolblBox); maskblBox->pack_start(*toolblFrame); @@ -2747,8 +2747,8 @@ pe(nullptr) ToolParamBlock* const blurrBox = Gtk::manage(new ToolParamBlock()); - blurrBox->pack_start(*blMethod); - blurrBox->pack_start(*fftwbl, Gtk::PACK_SHRINK, 0); + if(complexsoft < 2) blurrBox->pack_start(*blMethod); + if(complexsoft < 2)blurrBox->pack_start(*fftwbl, Gtk::PACK_SHRINK, 0); blurrBox->pack_start(*radius); blurrBox->pack_start(*strength); blurrBox->pack_start(*grainFrame); @@ -2844,7 +2844,7 @@ pe(nullptr) expdenoi->add(*denoisBox, false); expdenoi->setLevel(2); - panel->pack_start(*expdenoi, false, false); + if(complexsoft < 2) panel->pack_start(*expdenoi, false, false); pack_start(*panel); @@ -10027,6 +10027,10 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con blMethod->set_active(2); } + if(complexsoft == 2) { + blMethod->set_active(0); + } + if (pp->locallab.spots.at(index).blurMethod == "norm") { blurMethod->set_active(0); // expmaskbl->show();