Custom TRC Tone response curve and Illuminant - change Histogram - RGB and Lab values - for output (screen, TIF, JPG..) (#5949)

* Change TRC in the process

* Improve GUI slope

* Add tooltip output profile

* Various change to enable and tooltip

* Chnage rtthumbnail

* Small change tooltip trc

* Another small change tooltip

* Improve GUI - change default TRC BT709 - change tooltip

* Other GUI improvment

* Small changes to BT709 values

* Various change to TRC - add illuminant working profile

* Change labels tooltip TRC illuminant

* Display wp in console if wp provided

* Change tooltip

* Change max wlope

* Init trc + illum + primaries

* Add black point compensation

* Change location abstract

* Fixed bug with rtthumbnail...

* Added tooltip

* Logscale for wslope

* Change tooltip abstract

* Change labels tooltips abstract profile

* Added 6 sliders custom primaries X and Y

* Change GUI custom primaries

* Use custom primaries abstract profiles

* Tooltip with primaries red green blue

* Fixed warning gtk

* Change one tooltip

* Change range custom primaries

* Change GUI default Primaries

* Change one tooltip

* Speedup for trc

* Rendering intent for abstract profile

* Hide intent abstract

* Preserve neutral tones

* Chnage settings preserves neutral tones

* Improve GUI

* Improvment to preserv

* Clean code - speedup TRC when illuminant and primaries default

* Change label

* Change bad default value Blux

* Add forgoten illuminant when selecting primaries

* clean code

* Change labels

* improve workingtrc for LA

* Change default primaries when select default

* Added others working profile to primaries

* Change labels and GUI

* Change tooltip

* CIExy diagram displaying the primaries (interactive) and the white point (#6207)

* Ciexy diagram

* Change to Ciexy graph

* Change graph and defaut coordonates

* Various changes to graph - params

* Disable setListener(ToolPanelListener)

* Add some graduation to graph

* Clean comment code graph

* Change radius 0

* Enable sensitive graph Ciexy

* update Ciexy graph with primaries

* Remove reset button graph

* Change labels and behavior

* First step third spot green

* Second step 3rd spot green

* First try 3 primaries graph Ciexy

* Fixed bad behavior in lab grid

* Fixed another bad behavior graph

* Clean and comment code

* Change default gamma

* More accurate graph Cie xy

* Added white point to Ciexy graph

* Added tooltip Cie xy diagram

* Improvment when illuminant change

* Refine diagram CIE xy - added WP 2000K

* White point D120 + tooltip

* Change label

* Change labels

* Change tooltips

* Improve diagram CIE xy with parabolic

* Other parabolic to improve Cie xy diagram

* Small change GUI

* Added Label CIE xy - change labels

* Change behavior when none - change labels

* Improve gUI and trys to fix LGTM alerts

* CIE xy change set sensitive

* Improve tooltip primaries sliders

* Adapt tooltip to new labels

* Fixed crash and some bad behavior

* First fix bad behavior with some primaries

* Second fixed bad behavior primaries

* Third fixed bad behavior primaries

* Change white point BestRGB

* Change order rgb in history msg Ciexy

* Change tooltip

* Change tooltip

* Improve GUI primaries

* Illuminant 1500K - display in console matrix XYZ-RGB

* Improve GUI illuminant

* Change a tooltip

* Somme changes to GUI and verbose

* Test code for wprim in read

* clean code for wprims

* further cleanups, not tested

* Some cleanups and bugfixes, #5949

* Simplify `std::unique_ptr<>` dereferencing

Also some minor cleanups.

* Some changes suggested by Floessie

* Others change suggested

* Others changes suggested by Floessie

* Forgotten change in procparams.cc

* Added black and white for use with the primaries channel mixer

* Small change behavior GUI - illuminant

* Change pragma omp in iplab2rgb

* Add enums and clean up

* Remove unused code icmpanel.cc

* Fix LGTM alert, #5949

Co-authored-by: Ingo Weyrich <heckflosse67@gmx.de>
Co-authored-by: Flössie <floessie.mail@gmail.com>
This commit is contained in:
Desmis
2021-05-16 06:18:25 +02:00
committed by GitHub
parent 7040aed540
commit 35abd92209
27 changed files with 2751 additions and 309 deletions

View File

@@ -4,6 +4,8 @@
*
* Copyright (c) 2017 Alberto Griggio <alberto.griggio@gmail.com>
*
* Copyright (c) 2021 Jacques Desmis <jdesmis@gmail.com> for CIE xy graph
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -57,22 +59,34 @@ bool LabGridArea::notifyListener()
{
return int(v * 1000) / 1000.f;
};
listener->panelChanged(evt, Glib::ustring::compose(evtMsg, round(high_a), round(high_b), round(low_a), round(low_b)));
if (! ciexy_enabled){
listener->panelChanged(evt, Glib::ustring::compose(evtMsg, round(high_a), round(high_b), round(low_a), round(low_b)));
} else {
float high_a1 = 0.55f * (high_a + 1.f) - 0.1f;
float high_b1 = 0.55f * (high_b + 1.f) - 0.1f;
float low_a1 = 0.55f * (low_a + 1.f) - 0.1f;
float low_b1 = 0.55f * (low_b + 1.f) - 0.1f;
float gre_x1 = 0.55f * (gre_x + 1.f) - 0.1f;
float gre_y1 = 0.55f * (gre_y + 1.f) - 0.1f;
listener->panelChanged(evt, Glib::ustring::compose(evtMsg, round(low_a1), round(low_b1), round(gre_x1), round(gre_y1), round(high_a1), round(high_b1)));
}
}
return false;
}
LabGridArea::LabGridArea(rtengine::ProcEvent evt, const Glib::ustring &msg, bool enable_low):
LabGridArea::LabGridArea(rtengine::ProcEvent evt, const Glib::ustring &msg, bool enable_low, bool ciexy):
Gtk::DrawingArea(),
evt(evt), evtMsg(msg),
litPoint(NONE),
low_a(0.f), high_a(0.f), low_b(0.f), high_b(0.f),
defaultLow_a(0.f), defaultHigh_a(0.f), defaultLow_b(0.f), defaultHigh_b(0.f),
low_a(0.f), high_a(0.f), low_b(0.f), high_b(0.f), gre_x(0.f), gre_y(0.f), whi_x(0.f), whi_y(0.f),//these variables are used as xy in Ciexy - no change labels
defaultLow_a(0.f), defaultHigh_a(0.f), defaultLow_b(0.f), defaultHigh_b(0.f), defaultgre_x(0.f), defaultgre_y(0.f), defaultwhi_x(0.f), defaultwhi_y(0.f),
listener(nullptr),
edited(false),
isDragged(false),
low_enabled(enable_low)
low_enabled(enable_low),
ciexy_enabled(ciexy)
{
set_can_focus(false); // prevent moving the grid while you're moving a point
add_events(Gdk::EXPOSURE_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK);
@@ -80,16 +94,21 @@ LabGridArea::LabGridArea(rtengine::ProcEvent evt, const Glib::ustring &msg, bool
get_style_context()->add_class("drawingarea");
}
void LabGridArea::getParams(double &la, double &lb, double &ha, double &hb) const
void LabGridArea::getParams(double &la, double &lb, double &ha, double &hb, double &gx, double &gy, double &wx, double &wy) const
{
la = low_a;
ha = high_a;
lb = low_b;
hb = high_b;
gx = gre_x;
gy = gre_y;
wx = whi_x;
wy = whi_y;
// printf("la=%f ha=%f lb=%f hb=%f gx=%f gy=%f\n", la, ha, lb, hb, gx, gy);
}
void LabGridArea::setParams(double la, double lb, double ha, double hb, bool notify)
void LabGridArea::setParams(double la, double lb, double ha, double hb, double gx, double gy, double wx, double wy, bool notify)
{
const double lo = -1.0;
const double hi = 1.0;
@@ -97,27 +116,37 @@ void LabGridArea::setParams(double la, double lb, double ha, double hb, bool not
low_b = rtengine::LIM(lb, lo, hi);
high_a = rtengine::LIM(ha, lo, hi);
high_b = rtengine::LIM(hb, lo, hi);
gre_x = rtengine::LIM(gx, lo, hi);
gre_y = rtengine::LIM(gy, lo, hi);
whi_x = rtengine::LIM(wx, lo, hi);
whi_y = rtengine::LIM(wy, lo, hi);
queue_draw();
if (notify) {
notifyListener();
}
}
void LabGridArea::setDefault (double la, double lb, double ha, double hb)
void LabGridArea::setDefault (double la, double lb, double ha, double hb, double gx, double gy, double wx, double wy)
{
defaultLow_a = la;
defaultLow_b = lb;
defaultHigh_a = ha;
defaultHigh_b = hb;
defaultgre_x = gx;
defaultgre_y = gy;
defaultwhi_x = wx;
defaultwhi_y = wy;
}
void LabGridArea::reset(bool toInitial)
{
if (toInitial) {
setParams(defaultLow_a, defaultLow_b, defaultHigh_a, defaultHigh_b, true);
setParams(defaultLow_a, defaultLow_b, defaultHigh_a, defaultHigh_b, defaultgre_x, defaultgre_y, defaultwhi_x, defaultwhi_y, true);
} else {
setParams(0., 0., 0., 0., true);
// printf("RESET \n");
setParams(0., 0., 0., 0., 0., 0., 0., 0., true);
}
}
@@ -166,6 +195,7 @@ bool LabGridArea::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
Gtk::Border padding = getPadding(style); // already scaled
Cairo::RefPtr<Cairo::Context> cr = getContext();
if (isDirty()) {
int width = allocation.get_width();
int height = allocation.get_height();
@@ -195,55 +225,208 @@ bool LabGridArea::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
// flip y:
cr->translate(0, height);
cr->scale(1., -1.);
const int cells = 8;
float step = 12000.f / float(cells/2);
double cellW = double(width) / double(cells);
double cellH = double(height) / double(cells);
double cellYMin = 0.;
double cellYMax = std::floor(cellH);
for (int j = 0; j < cells; j++) {
double cellXMin = 0.;
double cellXMax = std::floor(cellW);
for (int i = 0; i < cells; i++) {
float R, G, B;
float x, y, z;
int ii = i - cells/2;
int jj = j - cells/2;
float a = step * (ii + 0.5f);
float b = step * (jj + 0.5f);
Color::Lab2XYZ(25000.f, a, b, x, y, z);
Color::xyz2srgb(x, y, z, R, G, B);
cr->set_source_rgb(R / 65535.f, G / 65535.f, B / 65535.f);
cr->rectangle(
cellXMin,
cellYMin,
cellXMax - cellXMin - (i == cells-1 ? 0. : double(s)),
cellYMax - cellYMin - (j == cells-1 ? 0. : double(s))
);
cellXMin = cellXMax;
cellXMax = std::floor(cellW * double(i+2) + 0.01);
cr->fill();
}
cellYMin = cellYMax;
cellYMax = std::floor(cellH * double(j+2) + 0.01);
}
if (! ciexy_enabled) {//draw cells for Labgrid
int cells = 8;
float step = 12000.f / float(cells/2);
double cellW = double(width) / double(cells);
double cellH = double(height) / double(cells);
double cellYMin = 0.;
double cellYMax = std::floor(cellH);
for (int j = 0; j < cells; j++) {
double cellXMin = 0.;
double cellXMax = std::floor(cellW);
for (int i = 0; i < cells; i++) {
float R, G, B;
float x, y, z;
int ii = i - cells/2;
int jj = j - cells/2;
float a = step * (ii + 0.5f);
float b = step * (jj + 0.5f);
Color::Lab2XYZ(25000.f, a, b, x, y, z);
Color::xyz2srgb(x, y, z, R, G, B);
cr->set_source_rgb(R / 65535.f, G / 65535.f, B / 65535.f);
cr->rectangle(
cellXMin,
cellYMin,
cellXMax - cellXMin - (i == cells-1 ? 0. : double(s)),
cellYMax - cellYMin - (j == cells-1 ? 0. : double(s))
);
cellXMin = cellXMax;
cellXMax = std::floor(cellW * double(i+2) + 0.01);
cr->fill();
}
cellYMin = cellYMax;
cellYMax = std::floor(cellH * double(j+2) + 0.01);
}
} else {//cells for CIE xy
int cells = 600;
float step = 1.f / float(cells);
double cellW = double(width) / double(cells);
double cellH = double(height) / double(cells);
double cellYMin = 0.;
double cellYMax = std::floor(cellH);
//various approximations to simulate Ciexy curves graph
// this graph is not accurate...I replace curve by polygon or parabolic
float xa = 0.2653f / (0.7347f - 0.17f);
float xb = -0.17f * xa;
//linaer values
// float ax = (0.1f - 0.6f) / 0.08f;
// float bx = 0.6f;
// float ax0 = -0.1f / (0.17f - 0.08f);
// float bx0 = -0.17f* ax0;
float axs = (0.2653f - 0.65f) / (0.7347f - 0.35f);
float bxs = 0.65f - axs * 0.35f;
// float axss = (0.7f - 0.83f) / (0.3f - 0.1f);
// float bxss = 0.7f - 0.3f * axss;
//float bxsss = 0.65f;
//float axsss = (0.83f - bxsss) / 0.05f;
//float bx4s = 0.83f;
float ay = 0.4f;
float by = 0.4f;
for (int j = 0; j < cells; j++) {
double cellXMin = 0.;
double cellXMax = std::floor(cellW);
for (int i = 0; i < cells; i++) {
float R, G, B;
float XX, YY, ZZ;
float x = 1.1f * step * i - 0.1f;//Graph CIExy with -0.1 to 1 - must be enough
float y = 1.1f * step * j - 0.1;//Graph CIExy with -0.1 to 1 - must be enough
if(y > 0.5f) {
YY = 0.6f;
} else {
YY = ay * y + by;
}
XX = (x * YY) / y;
ZZ = ((1.f - x - y)* YY) / y;
float yr = xa * x + xb;
// float y0 = ax0 * x + bx0;
// float y1 = ax * x + bx;
float y2 = axs * x + bxs;
// float y3 = axss * x + bxss;
// float y4 = axsss * x + bxsss;
// float y5 = bx4s;
float y6 = 22.52f * x * x - 7.652f * x + 0.65f;//parabolic passing in x=0.17 y=0 - x=0.1 y =0.11 - x=0 y= 0.65
float y3 = -1.266666f * x * x -0.170002f * x + 0.859686f;//other parabolic for green passing in x=0.35 y=0.65 - x=0.20 y=0.775 - x=0.1 y=0.83
float y4 = -60.71428f * x * x + 6.821428f * x + 0.65f;//other parabolic x=0 y=0.65 - x=0.03 y=0.8 - x=0.07 y=0.83
//small difference in the connection of the 2 last parabolic
Color::xyz2srgb(XX, YY, ZZ, R, G, B);
//replace color by gray
if(y < yr && x > 0.17f) {
R = 0.7f; G = 0.7f; B = 0.7f;
}
/*
if(y < y0 && x <= 0.17f && x >= 0.08f) {
R = 0.7f; G = 0.7f; B = 0.7f;
}
if(y < y1 && x < 0.08f) {
R = 0.7f; G = 0.7f; B = 0.7f;
}
*/
if(y < y6 && y < 0.65f && x < 0.17f) {
R = 0.7f; G = 0.7f; B = 0.7f;
}
if(y > y2 && x > 0.35f) {//0.35
R = 0.7f; G = 0.7f; B = 0.7f;
}
if(y > y3 && x <= 0.35f && x > 0.06f) {//0.35
R = 0.7f; G = 0.7f; B = 0.7f;
}
if(y > y4 && x <= 0.06f) {
R = 0.7f; G = 0.7f; B = 0.7f;
}
// if(y > y5 && x >= 0.07f && x <= 0.1f) {
// R = 0.7f; G = 0.7f; B = 0.7f;
// }
cr->set_source_rgb(R , G , B);
cr->rectangle(
cellXMin,
cellYMin,
cellXMax - cellXMin - (i == cells-1 ? 0. : 0.f * double(s)),
cellYMax - cellYMin - (j == cells-1 ? 0. : 0.f * double(s))
);
cellXMin = cellXMax;
cellXMax = std::floor(cellW * double(i+2) + 0.001);
cr->fill();
}
cellYMin = cellYMax;
cellYMax = std::floor(cellH * double(j+2) + 0.001);
}
}
// drawing the connection line
cr->set_antialias(Cairo::ANTIALIAS_DEFAULT);
float loa, hia, lob, hib;
float loa, hia, lob, hib, grx, gry, whx, why;
loa = .5 * (width + width * low_a);
hia = .5 * (width + width * high_a);
lob = .5 * (height + height * low_b);
hib = .5 * (height + height * high_b);
cr->set_line_width(2. * double(s));
grx = .5 * (width + width * gre_x);
gry = .5 * (height + height * gre_y);
whx = .5 * (width + width * whi_x);
why = .5 * (height + height * whi_y);
cr->set_line_width(1.5f * double(s));
cr->set_source_rgb(0.6, 0.6, 0.6);
cr->move_to(loa, lob);
cr->line_to(hia, hib);
if (ciexy_enabled) {
cr->move_to(loa, lob);
cr->line_to(grx, gry);
cr->move_to(grx, gry);
cr->line_to(hia, hib);
}
cr->stroke();
if (ciexy_enabled) {
//to convert from / to Ciexy <=> area
// pos_area = 1.81818 * (x + 0.1) - 1
// x = 0.55 * (pos_area + 1) - 0.1
cr->set_line_width(0.2f * double(s));
cr->set_source_rgb(0.1, 0.1, 0.1);
//draw horiz and vertical lines
for(int i = 0; i < 22; i++) {
cr->move_to(0.04545 * i * width, 0.);
cr->line_to(0.04545 * i * width, height);
}
for(int i = 0; i < 22; i++) {
cr->move_to(0., 0.04545 * i * height );
cr->line_to(width, 0.04545 * i * height);
}
cr->stroke();
//draw abciss and ordonate
cr->set_line_width(1.f * double(s));
cr->set_source_rgb(0.4, 0., 0.);
cr->move_to(0.04545 * 2 * width, 0.);
cr->line_to(0.04545 * 2 * width, height);
cr->move_to(0., 0.04545 * 2 * height );
cr->line_to(width, 0.04545 * 2 * height);
cr->stroke();
//draw 0 and 1 with circle and lines
cr->set_line_width(1.2f * double(s));
cr->set_source_rgb(0.4, 0., 0.);
cr->arc(0.06 * width, 0.06 * height, 0.016 * width, 0, 2. * rtengine::RT_PI);
cr->stroke();
cr->set_line_width(1.5f * double(s));
cr->set_source_rgb(0.4, 0., 0.);
cr->move_to(0.985 * width, 0.08 * height);
cr->line_to(0.985 * width, 0.055 * height);
cr->move_to(0.07 * width, 0.99 * height);
cr->line_to(0.07 * width, 0.965 * height);
cr->stroke();
}
// drawing points
if (low_enabled) {
cr->set_source_rgb(0.1, 0.1, 0.1);
cr->set_source_rgb(0.1, 0.1, 0.1);//black for red in Ciexy
if (litPoint == LOW) {
cr->arc(loa, lob, 5 * s, 0, 2. * rtengine::RT_PI);
} else {
@@ -252,7 +435,23 @@ bool LabGridArea::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
cr->fill();
}
cr->set_source_rgb(0.9, 0.9, 0.9);
if (ciexy_enabled) {
cr->set_source_rgb(0.5, 0.5, 0.5);//gray for green
if (litPoint == GRE) {
cr->arc(grx, gry, 5 * s, 0, 2. * rtengine::RT_PI);
} else {
cr->arc(grx, gry, 3 * s, 0, 2. * rtengine::RT_PI);
}
cr->fill();
}
if (ciexy_enabled) {//White Point
cr->set_source_rgb(1., 1., 1.);//White
cr->arc(whx, why, 3 * s, 0, 2. * rtengine::RT_PI);
cr->fill();
}
cr->set_source_rgb(0.9, 0.9, 0.9);//white for blue en Ciexy
if (litPoint == HIGH) {
cr->arc(hia, hib, 5 * s, 0, 2. * rtengine::RT_PI);
} else {
@@ -269,10 +468,11 @@ bool LabGridArea::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
bool LabGridArea::on_button_press_event(GdkEventButton *event)
{
if (event->button == 1) {
if (!ciexy_enabled) {
if (event->type == GDK_2BUTTON_PRESS) {
switch (litPoint) {
case NONE:
low_a = low_b = high_a = high_b = 0.f;
low_a = low_b = high_a = high_b = gre_x = gre_y = 0.f;
break;
case LOW:
low_a = low_b = 0.f;
@@ -280,6 +480,9 @@ bool LabGridArea::on_button_press_event(GdkEventButton *event)
case HIGH:
high_a = high_b = 0.f;
break;
case GRE:
gre_x = gre_y = 0.f;
break;
}
edited = true;
notifyListener();
@@ -287,6 +490,16 @@ bool LabGridArea::on_button_press_event(GdkEventButton *event)
} else if (event->type == GDK_BUTTON_PRESS && litPoint != NONE) {
isDragged = true;
}
} else {
if (event->type == GDK_2BUTTON_PRESS) {
edited = true;
notifyListener();
queue_draw();
} else if (event->type == GDK_BUTTON_PRESS && litPoint != NONE) {
isDragged = true;
}
}
return false;
}
return true;
@@ -328,6 +541,9 @@ bool LabGridArea::on_motion_notify_event(GdkEventMotion *event)
} else if (litPoint == HIGH) {
high_a = ma;
high_b = mb;
} else if (litPoint == GRE) {
gre_x = ma;
gre_y = mb;
}
edited = true;
grab_focus();
@@ -343,13 +559,18 @@ bool LabGridArea::on_motion_notify_event(GdkEventMotion *event)
float lb = low_b;
float ha = high_a;
float hb = high_b;
float gx = gre_x;
float gy = gre_y;
const float thrs = 0.05f;
const float distlo = (la - ma) * (la - ma) + (lb - mb) * (lb - mb);
const float disthi = (ha - ma) * (ha - ma) + (hb - mb) * (hb - mb);
const float distgxy = (gx - ma) * (gx - ma) + (gy - mb) * (gy - mb);
if (low_enabled && distlo < thrs * thrs && distlo < disthi) {
litPoint = LOW;
} else if (disthi < thrs * thrs && disthi <= distlo) {
litPoint = HIGH;
} else if (ciexy_enabled && distgxy < thrs * thrs && distgxy <= distlo) {
litPoint = GRE;
}
if ((oldLitPoint == NONE && litPoint != NONE) || (oldLitPoint != NONE && litPoint == NONE)) {
queue_draw();
@@ -391,6 +612,10 @@ bool LabGridArea::lowEnabled() const
return low_enabled;
}
bool LabGridArea::ciexyEnabled() const
{
return ciexy_enabled;
}
void LabGridArea::setLowEnabled(bool yes)
{
@@ -400,17 +625,26 @@ void LabGridArea::setLowEnabled(bool yes)
}
}
void LabGridArea::setciexyEnabled(bool yes)
{
if (ciexy_enabled != yes) {
ciexy_enabled = yes;
queue_draw();
}
}
//-----------------------------------------------------------------------------
// LabGrid
//-----------------------------------------------------------------------------
LabGrid::LabGrid(rtengine::ProcEvent evt, const Glib::ustring &msg, bool enable_low):
grid(evt, msg, enable_low)
LabGrid::LabGrid(rtengine::ProcEvent evt, const Glib::ustring &msg, bool enable_low, bool ciexy):
grid(evt, msg, enable_low, ciexy)
{
Gtk::Button *reset = Gtk::manage(new Gtk::Button());
reset->set_tooltip_markup(M("ADJUSTER_RESET_TO_DEFAULT"));
reset->add(*Gtk::manage(new RTImage("undo-small.png", "redo-small.png")));
if(!ciexy) {//disabled for Cie xy
reset->add(*Gtk::manage(new RTImage("undo-small.png", "redo-small.png")));
}
reset->signal_button_release_event().connect(sigc::mem_fun(*this, &LabGrid::resetPressed));
setExpandAlignProperties(reset, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START);