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

Log transform: add method combobox

Browse Source
This commit is contained in:
Ingo Weyrich
2020-01-02 19:28:57 +01:00
parent 2ce6e6d1d3
commit 49d594f67a
8 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rtgui/lensgeom.cc
View File

@@ -17,6 +17,8 @@
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#include "lensgeom.h"
#include "eventmapper.h"
#include "guiutils.h"
#include "rtimage.h"
@@ -28,6 +30,18 @@ using namespace rtengine::procparams;
LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGEOM_LABEL")), rlistener(nullptr), lastFill(false)
{
auto m = ProcEventMapper::getInstance();
EvTransMethod = m->newEvent(TRANSFORM, "HISTORY_MSG_TRANS_METHOD");
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
method->append(M("TP_LENSGEOM_LOG"));
method->append(M("TP_LENSGEOM_LIN"));
method->set_active(0);
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
fill = Gtk::manage (new Gtk::CheckButton (M("TP_LENSGEOM_FILL")));
pack_start (*fill);
@@ -39,8 +53,9 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
packBox = Gtk::manage (new ToolParamBlock ());
pack_start (*packBox);
autoCrop->signal_pressed().connect( sigc::mem_fun(*this, &LensGeometry::autoCropPressed) );
fillConn = fill->signal_toggled().connect( sigc::mem_fun(*this, &LensGeometry::fillPressed) );
method->connect(method->signal_changed().connect(sigc::mem_fun(*this, &LensGeometry::methodChanged)));
autoCrop->signal_pressed().connect(sigc::mem_fun(*this, &LensGeometry::autoCropPressed));
fillConn = fill->signal_toggled().connect(sigc::mem_fun(*this, &LensGeometry::fillPressed));
fill->set_active (true);
show_all ();
@@ -55,8 +70,14 @@ void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
{
disableListener ();
method->block (true);
method->set_active(pp->commonTrans.method == "log" ? 0 : 1);
if (pedited) {
if(!pedited->commonTrans.method) {
method->set_active_text(M("GENERAL_UNCHANGED"));
}
fill->set_inconsistent (!pedited->commonTrans.autofill);
}
@@ -67,15 +88,20 @@ void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
lastFill = pp->commonTrans.autofill;
method->block (false);
enableListener ();
}
void LensGeometry::write (ProcParams* pp, ParamsEdited* pedited)
{
int currentRow = method->get_active_row_number();
if( currentRow >= 0 && method->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->commonTrans.method = currentRow == 0 ? "log" : "lin";
}
pp->commonTrans.autofill = fill->get_active ();
if (pedited) {
pedited->commonTrans.method = method->get_active_text() != M("GENERAL_UNCHANGED");
pedited->commonTrans.autofill = !fill->get_inconsistent();
}
}
@@ -115,6 +141,14 @@ void LensGeometry::fillPressed ()
}
}
void LensGeometry::methodChanged ()
{
if (listener && method->get_active_row_number() >= 0) {
listener->panelChanged(EvTransMethod, method->get_active_text());
}
}
void LensGeometry::setBatchMode (bool batchMode)
{