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

Save GUI part for deltaE preview in Locallab settings panel

Browse Source
This commit is contained in:
Pandagrapher
2020-05-12 16:23:29 +02:00
parent 9204fc365d
commit 276dd89382
11 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/locallab.cc
View File

@@ -171,6 +171,7 @@ Locallab::Locallab():
panel->set_spacing(2);
// Add spot control panel to panel widget
expsettings->setControlPanelListener(this);
expsettings->setLevel(2);
panel->pack_start(*expsettings->getExpander(), false, false);
@@ -1005,6 +1006,9 @@ void Locallab::resetMaskVisibility()
// Indicate to spot control panel that no more mask preview is active
expsettings->setMaskPrevActive(false);
// Reset deltaE preview
expsettings->resetDeltaEPreview();
// Reset mask preview for all Locallab tools
for (auto tool : locallabTools) {
tool->resetMaskView();
@@ -1013,6 +1017,9 @@ void Locallab::resetMaskVisibility()
Locallab::llMaskVisibility Locallab::getMaskVisibility() const
{
// Get deltaE preview state
const bool prevDeltaE = expsettings->isDeltaEPrevActive();
// Get mask preview from Locallab tools
int colorMask, colorMaskinv, expMask, expMaskinv, shMask, shMaskinv, vibMask, softMask, blMask, tmMask, retiMask, sharMask, lcMask, cbMask;
@@ -1027,7 +1034,7 @@ Locallab::llMaskVisibility Locallab::getMaskVisibility() const
(lcMask == 0) || (cbMask == 0);
expsettings->setMaskPrevActive(isMaskActive);
return {colorMask, colorMaskinv, expMask, expMaskinv, shMask, shMaskinv, vibMask, softMask, blMask, tmMask, retiMask, sharMask, lcMask, cbMask};
return {prevDeltaE, colorMask, colorMaskinv, expMask, expMaskinv, shMask, shMaskinv, vibMask, softMask, blMask, tmMask, retiMask, sharMask, lcMask, cbMask};
}
void Locallab::resetshowPressed()
@@ -1125,8 +1132,19 @@ void Locallab::setParamEditable(bool cond)
}
}
void Locallab::resetToolMaskView()
{
// Reset mask view GUI for all other Locallab tools
for (auto tool : locallabTools) {
tool->resetMaskView();
}
}
void Locallab::resetOtherMaskView(LocallabTool* current)
{
// Reset deltaE preview
expsettings->resetDeltaEPreview();
// Reset mask view GUI for all other Locallab tools except current
for (auto tool : locallabTools) {
if (tool != current) {