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

Merge pull request #5029 from TooWaBoo/lens-profile

Browse Source 
Profiled Lens Correction
- Fixed batch mode.
- Added frames.
This commit is contained in:
Beep6581
2018-12-01 16:42:17 +01:00
committed by GitHub
parent 5c73de9f83 6b0558c9e3
commit f4cc54351e
1 changed files with 103 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
rtgui/lensprofile.cc
View File

@@ -65,21 +65,19 @@ LensProfilePanel::LensProfilePanel() :
}
// Main containers:
Gtk::Frame *nodesFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_MODE_HEADER")));
modesGrid->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(modesGrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
Gtk::Frame *distFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_USE_HEADER")));
distGrid->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(distGrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
// Mode choice widgets:
Gtk::Label* const corrHeaderLbl = Gtk::manage(new Gtk::Label(M("TP_LENSPROFILE_MODE_HEADER")));
setExpandAlignProperties(corrHeaderLbl, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
corrUnchangedRB->hide();
corrGroup = corrUnchangedRB->get_group();
setExpandAlignProperties(corrLcpFileChooser, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
// Manually-selected profile widgets:
@@ -133,37 +131,33 @@ LensProfilePanel::LensProfilePanel() :
// Choice of properties to correct, applicable to all modes:
Gtk::Label* const useHeaderLbl = Gtk::manage(new Gtk::Label(M("TP_LENSPROFILE_USE_HEADER")));
setExpandAlignProperties(useHeaderLbl, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
// Populate modes grid:
modesGrid->attach(*corrHeaderLbl, 0, 0, 2, 1);
modesGrid->attach(*corrUnchangedRB, 0, 1, 2, 1);
modesGrid->attach(*corrOffRB, 0, 2, 2, 1);
modesGrid->attach(*corrLensfunAutoRB, 0, 3, 2, 1);
modesGrid->attach(*corrLensfunManualRB, 0, 4, 2, 1);
modesGrid->attach(*corrOffRB, 0, 0, 3, 1);
modesGrid->attach(*corrLensfunAutoRB, 0, 1, 3, 1);
modesGrid->attach(*corrLensfunManualRB, 0, 2, 3, 1);
modesGrid->attach(*lensfunCamerasLbl, 0, 5, 1, 1);
modesGrid->attach(*lensfunCameras, 1, 5, 1, 1);
modesGrid->attach(*lensfunLensesLbl, 0, 6, 1, 1);
modesGrid->attach(*lensfunLenses, 1, 6, 1, 1);
modesGrid->attach(*warning, 2, 6, 1, 1);
modesGrid->attach(*lensfunCamerasLbl, 0, 3, 1, 1);
modesGrid->attach(*lensfunCameras, 1, 3, 1, 1);
modesGrid->attach(*lensfunLensesLbl, 0, 4, 1, 1);
modesGrid->attach(*lensfunLenses, 1, 4, 1, 1);
modesGrid->attach(*warning, 2, 3, 1, 2);
modesGrid->attach(*corrLcpFileRB, 0, 7, 1, 1);
modesGrid->attach(*corrLcpFileChooser, 1, 7, 1, 1);
modesGrid->attach(*corrLcpFileRB, 0, 5, 1, 1);
modesGrid->attach(*corrLcpFileChooser, 1, 5, 1, 1);
// Populate distortions grid:
distGrid->attach(*useHeaderLbl, 0, 0, 1, 1);
distGrid->attach(*ckbUseDist, 0, 1, 1, 1);
distGrid->attach(*ckbUseVign, 0, 2, 1, 1);
distGrid->attach(*ckbUseCA, 0, 3, 1, 1);
distGrid->attach(*ckbUseDist, 0, 0, 1, 1);
distGrid->attach(*ckbUseVign, 0, 1, 1, 1);
distGrid->attach(*ckbUseCA, 0, 2, 1, 1);
// Attach grids:
pack_start(*modesGrid);
pack_start(*distGrid);
nodesFrame->add(*modesGrid);
distFrame->add(*distGrid);
pack_start(*nodesFrame, Gtk::PACK_EXPAND_WIDGET);
pack_start(*distFrame, Gtk::PACK_EXPAND_WIDGET);
// Signals:
@@ -185,11 +179,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
disableListener();
conUseDist.block(true);
if (!batchMode) {
corrUnchangedRB->hide();
}
corrLensfunAutoRB->set_sensitive(true);
// corrLensfunAutoRB->set_sensitive(true);
switch (pp->lensProf.lcMode) {
case procparams::LensProfParams::LcMode::LCP: {
@@ -200,6 +190,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
case procparams::LensProfParams::LcMode::LENSFUNAUTOMATCH: {
corrLensfunAutoRB->set_active(true);
if (batchMode) {
setManualParamsVisibility(false);
}
break;
}
@@ -237,24 +230,29 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
const LFDatabase* const db = LFDatabase::getInstance();
LFCamera c;
if (!setLensfunCamera(pp->lensProf.lfCameraMake, pp->lensProf.lfCameraModel) && !pp->lensProf.lfManual()) {
if (pp->lensProf.lfAutoMatch()) {
if (metadata) {
c = db->findCamera(metadata->getMake(), metadata->getModel());
setLensfunCamera(c.getMake(), c.getModel());
}
} else if (pp->lensProf.lfManual()) {
setLensfunCamera(pp->lensProf.lfCameraMake, pp->lensProf.lfCameraModel);
}
if (!setLensfunLens(pp->lensProf.lfLens) && !pp->lensProf.lfManual()) {
if (pp->lensProf.lfAutoMatch()) {
if (metadata) {
const LFLens l = db->findLens(c, metadata->getLens());
setLensfunLens(l.getLens());
}
} else if (pp->lensProf.lfManual()) {
setLensfunLens(pp->lensProf.lfLens);
}
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
useLensfunChanged = lensfunAutoChanged = lensfunCameraChanged = lensfunLensChanged = false;
if (!batchMode && !checkLensfunCanCorrect(true)) {
/*
if (!batchMode && !checkLensfunCanCorrect(true)) {
if (corrLensfunAutoRB->get_active()) {
corrOffRB->set_active(true);
}
@@ -262,16 +260,34 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
corrLensfunAutoRB->set_sensitive(false);
}
if (corrLensfunManualRB->get_active() && !checkLensfunCanCorrect(false)) {
if (!batchMode && corrLensfunManualRB->get_active() && !checkLensfunCanCorrect(false)) {
corrOffRB->set_active(true);
}
*/
ckbUseDist->set_active(pp->lensProf.useDist);
ckbUseVign->set_active(pp->lensProf.useVign);
ckbUseCA->set_active(pp->lensProf.useCA);
if (pedited) {
corrUnchangedRB->set_active(!pedited->lensProf.lcMode);
ckbUseDist->set_inconsistent(!pedited->lensProf.useDist);
ckbUseVign->set_inconsistent(!pedited->lensProf.useVign);
ckbUseCA->set_inconsistent(!pedited->lensProf.useCA);
if (!pedited->lensProf.lfCameraMake || !pedited->lensProf.lfCameraModel) {
setLensfunCamera("", "");
}
if (!pedited->lensProf.lfLens) {
setLensfunLens("");
}
ckbUseDist->set_sensitive(true);
ckbUseVign->set_sensitive(true);
ckbUseCA->set_sensitive(true);
}
updateLensfunWarning();
ckbUseDist->set_active(pp->lensProf.useDist);
ckbUseVign->set_active(pp->lensProf.useVign && isRaw);
ckbUseCA->set_active(pp->lensProf.useCA && isRaw && ckbUseCA->get_sensitive());
enableListener();
conUseDist.block(false);
}
@@ -303,7 +319,7 @@ void LensProfilePanel::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
const auto itc = lensfunCameras->get_active();
if (itc) {
if (itc && !corrLensfunAutoRB->get_active()) {
pp->lensProf.lfCameraMake = (*itc)[lf->lensfunModelCam.make];
pp->lensProf.lfCameraModel = (*itc)[lf->lensfunModelCam.model];
} else {
@@ -313,7 +329,7 @@ void LensProfilePanel::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
const auto itl = lensfunLenses->get_active();
if (itl) {
if (itl && !corrLensfunAutoRB->get_active()) {
pp->lensProf.lfLens = (*itl)[lf->lensfunModelLens.lens];
} else {
pp->lensProf.lfLens = "";
@@ -335,7 +351,7 @@ void LensProfilePanel::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
void LensProfilePanel::setRawMeta(bool raw, const rtengine::FramesMetaData* pMeta)
{
if (!raw || pMeta->getFocusDist() <= 0) {
if ((!raw || pMeta->getFocusDist() <= 0) && !batchMode) {
disableListener();
// CA is very focus layer dependent, otherwise it might even worsen things
@@ -370,6 +386,10 @@ void LensProfilePanel::onLCPFileChanged()
void LensProfilePanel::onUseDistChanged()
{
useDistChanged = true;
if (ckbUseDist->get_inconsistent()) {
ckbUseDist->set_inconsistent(false);
ckbUseDist->set_active(false);
}
if (listener) {
listener->panelChanged(EvLCPUseDist, ckbUseDist->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
@@ -379,6 +399,10 @@ void LensProfilePanel::onUseDistChanged()
void LensProfilePanel::onUseVignChanged()
{
useVignChanged = true;
if (ckbUseVign->get_inconsistent()) {
ckbUseVign->set_inconsistent(false);
ckbUseVign->set_active(false);
}
if (listener) {
listener->panelChanged(EvLCPUseVign, ckbUseVign->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
@@ -388,6 +412,10 @@ void LensProfilePanel::onUseVignChanged()
void LensProfilePanel::onUseCAChanged()
{
useCAChanged = true;
if (ckbUseCA->get_inconsistent()) {
ckbUseCA->set_inconsistent(false);
ckbUseCA->set_active(false);
}
if (listener) {
listener->panelChanged(EvLCPUseCA, ckbUseCA->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
@@ -397,13 +425,11 @@ void LensProfilePanel::onUseCAChanged()
void LensProfilePanel::setBatchMode(bool yes)
{
FoldableToolPanel::setBatchMode(yes);
if (yes) {
corrUnchangedRB->show();
corrUnchangedRB->set_active(true);
} else {
corrUnchangedRB->hide();
}
corrUnchangedRB->set_group(corrGroup);
modesGrid->attach_next_to(*corrUnchangedRB, Gtk::POS_TOP, 3, 1);
corrUnchangedRB->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrUnchangedRB));
corrUnchangedRB->set_active(true);
}
void LensProfilePanel::onLensfunCameraChanged()
@@ -462,34 +488,43 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
ckbUseCA->set_sensitive(false);
mode = M("GENERAL_NONE");
} else if (rbChanged == corrLensfunAutoRB) {
useLensfunChanged = true;
lensfunAutoChanged = true;
lensfunCameraChanged = true;
lensfunLensChanged = true;
lcpFileChanged = true;
useDistChanged = true;
useVignChanged = true;
ckbUseDist->set_sensitive(true);
ckbUseVign->set_sensitive(true);
ckbUseCA->set_sensitive(false);
ckbUseCA->set_sensitive(true);
if (metadata) {
const bool disabled = disableListener();
const bool disabled = disableListener();
if (batchMode) {
setLensfunCamera("", "");
setLensfunLens("");
} else if (metadata) {
const LFDatabase* const db = LFDatabase::getInstance();
const LFCamera c = db->findCamera(metadata->getMake(), metadata->getModel());
const LFLens l = db->findLens(c, metadata->getLens());
setLensfunCamera(c.getMake(), c.getModel());
setLensfunLens(l.getLens());
if (disabled) {
enableListener();
}
}
if (disabled) {
enableListener();
}
mode = M("TP_LENSPROFILE_CORRECTION_AUTOMATCH");
} else if (rbChanged == corrLensfunManualRB) {
useLensfunChanged = true;
lensfunAutoChanged = true;
lensfunCameraChanged = true;
lensfunLensChanged = true;
lcpFileChanged = true;
useDistChanged = true;
useVignChanged = true;
@@ -499,6 +534,7 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
ckbUseCA->set_sensitive(false);
mode = M("TP_LENSPROFILE_CORRECTION_MANUAL");
} else if (rbChanged == corrLcpFileRB) {
useLensfunChanged = true;
lensfunAutoChanged = true;
@@ -509,6 +545,7 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
updateDisabled(true);
mode = M("TP_LENSPROFILE_CORRECTION_LCPFILE");
} else if (rbChanged == corrUnchangedRB) {
useLensfunChanged = false;
lensfunAutoChanged = false;
@@ -526,7 +563,7 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
lcModeChanged = true;
updateLensfunWarning();
if (rbChanged == corrLensfunManualRB || rbChanged == corrLensfunAutoRB) {
if (rbChanged == corrLensfunManualRB || (!batchMode && rbChanged == corrLensfunAutoRB)) {
setManualParamsVisibility(true);
} else {
setManualParamsVisibility(false);
@@ -634,9 +671,11 @@ void LensProfilePanel::LFDbHelper::fillLensfunLenses()
void LensProfilePanel::updateDisabled(bool enable)
{
ckbUseDist->set_sensitive(enable);
ckbUseVign->set_sensitive(enable && isRaw);
ckbUseCA->set_sensitive(enable && allowFocusDep);
if (!batchMode) {
ckbUseDist->set_sensitive(enable);
ckbUseVign->set_sensitive(enable && isRaw);
ckbUseCA->set_sensitive(enable && allowFocusDep);
}
}
bool LensProfilePanel::setLensfunCamera(const Glib::ustring& make, const Glib::ustring& model)