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

Patch from Marco Bubke to allow bypassing the input color profile.

Browse Source
This commit is contained in:
Emil Martinec 2010-11-16 19:32:38 -06:00
parent 214e052836
commit 7ce015146f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/icmpanel.cc
View File

@ -37,6 +37,9 @@ ICMPanel::ICMPanel () : ToolPanel(), iunchanged(NULL), icmplistener(NULL) {
ilab->set_markup (Glib::ustring("<b>") + M("TP_ICM_INPUTPROFILE") + "</b>"); ilab->set_markup (Glib::ustring("<b>") + M("TP_ICM_INPUTPROFILE") + "</b>");
pack_start (*ilab, Gtk::PACK_SHRINK, 4); pack_start (*ilab, Gtk::PACK_SHRINK, 4);
inone = Gtk::manage (new Gtk::RadioButton (M("TP_ICM_INPUTNONE")));
pack_start (*inone, Gtk::PACK_SHRINK, 4);
iembedded = Gtk::manage (new Gtk::RadioButton (M("TP_ICM_INPUTEMBEDDED"))); iembedded = Gtk::manage (new Gtk::RadioButton (M("TP_ICM_INPUTEMBEDDED")));
pack_start (*iembedded, Gtk::PACK_SHRINK, 4); pack_start (*iembedded, Gtk::PACK_SHRINK, 4);
@ -53,6 +56,7 @@ ICMPanel::ICMPanel () : ToolPanel(), iunchanged(NULL), icmplistener(NULL) {
opts = icamera->get_group(); opts = icamera->get_group();
iembedded->set_group (opts); iembedded->set_group (opts);
ifromfile->set_group (opts); ifromfile->set_group (opts);
inone->set_group (opts);
igamma = Gtk::manage (new Gtk::CheckButton (M("TP_ICM_GAMMABEFOREINPUT"))); igamma = Gtk::manage (new Gtk::CheckButton (M("TP_ICM_GAMMABEFOREINPUT")));
igamma->set_sensitive (false); igamma->set_sensitive (false);
@ -137,7 +141,11 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
disableListener (); disableListener ();
ipc.block (true); ipc.block (true);
if (pp->icm.input == "(embedded)" || ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()==Gtk::STATE_INSENSITIVE)) { if (pp->icm.input == "(none)" && icamera->get_state()!=Gtk::STATE_INSENSITIVE) {
inone->set_active (true);
igamma->set_sensitive (false);
}
else if (pp->icm.input == "(embedded)" || ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()==Gtk::STATE_INSENSITIVE)) {
iembedded->set_active (true); iembedded->set_active (true);
igamma->set_sensitive (false); igamma->set_sensitive (false);
} }
@ -179,7 +187,9 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited) { void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited) {
if (iembedded->get_active ()) if (inone->get_active())
pp->icm.input = "(none)";
else if (iembedded->get_active ())
pp->icm.input = "(embedded)"; pp->icm.input = "(embedded)";
else if (icamera->get_active ()) else if (icamera->get_active ())
pp->icm.input = "(camera)"; pp->icm.input = "(camera)";
@ -211,7 +221,11 @@ void ICMPanel::wpChanged () {
void ICMPanel::ipChanged () { void ICMPanel::ipChanged () {
std::string profname; std::string profname;
if (iembedded->get_active ()) { if (inone->get_active()) {
profname = "(none)";
igamma->set_sensitive (false);
}
else if (iembedded->get_active ()) {
profname = "(embedded)"; profname = "(embedded)";
igamma->set_sensitive (false); igamma->set_sensitive (false);
} }

1
rtgui/icmpanel.h
View File

@ -31,6 +31,7 @@ class ICMPanelListener {
class ICMPanel : public Gtk::VBox, public ToolPanel { class ICMPanel : public Gtk::VBox, public ToolPanel {
private: private:
Gtk::RadioButton* inone;
Gtk::RadioButton* iembedded; Gtk::RadioButton* iembedded;
Gtk::RadioButton* icamera; Gtk::RadioButton* icamera;
Gtk::RadioButton* ifromfile; Gtk::RadioButton* ifromfile;