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

Add CBDL mask to rtengine - but disabled

Browse Source
This commit is contained in:
Desmis
2019-04-14 17:42:55 +02:00
parent c3b3ecddec
commit 35de3e72ed
10 changed files with 193 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/locallab.cc
View File

@@ -1025,7 +1025,7 @@ Locallab::Locallab():
cbdlBox->pack_start(*residFrame);
cbdlBox->pack_start(*softradiuscb);
cbdlBox->pack_start(*sensicb);
// cbdlBox->pack_start(*maskcbFrame);
// cbdlBox->pack_start(*maskcbFrame);
expcbdl->add(*cbdlBox);
expcbdl->setLevel(2);
@@ -2699,7 +2699,7 @@ void Locallab::showmaskcbMethodChanged()
// When one mask state is changed, other masks are deactivated
disableListener();
showmaskcbMethod->set_active(0);
//showmaskcbMethod->set_active(0);
enableListener();
if (listener) {
@@ -2726,6 +2726,9 @@ Locallab::llMaskVisibility* Locallab::getMaskVisibility()
maskStruct->expMask = showmaskexpMethod->get_active_row_number();
maskStruct->SHMask = showmaskSHMethod->get_active_row_number();
maskStruct->cbMask = showmaskcbMethod->get_active_row_number();
printf("SHmask=%i \n", maskStruct->SHMask);
printf("cbmask=%i \n", maskStruct->cbMask);
return maskStruct;
}
@@ -4639,7 +4642,7 @@ void Locallab::disableListener()
// Contrast by detail levels
enablecbdlConn.block(true);
enacbMaskConn.block(true);
showmaskSHMethodConn.block(true);
showmaskcbMethodConn.block(true);
// Denoise
enabledenoiConn.block(true);
}

6
rtgui/toolpanelcoord.cc
View File

@@ -460,9 +460,9 @@ void ToolPanelCoordinator::panelChanged(const rtengine::ProcEvent& event, const
}
// Manage Locallab mask visibility
if (event == rtengine::EvlocallabshowmaskcolMethod || event == rtengine::EvlocallabshowmaskexpMethod || event == rtengine::EvlocallabshowmaskSHMethod) {
if (event == rtengine::EvlocallabshowmaskcolMethod || event == rtengine::EvlocallabshowmaskexpMethod || event == rtengine::EvlocallabshowmaskSHMethod || event == rtengine::EvlocallabshowmaskcbMethod) {
Locallab::llMaskVisibility* maskStruc = locallab->getMaskVisibility();
ipc->setLocallabMaskVisibility(maskStruc->colorMask, maskStruc->expMask, maskStruc->SHMask);
ipc->setLocallabMaskVisibility(maskStruc->colorMask, maskStruc->expMask, maskStruc->SHMask, maskStruc->cbMask);
}
ipc->endUpdateParams(changeFlags); // starts the IPC processing
@@ -570,7 +570,7 @@ void ToolPanelCoordinator::profileChange(
// Reset Locallab mask visibility when a picture is loaded
if (event == rtengine::EvPhotoLoaded) {
locallab->resetMaskVisibility();
ipc->setLocallabMaskVisibility(0, 0, 0);
ipc->setLocallabMaskVisibility(0, 0, 0, 0);
}
// start the IPC processing