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

LAB support for Navigator window

Browse Source
This commit is contained in:
Jacek Poplawski 2010-10-21 15:39:24 +02:00
parent decf9f3f69
commit a4bd162b52
3 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtdata/languages/default
View File

@ -348,6 +348,12 @@ NAVIGATOR_S_NA;S = n/a
NAVIGATOR_S_VALUE;S = %1
NAVIGATOR_V_NA;V = n/a
NAVIGATOR_V_VALUE;V = %1
NAVIGATOR_LAB_A_NA;A = n/a
NAVIGATOR_LAB_A_VALUE;A = %1
NAVIGATOR_LAB_B_NA;B = n/a
NAVIGATOR_LAB_B_VALUE;B = %1
NAVIGATOR_LAB_L_NA;L = n/a
NAVIGATOR_LAB_L_VALUE;L = %1
NAVIGATOR_XY_NA;x = n/a, y = n/a
PARTIALPASTE_BASICGROUP;Basic settings
PARTIALPASTE_CACORRECTION;C/A correction

63
rtgui/navigator.cc
View File

@ -34,14 +34,20 @@ Navigator::Navigator () {
H = Gtk::manage (new Gtk::Label ());
S = Gtk::manage (new Gtk::Label ());
V = Gtk::manage (new Gtk::Label ());
LAB_A = Gtk::manage (new Gtk::Label ());
LAB_B = Gtk::manage (new Gtk::Label ());
LAB_L = Gtk::manage (new Gtk::Label ());
Gtk::Table* table = new Gtk::Table (3, 2);
Gtk::Table* table = new Gtk::Table (3, 3);
table->attach (*R, 0, 1, 0, 1, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*G, 0, 1, 1, 2, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*B, 0, 1, 2, 3, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*H, 1, 2, 0, 1, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*S, 1, 2, 1, 2, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*V, 1, 2, 2, 3, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*LAB_L, 2, 3, 0, 1, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*LAB_A, 2, 3, 1, 2, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table->attach (*LAB_B, 2, 3, 2, 3, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
mbox->pack_start (*table, Gtk::PACK_SHRINK, 2);
@ -60,6 +66,9 @@ void Navigator::setInvalid () {
H->set_text (M("NAVIGATOR_H_NA"));
S->set_text (M("NAVIGATOR_S_NA"));
V->set_text (M("NAVIGATOR_V_NA"));
LAB_A->set_text (M("NAVIGATOR_LAB_A_NA"));
LAB_B->set_text (M("NAVIGATOR_LAB_B_NA"));
LAB_L->set_text (M("NAVIGATOR_LAB_L_NA"));
}
void Navigator::pointerMoved (bool validPos, int x, int y, int r, int g, int b) {
@ -76,6 +85,12 @@ void Navigator::pointerMoved (bool validPos, int x, int y, int r, int g, int b)
H->set_text (Glib::ustring::compose (M("NAVIGATOR_H_VALUE"), h));
S->set_text (Glib::ustring::compose (M("NAVIGATOR_S_VALUE"), s));
V->set_text (Glib::ustring::compose (M("NAVIGATOR_V_VALUE"), v));
int LAB_a, LAB_b, LAB_l;
rgb2lab (r, g, b, LAB_l, LAB_a, LAB_b);
LAB_A->set_text (Glib::ustring::compose (M("NAVIGATOR_LAB_A_VALUE"), LAB_a));
LAB_B->set_text (Glib::ustring::compose (M("NAVIGATOR_LAB_B_VALUE"), LAB_b));
LAB_L->set_text (Glib::ustring::compose (M("NAVIGATOR_LAB_L_VALUE"), LAB_l));
}
}
@ -113,3 +128,49 @@ void Navigator::rgb2hsv (int r, int g, int b, int &h, int &s, int &v) {
s = (int)(S*255.0);
v = (int)(V*255.0);
}
void Navigator::rgb2lab (int r, int g, int b, int &LAB_l, int &LAB_a, int &LAB_b) {
volatile double var_R = r / 255.0;
volatile double var_G = g / 255.0;
volatile double var_B = b / 255.0;
if ( var_R > 0.04045 )
var_R = pow ( ( ( var_R + 0.055 ) / 1.055 ), 2.4);
else
var_R = var_R / 12.92;
if ( var_G > 0.04045 )
var_G = pow ( ( ( var_G + 0.055 ) / 1.055 ), 2.4);
else
var_G = var_G / 12.92;
if ( var_B > 0.04045 )
var_B = pow ( ( ( var_B + 0.055 ) / 1.055 ), 2.4);
else
var_B = var_B / 12.92;
var_R = var_R * 100;
var_G = var_G * 100;
var_B = var_B * 100;
double var_X = ( var_R * 0.4124 + var_G * 0.3576 + var_B * 0.1805 ) / 95.047;
double var_Y = ( var_R * 0.2126 + var_G * 0.7152 + var_B * 0.0722 ) / 100.000;
double var_Z = ( var_R * 0.0193 + var_G * 0.1192 + var_B * 0.9505 ) / 108.883;
if ( var_X > 0.008856 )
var_X = pow (var_X, ( 1.0/3.0 ));
else
var_X = ( 7.787 * var_X ) + ( 16.0 / 116.0 );
if ( var_Y > 0.008856 )
var_Y = pow (var_Y, ( 1.0/3.0 ));
else
var_Y = ( 7.787 * var_Y ) + ( 16.0 / 116.0 );
if ( var_Z > 0.008856 )
var_Z = pow (var_Z, ( 1.0/3.0 ));
else
var_Z = ( 7.787 * var_Z ) + ( 16.0 / 116.0 );
LAB_l = ( 116 * var_Y ) - 16;
LAB_a = 500 * ( var_X - var_Y );
LAB_b = 200 * ( var_Y - var_Z );
}

2
rtgui/navigator.h
View File

@ -29,8 +29,10 @@ class Navigator : public Gtk::Frame, public PointerMotionListener {
Gtk::Label* position;
Gtk::Label *R, *G, *B;
Gtk::Label *H, *S, *V;
Gtk::Label *LAB_A, *LAB_B, *LAB_L;
void rgb2hsv (int r, int g, int b, int &h, int &s, int &v);
void rgb2lab (int r, int g, int b, int &LAB_l, int &LAB_a, int &LAB_b);
void setInvalid ();
public:
PreviewWindow* previewWindow;