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

enhancement to GUI primaries

Browse Source
This commit is contained in:
Desmis 2018-05-03 11:45:06 +02:00
parent d9d2175a25
commit 40506397fe
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtdata/languages/default
View File

@ -1615,12 +1615,13 @@ TP_GAMMA_PRIM_BEST;BestRGB
TP_GAMMA_PRIM_BETA;BetaRGB TP_GAMMA_PRIM_BETA;BetaRGB
TP_GAMMA_PRIM_BRUCE;BruceRGB TP_GAMMA_PRIM_BRUCE;BruceRGB
TP_GAMMA_PRIM_FREE;Custom primaries - ICC v4 TP_GAMMA_PRIM_FREE;Custom primaries - ICC v4
TP_GAMMA_PRIM_REDX;Red x
TP_GAMMA_PRIM_REDY;Red y TP_GAMMA_PRIM_REDX;Red x
TP_GAMMA_PRIM_REDY;Red y
TP_GAMMA_PRIM_GREX;Green x TP_GAMMA_PRIM_GREX;Green x
TP_GAMMA_PRIM_GREY;Green y TP_GAMMA_PRIM_GREY;Green y
TP_GAMMA_PRIM_BLUX;Blue x TP_GAMMA_PRIM_BLUX;Blue x
TP_GAMMA_PRIM_BLUY;Blue y TP_GAMMA_PRIM_BLUY;Blue y
TP_GAMMA_TEMP;Illuminant (ICC v4) TP_GAMMA_TEMP;Illuminant (ICC v4)
TP_GAMMA_TEMP_DEF;Default TP_GAMMA_TEMP_DEF;Default
TP_GAMMA_TEMP_41;D41 TP_GAMMA_TEMP_41;D41

30
rtgui/icmpanel.cc
View File

@ -325,9 +325,10 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
wprimaries->set_active(5); wprimaries->set_active(5);
prifreeVBox = Gtk::manage(new Gtk::VBox()); prifreeVBox = Gtk::manage(new Gtk::VBox());
priredHBox = Gtk::manage(new Gtk::HBox()); prinulHBox = Gtk::manage(new Gtk::HBox());
prigreenHBox = Gtk::manage(new Gtk::HBox()); prigreenHBox = Gtk::manage(new Gtk::HBox());
priblueHBox = Gtk::manage(new Gtk::HBox()); priblueHBox = Gtk::manage(new Gtk::HBox());
priredHBox = Gtk::manage(new Gtk::HBox());
Gtk::Image* gamuts0 = Gtk::manage(new RTImage("rt-logo-tiny.png")); Gtk::Image* gamuts0 = Gtk::manage(new RTImage("rt-logo-tiny.png"));
Gtk::Image* gamutl0 = Gtk::manage(new RTImage("rt-logo-small.png")); Gtk::Image* gamutl0 = Gtk::manage(new RTImage("rt-logo-small.png"));
@ -349,18 +350,19 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
pblux = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUX"), 0.0001, 0.1600, 0.0001, 0.1500, gamutl4, gamuts4)); pblux = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUX"), 0.0001, 0.1600, 0.0001, 0.1500, gamutl4, gamuts4));
pbluy = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUY"), -0.0700, 0.0700, 0.0001, 0.060, gamutl5, gamuts5)); pbluy = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUY"), -0.0700, 0.0700, 0.0001, 0.060, gamutl5, gamuts5));
priredHBox->pack_start(*predx,Gtk::PACK_EXPAND_WIDGET, 4);
priredHBox->pack_start(*predy,Gtk::PACK_EXPAND_WIDGET, 4);
prifreeVBox->pack_start(*priredHBox,Gtk::PACK_EXPAND_WIDGET, 4);
priredHBox->pack_start(*predx, Gtk::PACK_SHRINK); prigreenHBox->pack_start(*pgrex, Gtk::PACK_EXPAND_WIDGET, 4);
priredHBox->pack_start(*predy, Gtk::PACK_SHRINK); prigreenHBox->pack_start(*pgrey, Gtk::PACK_EXPAND_WIDGET, 4);
prifreeVBox->pack_start(*priredHBox, Gtk::PACK_SHRINK); prifreeVBox->pack_start(*prigreenHBox, Gtk::PACK_EXPAND_WIDGET, 4);
prigreenHBox->pack_start(*pgrex, Gtk::PACK_SHRINK);
prigreenHBox->pack_start(*pgrey, Gtk::PACK_SHRINK); priblueHBox->pack_start(*pblux, Gtk::PACK_EXPAND_WIDGET, 4);
prifreeVBox->pack_start(*prigreenHBox, Gtk::PACK_SHRINK); priblueHBox->pack_start(*pbluy, Gtk::PACK_EXPAND_WIDGET, 4);
prifreeVBox->pack_start(*priblueHBox,Gtk::PACK_EXPAND_WIDGET, 4);;
priblueHBox->pack_start(*pblux, Gtk::PACK_SHRINK);
priblueHBox->pack_start(*pbluy, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*priblueHBox, Gtk::PACK_SHRINK);
fgVBox->pack_start(*prifreeVBox, Gtk::PACK_SHRINK); fgVBox->pack_start(*prifreeVBox, Gtk::PACK_SHRINK);
@ -392,9 +394,9 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
} }
slpos->show(); slpos->show();
trcHBox->pack_start(*gampos, Gtk::PACK_SHRINK); //gamma trcHBox->pack_start(*gampos, Gtk::PACK_EXPAND_WIDGET, 4); //gamma
trcHBox->pack_start(*slpos, Gtk::PACK_SHRINK); //slope trcHBox->pack_start(*slpos, Gtk::PACK_EXPAND_WIDGET, 4); //slope
fgVBox->pack_start(*trcHBox, Gtk::PACK_SHRINK); fgVBox->pack_start(*trcHBox, Gtk::PACK_EXPAND_WIDGET, 4);
//V2 or V4 profiles //V2 or V4 profiles
profHBox = Gtk::manage(new Gtk::HBox()); profHBox = Gtk::manage(new Gtk::HBox());

5
rtgui/icmpanel.h
View File

@ -57,6 +57,8 @@ protected:
Adjuster* pbluy; Adjuster* pbluy;
Adjuster* gamm; Adjuster* gamm;
Adjuster* slop; Adjuster* slop;
Adjuster* pnulx;
Adjuster* pnuly;
Gtk::Label* labmga; Gtk::Label* labmga;
Gtk::HBox* gabox; Gtk::HBox* gabox;
@ -98,10 +100,11 @@ private:
Gtk::HBox* tempHBox; Gtk::HBox* tempHBox;
Gtk::VBox* prifreeVBox; Gtk::VBox* prifreeVBox;
Gtk::HBox* trcinHBox; Gtk::HBox* trcinHBox;
Gtk::HBox* priredHBox;
Gtk::HBox* prigreenHBox; Gtk::HBox* prigreenHBox;
Gtk::HBox* priblueHBox; Gtk::HBox* priblueHBox;
Gtk::HBox* trcHBox; Gtk::HBox* trcHBox;
Gtk::HBox* prinulHBox;
Gtk::HBox* priredHBox;
Gtk::CheckButton* obpc; Gtk::CheckButton* obpc;
Gtk::CheckButton* freegamma; Gtk::CheckButton* freegamma;