do not disable auto-fill when enabling LCP distortion correction
This was a workaround for an old bug (#1791 and #3765) that is no longer necessary
This commit is contained in:
@@ -119,28 +119,3 @@ void LensGeometry::setBatchMode (bool batchMode)
|
|||||||
removeIfThere (this, autoCrop);
|
removeIfThere (this, autoCrop);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LensGeometry::disableAutoFillIfActive ()
|
|
||||||
{
|
|
||||||
const auto func = [](gpointer data) -> gboolean {
|
|
||||||
GThreadLock lock; // Is this really needed?
|
|
||||||
|
|
||||||
LensGeometry* const instance = static_cast<LensGeometry*>(data);
|
|
||||||
|
|
||||||
if (!instance->batchMode) {
|
|
||||||
if (instance->fill->get_active()) {
|
|
||||||
instance->fillConn.block(true);
|
|
||||||
instance->fill->set_active(false);
|
|
||||||
|
|
||||||
if (instance->listener) {
|
|
||||||
instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
|
|
||||||
}
|
|
||||||
|
|
||||||
instance->fillConn.block(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
};
|
|
||||||
|
|
||||||
idle_register.add(func, this);
|
|
||||||
}
|
|
||||||
|
@@ -54,7 +54,6 @@ public:
|
|||||||
{
|
{
|
||||||
rlistener = l;
|
rlistener = l;
|
||||||
}
|
}
|
||||||
void disableAutoFillIfActive ();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
IdleRegister idle_register;
|
IdleRegister idle_register;
|
||||||
|
@@ -144,10 +144,6 @@ void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited
|
|||||||
|
|
||||||
void LensProfilePanel::onLCPFileChanged()
|
void LensProfilePanel::onLCPFileChanged()
|
||||||
{
|
{
|
||||||
|
|
||||||
// Disable Auto-Fill when enabling LCP Distortion Correction, #1791
|
|
||||||
lensgeomLcpFill->disableAutoFillIfActive();
|
|
||||||
|
|
||||||
lcpFileChanged = true;
|
lcpFileChanged = true;
|
||||||
updateDisabled(lcpStore->isValidLCPFileName(fcbLCPFile->get_filename()));
|
updateDisabled(lcpStore->isValidLCPFileName(fcbLCPFile->get_filename()));
|
||||||
|
|
||||||
@@ -170,12 +166,6 @@ void LensProfilePanel::onLCPFileReset()
|
|||||||
|
|
||||||
void LensProfilePanel::onUseDistChanged()
|
void LensProfilePanel::onUseDistChanged()
|
||||||
{
|
{
|
||||||
|
|
||||||
// Disable Auto-Fill when enabling LCP Distortion Correction, #1791
|
|
||||||
if (ckbUseDist->get_active()) {
|
|
||||||
lensgeomLcpFill->disableAutoFillIfActive();
|
|
||||||
}
|
|
||||||
|
|
||||||
useDistChanged = true;
|
useDistChanged = true;
|
||||||
|
|
||||||
if (listener) {
|
if (listener) {
|
||||||
|
Reference in New Issue
Block a user