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

Microcontrast: move contrast threshold adjuster to top of tool

Browse Source
This commit is contained in:
heckflosse
2018-05-27 15:19:47 +02:00
parent 6189a41435
commit 6b8633d3d1
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/sharpening.cc
View File

@@ -33,10 +33,6 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 0)); contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 0));
contrast->setAdjusterListener (this); contrast->setAdjusterListener (this);
pack_start(*contrast); pack_start(*contrast);
if (contrast->delay < options.adjusterMaxDelay) {
contrast->delay = options.adjusterMaxDelay;
}
contrast->show(); contrast->show();
Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":")); Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));

27
rtgui/sharpenmicro.cc
View File

@@ -32,40 +32,25 @@ SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SH
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
EvSharpenMicroContrast = m->newEvent(SHARPENING, "HISTORY_MSG_MICROCONTRAST_CONTRAST"); EvSharpenMicroContrast = m->newEvent(SHARPENING, "HISTORY_MSG_MICROCONTRAST_CONTRAST");
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this);
if (amount->delay < options.adjusterMaxDelay) {
amount->delay = options.adjusterMaxDelay;
}
amount->show();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 100, 1, 20)); contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 100, 1, 20));
contrast->setAdjusterListener (this); contrast->setAdjusterListener (this);
if (contrast->delay < options.adjusterMaxDelay) {
contrast->delay = options.adjusterMaxDelay;
}
contrast->show(); contrast->show();
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this);
amount->show();
uniformity = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_UNIFORMITY"), 0, 100, 10, 50)); uniformity = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_UNIFORMITY"), 0, 100, 10, 50));
uniformity->setAdjusterListener (this); uniformity->setAdjusterListener (this);
if (uniformity->delay < options.adjusterMaxDelay) {
uniformity->delay = options.adjusterMaxDelay;
}
uniformity->show(); uniformity->show();
matrix = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENMICRO_MATRIX"))); matrix = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENMICRO_MATRIX")));
matrix->set_active (true); matrix->set_active (true);
pack_start(*matrix, Gtk::PACK_SHRINK, 0); pack_start(*matrix, Gtk::PACK_SHRINK, 0);
matrix->show (); matrix->show ();
pack_start( *amount, Gtk::PACK_SHRINK, 0);
pack_start( *contrast, Gtk::PACK_SHRINK, 0); pack_start( *contrast, Gtk::PACK_SHRINK, 0);
pack_start( *amount, Gtk::PACK_SHRINK, 0);
pack_start( *uniformity, Gtk::PACK_SHRINK, 0); pack_start( *uniformity, Gtk::PACK_SHRINK, 0);
matrixconn = matrix->signal_toggled().connect( sigc::mem_fun(*this, &SharpenMicro::matrix_toggled) ); matrixconn = matrix->signal_toggled().connect( sigc::mem_fun(*this, &SharpenMicro::matrix_toggled) );