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-09-18 22:59:57 +02:00
parent 6c988e94d4 33867a4bf2
commit 97afbdc5c5
6 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/lensprofile.cc
View File

@@ -161,16 +161,16 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
corrLensfunAuto->set_sensitive(true);
switch(pp->lensProf.lcMode) {
case procparams::LensProfParams::eLcMode::LC_LCP :
case procparams::LensProfParams::LcMode::LCP :
corrLcpFile->set_active(true);
break;
case procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH :
case procparams::LensProfParams::LcMode::LENSFUNAUTOMATCH :
corrLensfunAuto->set_active(true);
break;
case procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL :
case procparams::LensProfParams::LcMode::LENSFUNMANUAL :
corrLensfunManual->set_active(true);
break;
case procparams::LensProfParams::eLcMode::LC_NOCORRECTION :
case procparams::LensProfParams::LcMode::NONE :
corrOff->set_active(true);
}
@@ -274,13 +274,13 @@ void LensProfilePanel::setRawMeta(bool raw, const rtengine::FramesMetaData* pMet
void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
if (corrLcpFile->get_active()) {
pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LCP;
pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LCP;
} else if(corrLensfunManual->get_active()) {
pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL;
pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LENSFUNMANUAL;
} else if(corrLensfunAuto->get_active()) {
pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH;
pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LENSFUNAUTOMATCH;
} else if(corrOff->get_active()) {
pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_NOCORRECTION;
pp->lensProf.lcMode = procparams::LensProfParams::LcMode::NONE;
}
if (LCPStore::getInstance()->isValidLCPFileName(fcbLCPFile->get_filename())) {