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

Merge branch 'dev' into iconcleanup4

Browse Source
This commit is contained in:
Morgan Hardwood
2018-07-13 18:14:48 +02:00
parent 522495f4eb c30f03ea09
commit 10af344672
133 changed files with 5059 additions and 2715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/flatfield.cc
View File

@@ -136,7 +136,7 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
flatFieldClipControl->setAutoInconsistent(multiImage && !pedited->raw.ff_AutoClipControl);
if( !pedited->raw.ff_BlurType ) {
flatFieldBlurType->set_active(std::numeric_limits<int>::max()); // No name
flatFieldBlurType->set_active_text(M("GENERAL_UNCHANGED"));
}
}
@@ -217,7 +217,7 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
int currentRow = flatFieldBlurType->get_active_row_number();
if( currentRow >= 0 && currentRow < std::numeric_limits<int>::max()) {
if( currentRow >= 0 && flatFieldBlurType->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->raw.ff_BlurType = procparams::RAWParams::getFlatFieldBlurTypeStrings()[currentRow];
}
@@ -227,7 +227,7 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
pedited->raw.ff_BlurRadius = flatFieldBlurRadius->getEditedState ();
pedited->raw.ff_clipControl = flatFieldClipControl->getEditedState ();
pedited->raw.ff_AutoClipControl = !flatFieldClipControl->getAutoInconsistent();
pedited->raw.ff_BlurType = flatFieldBlurType->get_active_row_number() != std::numeric_limits<int>::max();
pedited->raw.ff_BlurType = flatFieldBlurType->get_active_text() != M("GENERAL_UNCHANGED");
}
}
@@ -340,20 +340,14 @@ void FlatField::flatFieldBlurTypeChanged ()
const int curSelection = flatFieldBlurType->get_active_row_number();
const RAWParams::FlatFieldBlurType blur_type = RAWParams::FlatFieldBlurType(curSelection);
Glib::ustring s;
if (curSelection >= 0 && curSelection < std::numeric_limits<int>::max()) {
s = flatFieldBlurType->get_active_text();
}
if (multiImage || blur_type == procparams::RAWParams::FlatFieldBlurType::AREA) {
flatFieldClipControl->show();
} else {
flatFieldClipControl->hide();
}
if (listener) {
listener->panelChanged (EvFlatFieldBlurType, s);
if (listener && curSelection >= 0) {
listener->panelChanged (EvFlatFieldBlurType, flatFieldBlurType->get_active_text());
}
}