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

fixed update of lensfun-related procparams after editing

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-07 17:50:33 +02:00
parent f3ae370ea7
commit 9bfd2d60d3
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/lensprofile.cc
View File

@@ -140,7 +140,6 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
disableListener (); disableListener ();
conUseDist.block(true); conUseDist.block(true);
corrOff->set_active(true);
if (pp->lensProf.useLensfun) { if (pp->lensProf.useLensfun) {
if (pp->lensProf.lfAutoMatch) { if (pp->lensProf.lfAutoMatch) {
corrLensfunAuto->set_active(true); corrLensfunAuto->set_active(true);
@@ -164,6 +163,8 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
} }
updateDisabled(false); updateDisabled(false);
corrOff->set_active(true);
} }
ckbUseDist->set_active (pp->lensProf.useDist); ckbUseDist->set_active (pp->lensProf.useDist);
@@ -415,6 +416,7 @@ void LensProfilePanel::onCorrModeChanged()
if (corrOff->get_active()) { if (corrOff->get_active()) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
lensfunCameras->set_sensitive(false); lensfunCameras->set_sensitive(false);
@@ -426,6 +428,7 @@ void LensProfilePanel::onCorrModeChanged()
mode = M("LENSPROFILE_CORRECTION_OFF"); mode = M("LENSPROFILE_CORRECTION_OFF");
} else if (corrLensfunAuto->get_active()) { } else if (corrLensfunAuto->get_active()) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
useDistChanged = true; useDistChanged = true;
useVignChanged = true; useVignChanged = true;
@@ -440,7 +443,7 @@ void LensProfilePanel::onCorrModeChanged()
mode = M("LENSPROFILE_CORRECTION_AUTOMATCH"); mode = M("LENSPROFILE_CORRECTION_AUTOMATCH");
} else if (corrLensfunManual->get_active()) { } else if (corrLensfunManual->get_active()) {
useLensfunChanged = true; useLensfunChanged = true;
lcpFileChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
useDistChanged = true; useDistChanged = true;
useVignChanged = true; useVignChanged = true;
@@ -455,7 +458,7 @@ void LensProfilePanel::onCorrModeChanged()
mode = M("LENSPROFILE_CORRECTION_MANUAL"); mode = M("LENSPROFILE_CORRECTION_MANUAL");
} else if (corrLcpFile->get_active()) { } else if (corrLcpFile->get_active()) {
useLensfunChanged = true; useLensfunChanged = true;
lcpFileChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
useDistChanged = true; useDistChanged = true;
useVignChanged = true; useVignChanged = true;

20
rtgui/paramsedited.cc
View File

@@ -2078,6 +2078,26 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.lensProf.useCA = mods.lensProf.useCA; toEdit.lensProf.useCA = mods.lensProf.useCA;
} }
if (lensProf.useLensfun) {
toEdit.lensProf.useLensfun = mods.lensProf.useLensfun;
}
if (lensProf.lfAutoMatch) {
toEdit.lensProf.lfAutoMatch = mods.lensProf.lfAutoMatch;
}
if (lensProf.lfCameraMake) {
toEdit.lensProf.lfCameraMake = mods.lensProf.lfCameraMake;
}
if (lensProf.lfCameraModel) {
toEdit.lensProf.lfCameraModel = mods.lensProf.lfCameraModel;
}
if (lensProf.lfLens) {
toEdit.lensProf.lfLens = mods.lensProf.lfLens;
}
if (perspective.horizontal) { if (perspective.horizontal) {
toEdit.perspective.horizontal = dontforceSet && options.baBehav[ADDSET_PERSPECTIVE] ? toEdit.perspective.horizontal + mods.perspective.horizontal : mods.perspective.horizontal; toEdit.perspective.horizontal = dontforceSet && options.baBehav[ADDSET_PERSPECTIVE] ? toEdit.perspective.horizontal + mods.perspective.horizontal : mods.perspective.horizontal;
} }