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

Remove GUI mask in Global mode (#7207)

Browse Source 
* Hide GUI mask and recovery in global mode

* Disabled enamask in Global mode
This commit is contained in:
Desmis 2024-10-01 09:10:59 +02:00 committed by GitHub
parent bce20bbd09
commit 00360a6dbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 99 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rtgui/locallabtools.cc
View File

@ -1017,17 +1017,25 @@ void LocallabColor::updateguicolor(int spottype)
invers->hide(); invers->hide();
sensi->hide(); sensi->hide();
showmaskcolMethod->set_active(0); showmaskcolMethod->set_active(0);
expmaskcol1->hide();
expmaskcol->hide();
exprecov->hide();
enaColorMask->set_active(false);
previewcol->hide(); previewcol->hide();
previewcol->set_active(false); previewcol->set_active(false);
resetMaskView(); resetMaskView();
} else { } else {
invers->show(); invers->show();
sensi->show(); sensi->show();
expmaskcol1->show();
expmaskcol->show();
exprecov->show();
if(!invers->get_active()) { if(!invers->get_active()) {
previewcol->show(); previewcol->show();
} else { } else {
previewcol->hide(); previewcol->hide();
} }
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -3027,17 +3035,24 @@ void LocallabExposure::updateguiexpos(int spottype)
sensiex->hide(); sensiex->hide();
previewexe->hide(); previewexe->hide();
showmaskexpMethod->set_active(0); showmaskexpMethod->set_active(0);
enaExpMask->set_active(false);
enaExpMaskaft->set_active(false);
previewexe->set_active(false); previewexe->set_active(false);
expmaskexp->hide();
exprecove->hide();
resetMaskView(); resetMaskView();
} else { } else {
inversex->show(); inversex->show();
sensiex->show(); sensiex->show();
expmaskexp->show();
exprecove->show();
if(!inversex->get_active()) { if(!inversex->get_active()) {
previewexe->show(); previewexe->show();
} else { } else {
previewexe->hide(); previewexe->hide();
} }
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -4557,16 +4572,22 @@ void LocallabShadow::updateguishad(int spottype)
sensihs->hide(); sensihs->hide();
showmaskSHMethod->set_active(0); showmaskSHMethod->set_active(0);
previewsh->hide(); previewsh->hide();
exprecovs->hide();
expmasksh->hide();
enaSHMask->set_active(false);
previewsh->set_active(false); previewsh->set_active(false);
resetMaskView(); resetMaskView();
} else { } else {
sensihs->show(); sensihs->show();
inverssh->show(); inverssh->show();
exprecovs->show();
expmasksh->show();
if(!inverssh->get_active()) { if(!inverssh->get_active()) {
previewsh->show(); previewsh->show();
} else { } else {
previewsh->hide(); previewsh->hide();
} }
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -5735,11 +5756,18 @@ void LocallabVibrance::updateguivib(int spottype)
sensiv->hide(); sensiv->hide();
showmaskvibMethod->set_active(0); showmaskvibMethod->set_active(0);
previewvib->hide(); previewvib->hide();
enavibMask->set_active(false);
previewvib->set_active(false); previewvib->set_active(false);
exprecovv->hide();
expmaskvib->hide();
resetMaskView(); resetMaskView();
} else { } else {
sensiv->show(); sensiv->show();
previewvib->show(); previewvib->show();
exprecovv->show();
expmaskvib->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -7534,11 +7562,14 @@ void LocallabBlur::updateguiblur(int spottype)
sensibn->hide(); sensibn->hide();
sensiden->hide(); sensiden->hide();
invbl->hide(); invbl->hide();
expmaskbl->hide();
enablMask->set_active(false);
} else { } else {
sensibn->show(); sensibn->show();
sensiden->show(); sensiden->show();
invbl->show(); invbl->show();
expmaskbl->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();

65
rtgui/locallabtools2.cc
View File

@ -428,6 +428,11 @@ void LocallabTone::updateguitone(int spottype)
if(spottype == 3) { if(spottype == 3) {
sensitm->hide(); sensitm->hide();
exprecovt->hide();
expmasktm->hide();
enatmMask->set_active(false);
enatmMaskaft->set_active(false);
// showmasktmMethodConn.block(true); // showmasktmMethodConn.block(true);
showmasktmMethod->set_active(0); showmasktmMethod->set_active(0);
// showmasktmMethodConn.block(false); // showmasktmMethodConn.block(false);
@ -439,6 +444,10 @@ void LocallabTone::updateguitone(int spottype)
} else { } else {
sensitm->show(); sensitm->show();
previewtm->show(); previewtm->show();
exprecovt->show();
expmasktm->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -1188,8 +1197,15 @@ void LocallabRetinex::updateguireti(int spottype)
if(spottype == 3) { if(spottype == 3) {
sensih->hide(); sensih->hide();
exprecovr->hide();
expmaskreti->hide();
enaretiMask->set_active(false);
enaretiMasktmap->set_active(false);
} else { } else {
sensih->show(); sensih->show();
exprecovr->show();
expmaskreti->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -3123,10 +3139,15 @@ void LocallabContrast::updateguicont(int spottype)
previewlc->hide(); previewlc->hide();
previewlc->set_active(false); previewlc->set_active(false);
resetMaskView(); resetMaskView();
enalcMask->set_active(false);
exprecovw->hide();
expmasklc->hide();
} else { } else {
sensilc->show(); sensilc->show();
previewlc->show(); previewlc->show();
exprecovw->show();
expmasklc->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -4881,8 +4902,14 @@ void LocallabCBDL::updateguicbdl(int spottype)
if(spottype == 3) { if(spottype == 3) {
sensicb->hide(); sensicb->hide();
exprecovcb->hide();
expmaskcb->hide();
enacbMask->set_active(false);
} else { } else {
exprecovcb->show();
expmaskcb->show();
sensicb->show(); sensicb->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -5843,11 +5870,16 @@ void LocallabLog::updateguilog(int spottype)
showmaskLMethod->set_active(0); showmaskLMethod->set_active(0);
previewlog->hide(); previewlog->hide();
previewlog->set_active(false); previewlog->set_active(false);
enaLMask->set_active(false);
resetMaskView(); resetMaskView();
exprecovl->hide();
expmaskL->hide();
} else { } else {
sensilog->show(); sensilog->show();
previewlog->show(); previewlog->show();
exprecovl->show();
expmaskL->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -7252,10 +7284,32 @@ void LocallabMask::updateguimask(int spottype)
previewmas->hide(); previewmas->hide();
previewmas->set_active(false); previewmas->set_active(false);
resetMaskView(); resetMaskView();
blendmask->hide();
blendmaskab->hide();
softradiusmask->hide();
showmask_Method->hide();
enamask->hide();
enamask->set_active(false);
mask_CurveEditorG->hide();
struFrame->hide();
blurFrame->hide();
toolmaskFrame->hide();
} else { } else {
sensimask->show(); sensimask->show();
previewmas->show(); previewmas->show();
blendmask->show();
blendmaskab->show();
softradiusmask->show();
showmask_Method->show();
enamask->show();
mask_CurveEditorG->show();
struFrame->show();
blurFrame->show();
toolmaskFrame->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();
@ -9158,11 +9212,18 @@ void Locallabcie::updateguicie(int spottype)
sensicie->hide(); sensicie->hide();
showmaskcieMethod->set_active(0); showmaskcieMethod->set_active(0);
previewcie->hide(); previewcie->hide();
exprecovcie->hide();
expmaskcie->hide();
enacieMask->set_active(false);
enacieMaskall->set_active(false);
previewcie->set_active(false); previewcie->set_active(false);
resetMaskView(); resetMaskView();
} else { } else {
sensicie->show(); sensicie->show();
previewcie->show(); previewcie->show();
exprecovcie->show();
expmaskcie->show();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} }
enableListener(); enableListener();