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

Fixed two bugs in lens correction gui, fixes #4098

Browse Source
This commit is contained in:
heckflosse 2017-09-22 19:11:55 +02:00
parent e29334a4dc
commit d733c40346
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/lensprofile.cc
View File

@ -182,7 +182,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
updateDisabled(false); updateDisabled(false);
} else if (LCPStore::getInstance()->isValidLCPFileName(pp->lensProf.lcpFile)) { } else if (LCPStore::getInstance()->isValidLCPFileName(pp->lensProf.lcpFile)) {
fcbLCPFile->set_filename (pp->lensProf.lcpFile); fcbLCPFile->set_filename (pp->lensProf.lcpFile);
updateDisabled(true); if(corrLcpFile->get_active()) {
updateDisabled(true);
}
} else { } else {
fcbLCPFile->unselect_filename(fcbLCPFile->get_filename()); fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
updateDisabled(false); updateDisabled(false);
@ -194,17 +196,18 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
const LFDatabase *db = LFDatabase::getInstance(); const LFDatabase *db = LFDatabase::getInstance();
LFCamera c; LFCamera c;
LFLens l;
if (metadata) {
c = db->findCamera(metadata->getMake(), metadata->getModel());
l = db->findLens(c, metadata->getLens());
}
if (!setLensfunCamera(pp->lensProf.lfCameraMake, pp->lensProf.lfCameraModel) && !pp->lensProf.lfManual()) { if (!setLensfunCamera(pp->lensProf.lfCameraMake, pp->lensProf.lfCameraModel) && !pp->lensProf.lfManual()) {
setLensfunCamera(c.getMake(), c.getModel()); if (metadata) {
c = db->findCamera(metadata->getMake(), metadata->getModel());
setLensfunCamera(c.getMake(), c.getModel());
}
} }
if (!setLensfunLens(pp->lensProf.lfLens) && !pp->lensProf.lfManual()) { if (!setLensfunLens(pp->lensProf.lfLens) && !pp->lensProf.lfManual()) {
setLensfunLens(l.getLens()); if (metadata) {
LFLens l = db->findLens(c, metadata->getLens());
setLensfunLens(l.getLens());
}
} }
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false; lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
@ -231,7 +234,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
void LensProfilePanel::updateLensfunWarning() void LensProfilePanel::updateLensfunWarning()
{ {
warning->hide(); warning->hide();
if (corrLensfunManual->get_active()) { if (corrLensfunManual->get_active() || corrLensfunAuto->get_active()) {
const LFDatabase *db = LFDatabase::getInstance(); const LFDatabase *db = LFDatabase::getInstance();
auto itc = lensfunCameras->get_active(); auto itc = lensfunCameras->get_active();