liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Local adjustments - Fix apply/paste actions with LA

Browse Source 
- Fixes LA lost when applying partial profile (fixes #6150)
- Fixes LA behavior when using apply/paste actions: spots are now totally replaced and not anymore merged (fixes #6136 and #6411)
- Fixes a crash in specific situations when saving/copying a partial number of spots
- Partial paste dialog: Fixes Locallab button remaining inconsistent if all the spots are deselected
This commit is contained in:
Pandagrapher
2022-07-18 19:03:29 +02:00
committed by GitHub
parent 19a4720ec7
commit 1e2dc30738
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/partialpastedlg.cc
View File

@@ -35,9 +35,9 @@ PartialSpotWidget::PartialSpotWidget():
// Widget listener
selListener(nullptr)
{
set_orientation(Gtk::ORIENTATION_VERTICAL);
// Configure tree view
treeview->set_model(treemodel);
treeview->set_enable_search(false);
@@ -342,7 +342,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[1]->pack_start (*hseps[1], Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*spot, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*sharpen, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*localcontrast, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*localcontrast, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*sharpenedge, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*sharpenmicro, Gtk::PACK_SHRINK, 2);
vboxes[1]->pack_start (*impden, Gtk::PACK_SHRINK, 2);
@@ -984,7 +984,7 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
if (!dehaze->get_active ()) {
filterPE.dehaze = falsePE.dehaze;
}
if (!rgbcurves->get_active ()) {
filterPE.rgbCurves = falsePE.rgbCurves;
}
@@ -1234,6 +1234,9 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
if (!chosenSpots.at(i)) {
tmpPP.locallab.spots.erase(tmpPP.locallab.spots.begin() + i);
tmpPE.locallab.spots.erase(tmpPE.locallab.spots.begin() + i);
// Locallab Selspot param shall be kept in vector size limit
tmpPP.locallab.selspot = std::max(0, std::min(tmpPP.locallab.selspot, (int)tmpPP.locallab.spots.size() - 1));
}
}
@@ -1260,16 +1263,23 @@ void PartialPasteDlg::updateSpotWidget(const rtengine::procparams::ProcParams* p
void PartialPasteDlg::partialSpotUpdated(const UpdateStatus status)
{
locallabConn.block(true);
switch (status) {
case (AllSelection):
locallab->set_active(true);
locallab->set_inconsistent(false);
break;
case (NoSelection):
locallab->set_active(false);
locallab->set_inconsistent(false);
break;
case (PartialSelection):
locallab->set_active(false);
locallab->set_inconsistent(true);
}
locallabConn.block(false);
}