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

LCurve::colorForValue formatting

Browse Source
This commit is contained in:
Morgan Hardwood
2018-01-01 22:02:15 +01:00
parent 5340f2c103
commit b624248a13
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/labcurve.cc
View File

@@ -571,43 +571,30 @@ void LCurve::colorForValue (double valX, double valY, enum ColorCaller::ElemType
} }
if (callerId == 1) { // ch - main curve if (callerId == 1) { // ch - main curve
Color::hsv2rgb01(float(valX), float(valY), 0.5f, R, G, B); Color::hsv2rgb01(float(valX), float(valY), 0.5f, R, G, B);
} else if (callerId == 2) { // cc - bottom bar } else if (callerId == 2) { // cc - bottom bar
float value = (1.f - 0.7f) * float(valX) + 0.7f; float value = (1.f - 0.7f) * float(valX) + 0.7f;
// whole hue range // whole hue range
// Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before) // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
Color::hsv2rgb01(float(valY*0.8), float(valX), value, R, G, B); Color::hsv2rgb01(float(valY*0.8), float(valX), value, R, G, B);
} else if (callerId == 6) { // cc - left bar } else if (callerId == 6) { // cc - left bar
float value = (1.f - 0.7f) * float(valX) + 0.7f; float value = (1.f - 0.7f) * float(valX) + 0.7f;
float hue = (1.14056f - 0.92f) * float(valY) + 0.92f; float hue = (1.14056f - 0.92f) * float(valY) + 0.92f;
if (hue > 1.0f) {
if (hue > 1.0f) { hue -= 1.0f;
hue -= 1.0f; }
}
// Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
Color::hsv2rgb01(hue, float(valX), value, R, G, B);
// whole hue range
// Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before) // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
// Color::hsv2rgb01(float(valY), float(valX), value, R, G, B); Color::hsv2rgb01(hue, float(valX), value, R, G, B);
} else if (callerId == 3) { // lc - bottom bar } else if (callerId == 3) { // lc - bottom bar
float value = (1.f - 0.7f) * float(valX) + 0.7f; float value = (1.f - 0.7f) * float(valX) + 0.7f;
if (lcredsk->get_active()) { if (lcredsk->get_active()) {
// skin range // skin range
// -0.1 rad < Hue < 1.6 rad // -0.1 rad < Hue < 1.6 rad
// Y axis / from 0.92 up to 0.14056 // Y axis / from 0.92 up to 0.14056
float hue = (1.14056f - 0.92f) * float(valY) + 0.92f; float hue = (1.14056f - 0.92f) * float(valY) + 0.92f;
if (hue > 1.0f) { if (hue > 1.0f) {
hue -= 1.0f; hue -= 1.0f;
} }
// Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before) // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
Color::hsv2rgb01(hue, float(valX), value, R, G, B); Color::hsv2rgb01(hue, float(valX), value, R, G, B);
} else { } else {
@@ -619,16 +606,13 @@ void LCurve::colorForValue (double valX, double valY, enum ColorCaller::ElemType
Color::hsv2rgb01(float(valX), 0.5f, float(valY), R, G, B); Color::hsv2rgb01(float(valX), 0.5f, float(valY), R, G, B);
} else if (callerId == 5) { // HH - bottom bar } else if (callerId == 5) { // HH - bottom bar
float h = float((valY - 0.5) * 0.3 + valX); float h = float((valY - 0.5) * 0.3 + valX);
if (h > 1.0f) { if (h > 1.0f) {
h -= 1.0f; h -= 1.0f;
} else if (h < 0.0f) { } else if (h < 0.0f) {
h += 1.0f; h += 1.0f;
} }
Color::hsv2rgb01(h, 0.5f, 0.5f, R, G, B); Color::hsv2rgb01(h, 0.5f, 0.5f, R, G, B);
} else if (callerId == 7) { // cc and cl - left bar } else if (callerId == 7) { // cc and cl - left bar
float value = (1.f - 0.7f) * float(valX) + 0.7f; float value = (1.f - 0.7f) * float(valX) + 0.7f;
// whole hue range // whole hue range
// Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before) // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)