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

merge branch 'lensprofile-ca-correction' into 'dev'

Browse Source
This commit is contained in:
Alberto Griggio
2017-11-14 22:53:27 +01:00
parent 0efee599a1 99f41baf4f
commit 19281eedd1
7 changed files with 163 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/lensprofile.cc
View File

@@ -192,7 +192,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
ckbUseDist->set_active (pp->lensProf.useDist);
ckbUseVign->set_active (pp->lensProf.useVign && isRaw);
ckbUseCA->set_active (pp->lensProf.useCA && isRaw);
ckbUseCA->set_active(pp->lensProf.useCA && isRaw && ckbUseCA->get_sensitive());
const LFDatabase *db = LFDatabase::getInstance();
LFCamera c;
@@ -254,6 +254,16 @@ void LensProfilePanel::updateLensfunWarning()
}
ckbUseVign->set_sensitive(l.hasVignettingCorrection());
ckbUseDist->set_sensitive(l.hasDistortionCorrection());
ckbUseCA->set_sensitive(l.hasCACorrection());
if (!isRaw || !l.hasVignettingCorrection()) {
ckbUseVign->set_active(false);
}
if (!l.hasDistortionCorrection()) {
ckbUseDist->set_active(false);
}
if (!l.hasCACorrection()) {
ckbUseCA->set_active(false);
}
}
}
@@ -370,7 +380,8 @@ void LensProfilePanel::updateDisabled(bool enable)
{
ckbUseDist->set_sensitive(enable);
ckbUseVign->set_sensitive(enable && isRaw);
ckbUseCA->set_sensitive(enable && allowFocusDep);
// agriggio TODO -- CA correction via LCP is currently broken
ckbUseCA->set_sensitive(false);//enable && allowFocusDep);
}
void LensProfilePanel::setBatchMode(bool yes)