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

Removed "lock channels" CheckButton, it wasn't very useful. Keeping the "(lead)" note on the green channel label, to give a hint that this slider controls the other two as well.

Browse Source
This commit is contained in:
rom9
2019-06-21 20:51:50 +02:00
parent 880a6e125e
commit 8c6458daff
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@@ -1642,8 +1642,6 @@ TP_FILMNEGATIVE_BLUE;Blue exponent
TP_FILMNEGATIVE_GREEN;Green exponent (lead) TP_FILMNEGATIVE_GREEN;Green exponent (lead)
TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking 2 neutral reference spots in the image; one white (light gray) and one black (dark gray).\nThe order does not matter. The exponents will be updated after the second spot is picked. TP_FILMNEGATIVE_GUESS_TOOLTIP;Calculate exponents by picking 2 neutral reference spots in the image; one white (light gray) and one black (dark gray).\nThe order does not matter. The exponents will be updated after the second spot is picked.
TP_FILMNEGATIVE_LABEL;Film Negative TP_FILMNEGATIVE_LABEL;Film Negative
TP_FILMNEGATIVE_LOCKCHANNELS;Lock exponent ratios
TP_FILMNEGATIVE_LOCKCHANNELS_TOOLTIP;Unlock to adjust channel exponents independently. This allows to adapt to the color characteristics of different film types.
TP_FILMNEGATIVE_PICK;Pick white and black spots TP_FILMNEGATIVE_PICK;Pick white and black spots
TP_FILMNEGATIVE_RED;Red exponent TP_FILMNEGATIVE_RED;Red exponent
TP_FILMNEGATIVE_REF_SPOTS;Film negative reference spots TP_FILMNEGATIVE_REF_SPOTS;Film negative reference spots

20
rtgui/filmnegative.cc
View File

@@ -54,18 +54,11 @@ FilmNegative::FilmNegative() :
redExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_RED"), 2.72)), redExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_RED"), 2.72)),
greenExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_GREEN"), 2.0)), greenExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_GREEN"), 2.0)),
blueExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_BLUE"), 1.72)), blueExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_BLUE"), 1.72)),
lockChannels(Gtk::manage(new Gtk::CheckButton(M("TP_FILMNEGATIVE_LOCKCHANNELS")))),
spotgrid(Gtk::manage(new Gtk::Grid())), spotgrid(Gtk::manage(new Gtk::Grid())),
spotbutton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_PICK")))), spotbutton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_PICK")))),
redRatio(redExp->getValue() / greenExp->getValue()), redRatio(redExp->getValue() / greenExp->getValue()),
blueRatio(blueExp->getValue() / greenExp->getValue()) blueRatio(blueExp->getValue() / greenExp->getValue())
{ {
redExp->set_sensitive(false);
blueExp->set_sensitive(false);
lockChannels->set_tooltip_text(M("TP_FILMNEGATIVE_LOCKCHANNELS_TOOLTIP"));
lockChannels->set_active (true);
spotgrid->get_style_context()->add_class("grid-spacing"); spotgrid->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(spotgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); setExpandAlignProperties(spotgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
@@ -93,13 +86,11 @@ FilmNegative::FilmNegative() :
// spotgrid->attach (*slab, 1, 0, 1, 1); // spotgrid->attach (*slab, 1, 0, 1, 1);
// spotgrid->attach (*wbsizehelper, 2, 0, 1, 1); // spotgrid->attach (*wbsizehelper, 2, 0, 1, 1);
pack_start(*lockChannels, Gtk::PACK_SHRINK, 0);
pack_start(*redExp, Gtk::PACK_SHRINK, 0); pack_start(*redExp, Gtk::PACK_SHRINK, 0);
pack_start(*greenExp, Gtk::PACK_SHRINK, 0); pack_start(*greenExp, Gtk::PACK_SHRINK, 0);
pack_start(*blueExp, Gtk::PACK_SHRINK, 0); pack_start(*blueExp, Gtk::PACK_SHRINK, 0);
pack_start(*spotgrid, Gtk::PACK_SHRINK, 0); pack_start(*spotgrid, Gtk::PACK_SHRINK, 0);
lockChannels->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::lockChannelsToggled));
spotbutton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::editToggled)); spotbutton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::editToggled));
// spotsize->signal_changed().connect( sigc::mem_fun(*this, &WhiteBalance::spotSizeChanged) ); // spotsize->signal_changed().connect( sigc::mem_fun(*this, &WhiteBalance::spotSizeChanged) );
@@ -183,11 +174,7 @@ void FilmNegative::setBatchMode(bool batchMode)
{ {
if (batchMode) { if (batchMode) {
spotConn.disconnect(); spotConn.disconnect();
lockChannelsConn.disconnect();
removeIfThere(this, spotgrid, false); removeIfThere(this, spotgrid, false);
removeIfThere(this, lockChannels, false);
redExp->set_sensitive(true);
blueExp->set_sensitive(true);
ToolPanel::setBatchMode(batchMode); ToolPanel::setBatchMode(batchMode);
redExp->showEditedCB(); redExp->showEditedCB();
greenExp->showEditedCB(); greenExp->showEditedCB();
@@ -343,10 +330,3 @@ void FilmNegative::editToggled()
unsubscribe(); unsubscribe();
} }
} }
void FilmNegative::lockChannelsToggled()
{
const bool unlocked = !lockChannels->get_active();
redExp->set_sensitive(unlocked);
blueExp->set_sensitive(unlocked);
}

4
rtgui/filmnegative.h
View File

@@ -71,7 +71,6 @@ public:
private: private:
void editToggled(); void editToggled();
void lockChannelsToggled();
const rtengine::ProcEvent evFilmNegativeExponents; const rtengine::ProcEvent evFilmNegativeExponents;
const rtengine::ProcEvent evFilmNegativeEnabled; const rtengine::ProcEvent evFilmNegativeEnabled;
@@ -84,9 +83,6 @@ private:
Adjuster* const greenExp; Adjuster* const greenExp;
Adjuster* const blueExp; Adjuster* const blueExp;
Gtk::CheckButton* const lockChannels;
sigc::connection lockChannelsConn;
Gtk::Grid* const spotgrid; Gtk::Grid* const spotgrid;
Gtk::ToggleButton* const spotbutton; Gtk::ToggleButton* const spotbutton;
sigc::connection spotConn; sigc::connection spotConn;