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

merge with lcp-vignetting-issue4062

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-11 17:22:01 +02:00
parent 2611adf4e4 d442f7a85b
commit 4dc0e20ae0
9 changed files with 1019 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/lensprofile.cc
View File

@@ -103,7 +103,7 @@ LensProfilePanel::LensProfilePanel () :
filterLCP->add_pattern("*.LCP");
fcbLCPFile->add_filter(filterLCP);
Glib::ustring defDir = lcpStore->getDefaultCommonDirectory();
Glib::ustring defDir = LCPStore::getInstance()->getDefaultCommonDirectory();
if (!defDir.empty()) {
#ifdef WIN32
@@ -165,7 +165,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
} else {
corrLensfunManual->set_active(true);
}
} else if (!pp->lensProf.lcpFile.empty() && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
} else if (!pp->lensProf.lcpFile.empty() && LCPStore::getInstance()->isValidLCPFileName(pp->lensProf.lcpFile)) {
corrLcpFile->set_active(true);
fcbLCPFile->set_filename (pp->lensProf.lcpFile);
updateDisabled(true);
@@ -242,7 +242,7 @@ void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta
void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
if (corrLcpFile->get_active() && lcpStore->isValidLCPFileName(fcbLCPFile->get_filename())) {
if (corrLcpFile->get_active() && LCPStore::getInstance()->isValidLCPFileName(fcbLCPFile->get_filename())) {
pp->lensProf.lcpFile = fcbLCPFile->get_filename();
} else {
pp->lensProf.lcpFile = "";
@@ -285,7 +285,7 @@ void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited
void LensProfilePanel::onLCPFileChanged()
{
lcpFileChanged = true;
updateDisabled(lcpStore->isValidLCPFileName(fcbLCPFile->get_filename()));
updateDisabled(LCPStore::getInstance()->isValidLCPFileName(fcbLCPFile->get_filename()));
if (listener) {
listener->panelChanged (EvLCPFile, Glib::path_get_basename(fcbLCPFile->get_filename()));