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

Merge pull request #5056 from TooWaBoo/lens-profile

Browse Source 
Lens profile bug fix
This commit is contained in:
Beep6581
2018-12-02 15:25:03 +01:00
committed by GitHub
parent 1563854815 d6bdce3417
commit 35f37e55a7
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/lensprofile.cc
View File

@@ -247,8 +247,6 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
setLensfunLens(pp->lensProf.lfLens); setLensfunLens(pp->lensProf.lfLens);
} }
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
useLensfunChanged = lensfunAutoChanged = lensfunCameraChanged = lensfunLensChanged = false;
/* /*
if (!batchMode && !checkLensfunCanCorrect(true)) { if (!batchMode && !checkLensfunCanCorrect(true)) {
@@ -286,6 +284,9 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
ckbUseCA->set_sensitive(true); ckbUseCA->set_sensitive(true);
} }
lcModeChanged = lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
useLensfunChanged = lensfunAutoChanged = lensfunCameraChanged = lensfunLensChanged = false;
updateLensfunWarning(); updateLensfunWarning();
enableListener(); enableListener();
conUseDist.block(false); conUseDist.block(false);
@@ -478,9 +479,10 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
Glib::ustring mode; Glib::ustring mode;
if (rbChanged == corrOffRB) { if (rbChanged == corrOffRB) {
lcModeChanged = true;
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = false;
ckbUseDist->set_sensitive(false); ckbUseDist->set_sensitive(false);
ckbUseVign->set_sensitive(false); ckbUseVign->set_sensitive(false);
@@ -489,13 +491,12 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
mode = M("GENERAL_NONE"); mode = M("GENERAL_NONE");
} else if (rbChanged == corrLensfunAutoRB) { } else if (rbChanged == corrLensfunAutoRB) {
lcModeChanged = true;
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lensfunCameraChanged = true; lensfunCameraChanged = true;
lensfunLensChanged = true; lensfunLensChanged = true;
lcpFileChanged = true; lcpFileChanged = false;
useDistChanged = true;
useVignChanged = true;
ckbUseDist->set_sensitive(true); ckbUseDist->set_sensitive(true);
ckbUseVign->set_sensitive(true); ckbUseVign->set_sensitive(true);
@@ -514,19 +515,18 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
setLensfunLens(l.getLens()); setLensfunLens(l.getLens());
} }
if (disabled) { if (disabled) {
enableListener(); enableListener();
} }
mode = M("TP_LENSPROFILE_CORRECTION_AUTOMATCH"); mode = M("TP_LENSPROFILE_CORRECTION_AUTOMATCH");
} else if (rbChanged == corrLensfunManualRB) { } else if (rbChanged == corrLensfunManualRB) {
lcModeChanged = true;
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lensfunCameraChanged = true; lensfunCameraChanged = true;
lensfunLensChanged = true; lensfunLensChanged = true;
lcpFileChanged = true; lcpFileChanged = false;
useDistChanged = true;
useVignChanged = true;
ckbUseDist->set_sensitive(true); ckbUseDist->set_sensitive(true);
ckbUseVign->set_sensitive(true); ckbUseVign->set_sensitive(true);
@@ -535,17 +535,17 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
mode = M("TP_LENSPROFILE_CORRECTION_MANUAL"); mode = M("TP_LENSPROFILE_CORRECTION_MANUAL");
} else if (rbChanged == corrLcpFileRB) { } else if (rbChanged == corrLcpFileRB) {
lcModeChanged = true;
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
useDistChanged = true;
useVignChanged = true;
updateDisabled(true); updateDisabled(true);
mode = M("TP_LENSPROFILE_CORRECTION_LCPFILE"); mode = M("TP_LENSPROFILE_CORRECTION_LCPFILE");
} else if (rbChanged == corrUnchangedRB) { } else if (rbChanged == corrUnchangedRB) {
lcModeChanged = false;
useLensfunChanged = false; useLensfunChanged = false;
lensfunAutoChanged = false; lensfunAutoChanged = false;
lcpFileChanged = false; lcpFileChanged = false;
@@ -559,7 +559,6 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
mode = M("GENERAL_UNCHANGED"); mode = M("GENERAL_UNCHANGED");
} }
lcModeChanged = true;
updateLensfunWarning(); updateLensfunWarning();
if (rbChanged == corrLensfunManualRB || (!batchMode && rbChanged == corrLensfunAutoRB)) { if (rbChanged == corrLensfunManualRB || (!batchMode && rbChanged == corrLensfunAutoRB)) {