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

Completing issue 1514: "Lab adjustements : CC curve and LC Hskin curve" + bugfix of the openIfNonlinear mechanism

Browse Source
This commit is contained in:
natureh
2012-08-16 13:53:17 +02:00
parent 88cf910c6d
commit 9c66911c99
32 changed files with 417 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/flatcurveeditorsubgroup.cc
View File

@@ -109,17 +109,17 @@ void FlatCurveEditorSubGroup::switchGUI() {
}
}
else {
// dCurve ave a ColorProvider or a background gradient defined, so we create/update the object
// dCurve has a ColorProvider or a background gradient defined, so we create/update the object
if (!leftBar) {
leftBar = new ColoredBar(RTO_Bottom2Top);
}
if (barColorProvider) {
bgGradient.clear();
leftBar->setColorProvider(barColorProvider);
leftBar->setColorProvider(barColorProvider, dCurve->getLeftBarCallerId());
leftBar->setBgGradient (bgGradient);
}
else {
leftBar->setColorProvider(NULL);
leftBar->setColorProvider(NULL, -1);
leftBar->setBgGradient (bgGradient);
}
}
@@ -127,7 +127,7 @@ void FlatCurveEditorSubGroup::switchGUI() {
barColorProvider = dCurve->getBottomBarColorProvider();
bgGradient = dCurve->getBottomBarBgGradient();
if (barColorProvider == NULL && bgGradient.size() == 0) {
// dCurve has no left colored bar, so we delete the object
// dCurve has no bottom colored bar, so we delete the object
if (bottomBar) {
delete bottomBar;
bottomBar = NULL;
@@ -140,11 +140,11 @@ void FlatCurveEditorSubGroup::switchGUI() {
}
if (barColorProvider) {
bgGradient.clear();
bottomBar->setColorProvider(barColorProvider);
bottomBar->setColorProvider(barColorProvider, dCurve->getBottomBarCallerId());
bottomBar->setBgGradient (bgGradient);
}
else {
bottomBar->setColorProvider(NULL);
bottomBar->setColorProvider(NULL, -1);
bottomBar->setBgGradient (bgGradient);
}
}
@@ -153,7 +153,7 @@ void FlatCurveEditorSubGroup::switchGUI() {
case (FCT_MinMaxCPoints):
CPointsCurve->setPeriodicity(dCurve->periodic); // Setting Periodicity before setting points
CPointsCurve->setPoints (dCurve->controlPointsCurveEd);
CPointsCurve->setColorProvider(dCurve->getCurveColorProvider());
CPointsCurve->setColorProvider(dCurve->getCurveColorProvider(), dCurve->getCurveCallerId());
CPointsCurve->setColoredBar(leftBar, bottomBar);
parent->pack_start (*CPointsCurveBox);
CPointsCurveBox->check_resize();
@@ -313,10 +313,6 @@ bool FlatCurveEditorSubGroup::curveReset(int cType) {
}
}
void FlatCurveEditorSubGroup::setColorProvider (ColorProvider* p) {
CPointsCurve->setColorProvider(p);
}
/*void FlatCurveEditorSubGroup::updateBackgroundHistogram (CurveEditor* ce) {
CurveEditor* fce = (CurveEditor*)ce;
if (fce==displayedCurve) {