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

Merge branch 'dev' into multiframe-handling

Browse Source
This commit is contained in:
Hombre57
2017-10-04 23:34:28 +02:00
parent bb874bcce7 55172ee7ac
commit 180912df0f
69 changed files with 1461 additions and 1225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/lensprofile.cc
View File

@@ -182,7 +182,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
updateDisabled(false);
} else if (LCPStore::getInstance()->isValidLCPFileName(pp->lensProf.lcpFile)) {
fcbLCPFile->set_filename (pp->lensProf.lcpFile);
updateDisabled(true);
if(corrLcpFile->get_active()) {
updateDisabled(true);
}
} else {
fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
updateDisabled(false);
@@ -194,17 +196,18 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
const LFDatabase *db = LFDatabase::getInstance();
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()) {
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()) {
setLensfunLens(l.getLens());
if (metadata) {
LFLens l = db->findLens(c, metadata->getLens());
setLensfunLens(l.getLens());
}
}
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
@@ -231,7 +234,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
void LensProfilePanel::updateLensfunWarning()
{
warning->hide();
if (corrLensfunManual->get_active()) {
if (corrLensfunManual->get_active() || corrLensfunAuto->get_active()) {
const LFDatabase *db = LFDatabase::getInstance();
auto itc = lensfunCameras->get_active();
@@ -598,7 +601,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunCameras()
camnames[c.getMake()].insert(c.getModel());
if (options.rtSettings.verbose) {
std::cout << " found: " << c.getDisplayString() << std::endl;
std::cout << " found: " << c.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : camnames) {
@@ -627,7 +630,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunLenses()
lenses[make].insert(name);
if (options.rtSettings.verbose) {
std::cout << " found: " << l.getDisplayString() << std::endl;
std::cout << " found: " << l.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : lenses) {