Add C=f(C) curve and fixed some bugs

This commit is contained in:
Desmis
2017-01-23 13:06:10 +01:00
parent 3ecf01c713
commit 9e1b9f7c19
19 changed files with 733 additions and 266 deletions

View File

@@ -354,6 +354,7 @@ void ParamsEdited::set (bool v)
locallab.localTgaincurve = v;
locallab.localTgaincurverab = v;
locallab.llcurve = v;
locallab.cccurve = v;
locallab.LHcurve = v;
for (int i = 0; i < 5; i++) {
@@ -914,6 +915,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
locallab.localTgaincurve = locallab.localTgaincurve && p.locallab.localTgaincurve == other.locallab.localTgaincurve;
locallab.localTgaincurverab = locallab.localTgaincurverab && p.locallab.localTgaincurverab == other.locallab.localTgaincurverab;
locallab.llcurve = locallab.llcurve && p.locallab.llcurve == other.locallab.llcurve;
locallab.cccurve = locallab.cccurve && p.locallab.cccurve == other.locallab.cccurve;
locallab.LHcurve = locallab.LHcurve && p.locallab.LHcurve == other.locallab.LHcurve;
locallab.expcolor = locallab.expcolor && p.locallab.expcolor == other.locallab.expcolor;
locallab.expblur = locallab.expblur && p.locallab.expblur == other.locallab.expblur;
@@ -2384,6 +2386,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.locallab.llcurve = mods.locallab.llcurve;
}
if (locallab.cccurve) {
toEdit.locallab.cccurve = mods.locallab.cccurve;
}
if (locallab.LHcurve) {
toEdit.locallab.LHcurve = mods.locallab.LHcurve;
}