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

Rawtherapee forgets checked Autofill-option, fixes #3332

Browse Source
This commit is contained in:
Beep6581 2016-06-09 20:38:46 +02:00
parent a28bbb853b
commit cbbdc3e36f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/lensgeom.cc
View File

@ -134,9 +134,11 @@ int LensGeometry::doDisableAutoFillIfActive (void* data)
if (instance->fill->get_active()) { if (instance->fill->get_active()) {
instance->fillConn.block (true); instance->fillConn.block (true);
instance->fill->set_active(false); instance->fill->set_active(false);
if (instance->listener) { if (instance->listener) {
instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED")); instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
} }
instance->fillConn.block (false); instance->fillConn.block (false);
} }
} }

4
rtgui/lensprofile.cc
View File

@ -67,7 +67,7 @@ LensProfilePanel::LensProfilePanel () : FoldableToolPanel(this, "lensprof", M("T
conLCPFile = fcbLCPFile->signal_file_set().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileChanged), true); conLCPFile = fcbLCPFile->signal_file_set().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileChanged), true);
btnReset->signal_clicked().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileReset), true); btnReset->signal_clicked().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileReset), true);
ckbUseDist->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseDistChanged) ); conUseDist = ckbUseDist->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseDistChanged) );
ckbUseVign->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseVignChanged) ); ckbUseVign->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseVignChanged) );
ckbUseCA->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseCAChanged) ); ckbUseCA->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseCAChanged) );
@ -77,6 +77,7 @@ LensProfilePanel::LensProfilePanel () : FoldableToolPanel(this, "lensprof", M("T
void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited) void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
{ {
disableListener (); disableListener ();
conUseDist.block(true);
if (!pp->lensProf.lcpFile.empty() && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) { if (!pp->lensProf.lcpFile.empty() && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
fcbLCPFile->set_filename (pp->lensProf.lcpFile); fcbLCPFile->set_filename (pp->lensProf.lcpFile);
@ -102,6 +103,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false; lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
enableListener (); enableListener ();
conUseDist.block(false);
} }
void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta) void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta)

5
rtgui/lensprofile.h
View File

@ -54,7 +54,10 @@ public:
void onUseDistChanged(); void onUseDistChanged();
void onUseVignChanged(); void onUseVignChanged();
void onUseCAChanged(); void onUseCAChanged();
void setLensGeomRef( LensGeometry *foo) { lensgeomLcpFill = foo ;}; void setLensGeomRef( LensGeometry *foo)
{
lensgeomLcpFill = foo ;
};
}; };
#endif #endif