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

Changing lens correction method triggers processing twice, fixes #4740

Browse Source
This commit is contained in:
heckflosse 2018-08-19 16:38:02 +02:00
parent ab79434beb
commit ce8ead804b
2 changed files with 79 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/lensprofile.cc
View File

@ -139,10 +139,10 @@ LensProfilePanel::LensProfilePanel () :
lensfunCameras->signal_changed().connect(sigc::mem_fun(*this, &LensProfilePanel::onLensfunCameraChanged)); lensfunCameras->signal_changed().connect(sigc::mem_fun(*this, &LensProfilePanel::onLensfunCameraChanged));
lensfunLenses->signal_changed().connect(sigc::mem_fun(*this, &LensProfilePanel::onLensfunLensChanged)); lensfunLenses->signal_changed().connect(sigc::mem_fun(*this, &LensProfilePanel::onLensfunLensChanged));
corrOff->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged)); corrOff->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrOff));
corrLensfunAuto->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged)); corrLensfunAuto->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrLensfunAuto));
corrLensfunManual->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged)); corrLensfunManual->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrLensfunManual));
corrLcpFile->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged)); corrLcpFile->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrLcpFile));
corrUnchanged->hide(); corrUnchanged->hide();
@ -499,11 +499,13 @@ void LensProfilePanel::onLensfunLensChanged()
} }
void LensProfilePanel::onCorrModeChanged() void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton *rbChanged)
{ {
if (rbChanged->get_active()) {
// because the method gets called for the enabled AND the disabled RadioButton, we do the processing only for the enabled one
Glib::ustring mode; Glib::ustring mode;
if (corrOff->get_active()) { if (rbChanged == corrOff) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
@ -513,7 +515,7 @@ void LensProfilePanel::onCorrModeChanged()
ckbUseCA->set_sensitive(false); ckbUseCA->set_sensitive(false);
mode = M("GENERAL_NONE"); mode = M("GENERAL_NONE");
} else if (corrLensfunAuto->get_active()) { } else if (rbChanged == corrLensfunAuto) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
@ -537,7 +539,7 @@ void LensProfilePanel::onCorrModeChanged()
} }
mode = M("LENSPROFILE_CORRECTION_AUTOMATCH"); mode = M("LENSPROFILE_CORRECTION_AUTOMATCH");
} else if (corrLensfunManual->get_active()) { } else if (rbChanged == corrLensfunManual) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
@ -549,7 +551,7 @@ void LensProfilePanel::onCorrModeChanged()
ckbUseCA->set_sensitive(false); ckbUseCA->set_sensitive(false);
mode = M("LENSPROFILE_CORRECTION_MANUAL"); mode = M("LENSPROFILE_CORRECTION_MANUAL");
} else if (corrLcpFile->get_active()) { } else if (rbChanged == corrLcpFile) {
useLensfunChanged = true; useLensfunChanged = true;
lensfunAutoChanged = true; lensfunAutoChanged = true;
lcpFileChanged = true; lcpFileChanged = true;
@ -559,7 +561,7 @@ void LensProfilePanel::onCorrModeChanged()
updateDisabled(true); updateDisabled(true);
mode = M("LENSPROFILE_CORRECTION_LCPFILE"); mode = M("LENSPROFILE_CORRECTION_LCPFILE");
} else if (corrUnchanged->get_active()) { } else if (rbChanged == corrUnchanged) {
useLensfunChanged = false; useLensfunChanged = false;
lensfunAutoChanged = false; lensfunAutoChanged = false;
lcpFileChanged = false; lcpFileChanged = false;
@ -572,12 +574,14 @@ void LensProfilePanel::onCorrModeChanged()
mode = M("GENERAL_UNCHANGED"); mode = M("GENERAL_UNCHANGED");
} }
lcModeChanged = true; lcModeChanged = true;
updateLensfunWarning(); updateLensfunWarning();
if (listener) { if (listener) {
listener->panelChanged(EvLensCorrMode, mode); listener->panelChanged(EvLensCorrMode, mode);
} }
}
} }

2
rtgui/lensprofile.h
View File

@ -105,7 +105,7 @@ public:
void onLensfunCameraChanged(); void onLensfunCameraChanged();
void onLensfunLensChanged(); void onLensfunLensChanged();
void onCorrModeChanged(); void onCorrModeChanged(const Gtk::RadioButton *rbChanged);
}; };
#endif #endif