Forgot to add the crucial files!
This commit is contained in:
Emil Martinec
@@ -15,7 +15,7 @@ set (BASESOURCEFILES
|
|||||||
crophandler.cc curveeditor.cc dirbrowser.cc
|
crophandler.cc curveeditor.cc dirbrowser.cc
|
||||||
filecatalog.cc
|
filecatalog.cc
|
||||||
histogrampanel.cc history.cc imagearea.cc
|
histogrampanel.cc history.cc imagearea.cc
|
||||||
imageareapanel.cc iptcpanel.cc lcurve.cc lumadenoise.cc main.cc
|
imageareapanel.cc iptcpanel.cc labcurve.cc lumadenoise.cc main.cc
|
||||||
multilangmgr.cc mycurve.cc options.cc
|
multilangmgr.cc mycurve.cc options.cc
|
||||||
preferences.cc profilepanel.cc safegtk.cc saveasdlg.cc
|
preferences.cc profilepanel.cc safegtk.cc saveasdlg.cc
|
||||||
saveformatpanel.cc splash.cc
|
saveformatpanel.cc splash.cc
|
||||||
|
|||||||
239
rtgui/labcurve.cc
Normal file
239
rtgui/labcurve.cc
Normal file
@@ -0,0 +1,239 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of RawTherapee.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
||||||
|
*
|
||||||
|
* RawTherapee is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* RawTherapee is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include <labcurve.h>
|
||||||
|
#include <iomanip>
|
||||||
|
|
||||||
|
using namespace rtengine;
|
||||||
|
using namespace rtengine::procparams;
|
||||||
|
|
||||||
|
LCurve::LCurve () : ToolPanel(), brAdd(false), contrAdd(false) {
|
||||||
|
|
||||||
|
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||||
|
/*
|
||||||
|
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
|
||||||
|
hb->set_border_width (4);
|
||||||
|
hb->show ();
|
||||||
|
Gtk::Label* labchan = Gtk::manage (new Gtk::Label (M("TP_LABCURVE_CHANNEL")+":"));
|
||||||
|
labchan->show ();
|
||||||
|
channel = Gtk::manage (new Gtk::ComboBoxText ());
|
||||||
|
channel->append_text (M("TP_LCURVE"));
|
||||||
|
channel->append_text (M("TP_ACURVE"));
|
||||||
|
channel->append_text (M("TP_BCURVE"));
|
||||||
|
channel->show ();
|
||||||
|
hb->pack_start(*labchan, Gtk::PACK_SHRINK, 4);
|
||||||
|
hb->pack_start(*channel);
|
||||||
|
pack_start (*hb);
|
||||||
|
*/
|
||||||
|
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||||
|
|
||||||
|
|
||||||
|
Gtk::HBox* abox = Gtk::manage (new Gtk::HBox ());
|
||||||
|
abox->set_border_width (2);
|
||||||
|
|
||||||
|
// brightness = Gtk::manage (new Adjuster (M("TP_LUMACURVE_BRIGHTNESS"), -100, 100, 0.01, 0));
|
||||||
|
//contrast = Gtk::manage (new Adjuster (M("TP_LUMACURVE_CONTRAST"), -100, 100, 1, 0));
|
||||||
|
brightness = Gtk::manage (new Adjuster (M("TP_LABCURVE_BRIGHTNESS"), -100, 100, 0.01, 0));
|
||||||
|
contrast = Gtk::manage (new Adjuster (M("TP_LABCURVE_CONTRAST"), -100, 100, 1, 0));
|
||||||
|
saturation = Gtk::manage (new Adjuster (M("TP_LABCURVE_SATURATION"), -100, 100, 1, 0));
|
||||||
|
|
||||||
|
pack_start (*brightness);
|
||||||
|
brightness->show ();
|
||||||
|
|
||||||
|
pack_start (*contrast);
|
||||||
|
contrast->show ();
|
||||||
|
|
||||||
|
pack_start (*saturation);
|
||||||
|
saturation->show ();
|
||||||
|
|
||||||
|
Gtk::HSeparator *hsep3 = Gtk::manage (new Gtk::HSeparator());
|
||||||
|
hsep3->show ();
|
||||||
|
pack_start (*hsep3);
|
||||||
|
|
||||||
|
lshape = Gtk::manage (new CurveEditor ());
|
||||||
|
lshape->show ();
|
||||||
|
lshape->setCurveListener (this);
|
||||||
|
|
||||||
|
ashape = Gtk::manage (new CurveEditor ());
|
||||||
|
ashape->show ();
|
||||||
|
ashape->setCurveListener (this);
|
||||||
|
|
||||||
|
bshape = Gtk::manage (new CurveEditor ());
|
||||||
|
bshape->show ();
|
||||||
|
bshape->setCurveListener (this);
|
||||||
|
|
||||||
|
pack_start (*lshape, Gtk::PACK_SHRINK, 4);
|
||||||
|
pack_start (*ashape, Gtk::PACK_SHRINK, 4);
|
||||||
|
pack_start (*bshape, Gtk::PACK_SHRINK, 4);
|
||||||
|
|
||||||
|
|
||||||
|
brightness->setAdjusterListener (this);
|
||||||
|
contrast->setAdjusterListener (this);
|
||||||
|
saturation->setAdjusterListener (this);
|
||||||
|
|
||||||
|
//channel->signal_changed().connect( sigc::mem_fun(*this, &LCurve::channel) );
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited) {
|
||||||
|
|
||||||
|
disableListener ();
|
||||||
|
|
||||||
|
if (pedited) {
|
||||||
|
brightness->setEditedState (pedited->labCurve.brightness ? Edited : UnEdited);
|
||||||
|
contrast->setEditedState (pedited->labCurve.contrast ? Edited : UnEdited);
|
||||||
|
saturation->setEditedState (pedited->labCurve.saturation ? Edited : UnEdited);
|
||||||
|
|
||||||
|
lshape->setUnChanged (!pedited->labCurve.lcurve);
|
||||||
|
ashape->setUnChanged (!pedited->labCurve.acurve);
|
||||||
|
bshape->setUnChanged (!pedited->labCurve.bcurve);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
brightness->setValue (pp->labCurve.brightness);
|
||||||
|
contrast->setValue (pp->labCurve.contrast);
|
||||||
|
saturation->setValue (pp->labCurve.saturation);
|
||||||
|
|
||||||
|
lshape->setCurve (pp->labCurve.lcurve);
|
||||||
|
ashape->setCurve (pp->labCurve.acurve);
|
||||||
|
bshape->setCurve (pp->labCurve.bcurve);
|
||||||
|
|
||||||
|
|
||||||
|
enableListener ();
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::write (ProcParams* pp, ParamsEdited* pedited) {
|
||||||
|
|
||||||
|
pp->labCurve.brightness = brightness->getValue ();
|
||||||
|
pp->labCurve.contrast = (int)contrast->getValue ();
|
||||||
|
pp->labCurve.saturation = (int)saturation->getValue ();
|
||||||
|
|
||||||
|
pp->labCurve.lcurve = lshape->getCurve ();
|
||||||
|
pp->labCurve.acurve = ashape->getCurve ();
|
||||||
|
pp->labCurve.bcurve = bshape->getCurve ();
|
||||||
|
|
||||||
|
if (pedited) {
|
||||||
|
pedited->labCurve.brightness = brightness->getEditedState ();
|
||||||
|
pedited->labCurve.contrast = contrast->getEditedState ();
|
||||||
|
pedited->labCurve.saturation = saturation->getEditedState ();
|
||||||
|
|
||||||
|
pedited->labCurve.lcurve = !lshape->isUnChanged ();
|
||||||
|
pedited->labCurve.acurve = !ashape->isUnChanged ();
|
||||||
|
pedited->labCurve.bcurve = !bshape->isUnChanged ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) {
|
||||||
|
|
||||||
|
brightness->setDefault (defParams->labCurve.brightness);
|
||||||
|
contrast->setDefault (defParams->labCurve.contrast);
|
||||||
|
saturation->setDefault (defParams->labCurve.saturation);
|
||||||
|
|
||||||
|
if (pedited) {
|
||||||
|
brightness->setDefaultEditedState (pedited->labCurve.brightness ? Edited : UnEdited);
|
||||||
|
contrast->setDefaultEditedState (pedited->labCurve.contrast ? Edited : UnEdited);
|
||||||
|
saturation->setDefaultEditedState (pedited->labCurve.saturation ? Edited : UnEdited);
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
brightness->setDefaultEditedState (Irrelevant);
|
||||||
|
contrast->setDefaultEditedState (Irrelevant);
|
||||||
|
saturation->setDefaultEditedState (Irrelevant);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::curveChanged () {
|
||||||
|
|
||||||
|
if (listener) {
|
||||||
|
listener->panelChanged (EvLLCurve, M("HISTORY_CUSTOMCURVE"));
|
||||||
|
listener->panelChanged (EvLaCurve, M("HISTORY_CUSTOMCURVE"));
|
||||||
|
listener->panelChanged (EvLbCurve, M("HISTORY_CUSTOMCURVE"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::adjusterChanged (Adjuster* a, double newval) {
|
||||||
|
|
||||||
|
if (!listener)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Glib::ustring costr;
|
||||||
|
if (a==brightness)
|
||||||
|
costr = Glib::ustring::format (std::setw(3), std::fixed, std::setprecision(2), a->getValue());
|
||||||
|
else
|
||||||
|
costr = Glib::ustring::format ((int)a->getValue());
|
||||||
|
|
||||||
|
if (a==brightness)
|
||||||
|
listener->panelChanged (EvLBrightness, costr);
|
||||||
|
else if (a==contrast)
|
||||||
|
listener->panelChanged (EvLContrast, costr);
|
||||||
|
else if (a==saturation)
|
||||||
|
listener->panelChanged (EvLSaturation, costr);
|
||||||
|
}
|
||||||
|
|
||||||
|
//attempt to hide unused channels
|
||||||
|
/*void LCurve::channel_changed () {
|
||||||
|
|
||||||
|
removeIfThere (this, lcurve, false);
|
||||||
|
removeIfThere (this, acurve, false);
|
||||||
|
removeIfThere (this, bcurve, false);
|
||||||
|
|
||||||
|
if (channel->get_active_row_number()==0)
|
||||||
|
pack_start (*lcurve);
|
||||||
|
else if (channel->get_active_row_number()==1)
|
||||||
|
pack_start (*acurve);
|
||||||
|
else if (method->get_active_row_number()==2)
|
||||||
|
pack_start (*bcurve);
|
||||||
|
|
||||||
|
|
||||||
|
if (listener && enabled->get_active ())
|
||||||
|
listener->panelChanged (EvLabCurvetype, channel->get_active_text ());
|
||||||
|
|
||||||
|
}*/
|
||||||
|
|
||||||
|
void LCurve::setBatchMode (bool batchMode) {
|
||||||
|
|
||||||
|
ToolPanel::setBatchMode (batchMode);
|
||||||
|
brightness->showEditedCB ();
|
||||||
|
contrast->showEditedCB ();
|
||||||
|
saturation->showEditedCB ();
|
||||||
|
|
||||||
|
lshape->setBatchMode (batchMode);
|
||||||
|
ashape->setBatchMode (batchMode);
|
||||||
|
bshape->setBatchMode (batchMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::setAdjusterBehavior (bool bradd, bool contradd, bool satadd) {
|
||||||
|
|
||||||
|
if ((!brAdd && bradd) || (brAdd && !bradd))
|
||||||
|
brightness->setLimits (-100, 100, 1, 0);
|
||||||
|
if ((!contrAdd && contradd) || (contrAdd && !contradd))
|
||||||
|
contrast->setLimits (-100, 100, 1, 0);
|
||||||
|
if ((!satAdd && satadd) || (satAdd && !satadd))
|
||||||
|
saturation->setLimits (-100, 100, 1, 0);
|
||||||
|
|
||||||
|
brAdd = bradd;
|
||||||
|
contrAdd = contradd;
|
||||||
|
satAdd = satadd;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void LCurve::updateCurveBackgroundHistogram (unsigned* hist) {
|
||||||
|
|
||||||
|
lshape->updateBackgroundHistogram (hist);
|
||||||
|
}
|
||||||
57
rtgui/labcurve.h
Normal file
57
rtgui/labcurve.h
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of RawTherapee.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
||||||
|
*
|
||||||
|
* RawTherapee is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* RawTherapee is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#ifndef _LABCURVE_H_
|
||||||
|
#define _LABCURVE_H_
|
||||||
|
|
||||||
|
#include <gtkmm.h>
|
||||||
|
#include <adjuster.h>
|
||||||
|
#include <toolpanel.h>
|
||||||
|
#include <curveeditor.h>
|
||||||
|
#include <mycurve.h>
|
||||||
|
|
||||||
|
class LCurve : public Gtk::VBox, public AdjusterListener, public ToolPanel, public CurveListener {
|
||||||
|
|
||||||
|
protected:
|
||||||
|
Gtk::ComboBoxText* channel;
|
||||||
|
|
||||||
|
Adjuster* brightness;
|
||||||
|
Adjuster* contrast;
|
||||||
|
Adjuster* saturation;
|
||||||
|
CurveEditor* lshape;
|
||||||
|
CurveEditor* ashape;
|
||||||
|
CurveEditor* bshape;
|
||||||
|
|
||||||
|
bool brAdd, contrAdd, satAdd;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
LCurve ();
|
||||||
|
|
||||||
|
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
|
||||||
|
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
|
||||||
|
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
|
||||||
|
void setBatchMode (bool batchMode);
|
||||||
|
void setAdjusterBehavior (bool bradd, bool contradd, bool satadd);
|
||||||
|
|
||||||
|
void curveChanged ();
|
||||||
|
void adjusterChanged (Adjuster* a, double newval);
|
||||||
|
void updateCurveBackgroundHistogram (unsigned* hist);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user