Updates in RT-spot panel GUI

- Adjusters "transitweak_" and "thresh_" are now present in all modes
- Modification of maximum value of "transitweak_" adjuster
This commit is contained in:
Pandagrapher
2020-04-22 21:27:27 +02:00
parent de04f63fc8
commit 2c7adc1f7a
2 changed files with 5 additions and 19 deletions

View File

@@ -65,7 +65,7 @@ ControlSpotPanel::ControlSpotPanel():
centerY_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CENTER_Y"), -1000, 1000, 1, 0))),
circrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CIRCRADIUS"), 2, 150, 1, 18))),
transit_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITVALUE"), 2., 100., 0.1, 60.))),
transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 15.0, 0.1, 1.0))),
transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 25.0, 0.1, 1.0))),
transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))),
feather_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
struc_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRES"), 1.0, 12.0, 0.1, 4.0))),
@@ -311,15 +311,8 @@ ControlSpotPanel::ControlSpotPanel():
feather_->setAdjusterListener(this);
scopemask_->setAdjusterListener(this);
transitBox->pack_start(*transit_);
if (complexsoft < 2) {
transitBox->pack_start(*transitweak_);
}
if (complexsoft < 2) {
transitBox->pack_start(*transitgrad_);
}
transitBox->pack_start(*transitweak_);
transitBox->pack_start(*transitgrad_);
transitBox->pack_start(*feather_);
transitFrame->add(*transitBox);
pack_start(*transitFrame);

View File

@@ -293,15 +293,8 @@ void Locallab::read(const rtengine::procparams::ProcParams* pp, const ParamsEdit
}
r->transit = pp->locallab.spots.at(i).transit;
if (complexsoft < 2) {
r->transitweak = pp->locallab.spots.at(i).transitweak;
r->transitgrad = pp->locallab.spots.at(i).transitgrad;
} else {
r->transitweak = 1.;
r->transitgrad = 0.;
}
r->transitweak = pp->locallab.spots.at(i).transitweak;
r->transitgrad = pp->locallab.spots.at(i).transitgrad;
r->feather = pp->locallab.spots.at(i).feather;
r->struc = pp->locallab.spots.at(i).struc;
r->thresh = pp->locallab.spots.at(i).thresh;