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

LCP engine v3

Browse Source 
see issue 1375
This commit is contained in:
Oliver Duis
2012-05-31 16:13:46 +02:00
parent b66b8a7d78
commit 190555be57
42 changed files with 562 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
rtgui/lensprofile.cc
View File

@@ -1,7 +1,7 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2011 Oliver Duis <oduis@oliverduis.de>
* Copyright (c) 2012 Oliver Duis <oduis@oliverduis.de>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -58,24 +58,56 @@ LensProfilePanel::LensProfilePanel () : Gtk::VBox(), FoldableToolPanel(this)
pack_start(*hbLCPFile, Gtk::PACK_SHRINK, 4);
ckbUseDist = Gtk::manage (new Gtk::CheckButton (M("TP_LENSPROFILE_USEDIST")));
pack_start (*ckbUseDist, Gtk::PACK_SHRINK, 4);
ckbUseVign = Gtk::manage (new Gtk::CheckButton (M("TP_LENSPROFILE_USEVIGN")));
pack_start (*ckbUseVign, Gtk::PACK_SHRINK, 4);
ckbUseCA = Gtk::manage (new Gtk::CheckButton (M("TP_LENSPROFILE_USECA")));
pack_start (*ckbUseCA, Gtk::PACK_SHRINK, 4);
conLCPFile = fcbLCPFile->signal_file_set().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileChanged), true);
btnReset->signal_clicked().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileReset), true);
ckbUseDist->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseDistChanged) );
ckbUseVign->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseVignChanged) );
ckbUseCA->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseCAChanged) );
allowFocusDep=true;
}
void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
{
disableListener ();
if (pp->lensProf.lcpFile.length()>0 && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile))
if (pp->lensProf.lcpFile.length()>0 && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
fcbLCPFile->set_filename (pp->lensProf.lcpFile);
else
updateDisabled(true);
} else {
fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
updateDisabled(false);
}
lcpFileChanged = false;
ckbUseDist->set_active (pp->lensProf.useDist);
ckbUseVign->set_active (pp->lensProf.useVign);
ckbUseCA->set_active (pp->lensProf.useCA);
lcpFileChanged=useDistChanged=useVignChanged=useCAChanged=false;
enableListener ();
}
void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta) {
if (!raw || pMeta->getFocusDist()<=0) {
disableListener();
// CA is very focus layer dependend, otherwise it might even worsen things
allowFocusDep=false;
ckbUseCA->set_active(false);
ckbUseCA->set_sensitive(false);
enableListener();
}
}
void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
if (lcpStore->isValidLCPFileName(fcbLCPFile->get_filename()))
@@ -83,12 +115,23 @@ void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited
else
pp->lensProf.lcpFile = "";
if (pedited) pedited->lensProf.lcpFile = lcpFileChanged;
pp->lensProf.useDist = ckbUseDist->get_active();
pp->lensProf.useVign = ckbUseVign->get_active();
pp->lensProf.useCA = ckbUseCA->get_active();
if (pedited) {
pedited->lensProf.lcpFile = lcpFileChanged;
pedited->lensProf.useDist = useDistChanged;
pedited->lensProf.useVign = useVignChanged;
pedited->lensProf.useCA = useCAChanged;
}
}
void LensProfilePanel::onLCPFileChanged()
{
lcpFileChanged=true;
updateDisabled(lcpStore->isValidLCPFileName(fcbLCPFile->get_filename()));
if (listener)
listener->panelChanged (EvLCPFile, Glib::path_get_basename(fcbLCPFile->get_filename()));
}
@@ -98,7 +141,30 @@ void LensProfilePanel::onLCPFileReset()
lcpFileChanged=true;
fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
updateDisabled(false);
if (listener)
listener->panelChanged (EvLCPFile, M("GENERAL_NONE"));
}
void LensProfilePanel::onUseDistChanged()
{
useDistChanged=true;
if (listener) listener->panelChanged (EvLCPUseDist, ckbUseDist->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
void LensProfilePanel::onUseVignChanged()
{
useVignChanged=true;
if (listener) listener->panelChanged (EvLCPUseVign, ckbUseVign->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
void LensProfilePanel::onUseCAChanged()
{
useCAChanged=true;
if (listener) listener->panelChanged (EvLCPUseCA, ckbUseCA->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
void LensProfilePanel::updateDisabled(bool enable) {
ckbUseDist->set_sensitive(enable);
ckbUseVign->set_sensitive(enable);
ckbUseCA->set_sensitive(enable && allowFocusDep);
}