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

procparams.h cleanup - Part 1

Browse Source 
TODO:
- Part 2 (obviously 😉)
- Remove `setDefaults()` in favour of c'tor
This commit is contained in:
Flössie
2017-11-14 21:20:07 +01:00
parent aa414fca41
commit 02d6187cd8
11 changed files with 486 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/colorappearance.cc
View File

@@ -799,9 +799,9 @@ void ColorAppearance::read (const ProcParams* pp, const ParamsEdited* pedited)
shape->setCurve (pp->colorappearance.curve);
shape2->setCurve (pp->colorappearance.curve2);
shape3->setCurve (pp->colorappearance.curve3);
toneCurveMode->set_active (pp->colorappearance.curveMode);
toneCurveMode2->set_active (pp->colorappearance.curveMode2);
toneCurveMode3->set_active (pp->colorappearance.curveMode3);
toneCurveMode->set_active (toUnderlying(pp->colorappearance.curveMode));
toneCurveMode2->set_active (toUnderlying(pp->colorappearance.curveMode2));
toneCurveMode3->set_active (toUnderlying(pp->colorappearance.curveMode3));
curveMode3Changed(); // This will set the correct sensitive state of depending Adjusters
if (pedited) {
@@ -1044,27 +1044,27 @@ void ColorAppearance::write (ProcParams* pp, ParamsEdited* pedited)
int tcMode = toneCurveMode->get_active_row_number();
if (tcMode == 0) {
pp->colorappearance.curveMode = ColorAppearanceParams::TC_MODE_LIGHT;
pp->colorappearance.curveMode = ColorAppearanceParams::TCMode::LIGHT;
} else if (tcMode == 1) {
pp->colorappearance.curveMode = ColorAppearanceParams::TC_MODE_BRIGHT;
pp->colorappearance.curveMode = ColorAppearanceParams::TCMode::BRIGHT;
}
tcMode = toneCurveMode2->get_active_row_number();
if (tcMode == 0) {
pp->colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_LIGHT;
pp->colorappearance.curveMode2 = ColorAppearanceParams::TCMode::LIGHT;
} else if (tcMode == 1) {
pp->colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_BRIGHT;
pp->colorappearance.curveMode2 = ColorAppearanceParams::TCMode::BRIGHT;
}
int tcMode3 = toneCurveMode3->get_active_row_number();
if (tcMode3 == 0) {
pp->colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_CHROMA;
pp->colorappearance.curveMode3 = ColorAppearanceParams::CTCMode::CHROMA;
} else if (tcMode3 == 1) {
pp->colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_SATUR;
pp->colorappearance.curveMode3 = ColorAppearanceParams::CTCMode::SATUR;
} else if (tcMode3 == 2) {
pp->colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_COLORF;
pp->colorappearance.curveMode3 = ColorAppearanceParams::CTCMode::COLORF;
}
if (pedited) {