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

Now the Lab curves are properly handeled in the history (MSG are still to be created)

Browse Source
This commit is contained in:
Hombre
2010-10-20 01:47:48 +02:00
parent b0d9c87621
commit 15c829cab2
7 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/curveeditor.cc
View File

@@ -412,8 +412,12 @@ void CurveEditor::typeSelectionChanged () {
void CurveEditor::curveChanged () {
if (cl)
cl->curveChanged ();
if (cl) {
if (cl->isMulti())
cl->curveChanged (this);
else
cl->curveChanged ();
}
}
void CurveEditor::curveResetPressed () {

8
rtgui/curvelistener.h
View File

@@ -19,10 +19,18 @@
#ifndef _CURVELISTENER_
#define _CURVELISTENER_
class CurveEditor;
class CurveListener {
private:
bool multi;
public:
virtual void curveChanged () {}
virtual void curveChanged (CurveEditor* ce) {}
void setMulti(bool value) { multi = value; }
bool isMulti() { return multi; }
CurveListener() : multi(false) {}
};
#endif

48
rtgui/labcurve.cc
View File

@@ -43,47 +43,50 @@ LCurve::LCurve () : ToolPanel(), brAdd(false), contrAdd(false) {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Gtk::HBox* abox = Gtk::manage (new Gtk::HBox ());
abox->set_border_width (2);
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_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 (*brightness);
brightness->show ();
pack_start (*contrast);
contrast->show ();
pack_start (*contrast);
contrast->show ();
pack_start (*saturation);
saturation->show ();
Gtk::HSeparator *hsep3 = Gtk::manage (new Gtk::HSeparator());
hsep3->show ();
pack_start (*hsep3);
Gtk::HSeparator *hsep3 = Gtk::manage (new Gtk::HSeparator());
hsep3->show ();
pack_start (*hsep3);
lshape = Gtk::manage (new CurveEditor ());
lshape->show ();
lshape->setCurveListener (this);
lshape = Gtk::manage (new CurveEditor ());
lshape->show ();
lshape->setCurveListener (this);
CurveListener::setMulti(true);
ashape = Gtk::manage (new CurveEditor ());
ashape->show ();
ashape->setCurveListener (this);
CurveListener::setMulti(true);
bshape = Gtk::manage (new CurveEditor ());
bshape->show ();
bshape->setCurveListener (this);
CurveListener::setMulti(true);
pack_start (*lshape, Gtk::PACK_SHRINK, 4);
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);
brightness->setAdjusterListener (this);
contrast->setAdjusterListener (this);
saturation->setAdjusterListener (this);
//channel->signal_changed().connect( sigc::mem_fun(*this, &LCurve::channel) );
@@ -158,12 +161,15 @@ void LCurve::setDefaults (const ProcParams* defParams, const ParamsEdited* pedit
}
}
void LCurve::curveChanged () {
void LCurve::curveChanged (CurveEditor* ce) {
if (listener) {
listener->panelChanged (EvLLCurve, M("HISTORY_CUSTOMCURVE"));
listener->panelChanged (EvLaCurve, M("HISTORY_CUSTOMCURVE"));
listener->panelChanged (EvLbCurve, M("HISTORY_CUSTOMCURVE"));
if (ce == lshape)
listener->panelChanged (EvLLCurve, M("HISTORY_CUSTOMCURVE"));
if (ce == ashape)
listener->panelChanged (EvLaCurve, M("HISTORY_CUSTOMCURVE"));
if (ce == bshape)
listener->panelChanged (EvLbCurve, M("HISTORY_CUSTOMCURVE"));
}
}

2
rtgui/labcurve.h
View File

@@ -49,7 +49,7 @@ class LCurve : public Gtk::VBox, public AdjusterListener, public ToolPanel, publ
void setBatchMode (bool batchMode);
void setAdjusterBehavior (bool bradd, bool contradd, bool satadd);
void curveChanged ();
void curveChanged (CurveEditor* ce);
void adjusterChanged (Adjuster* a, double newval);
void updateCurveBackgroundHistogram (unsigned* hist);
};

2
rtgui/mycurve.cc
View File

@@ -621,7 +621,7 @@ void MyCurve::setType (CurveType t) {
void MyCurve::notifyListener () {
if (listener)
listener->curveChanged ();
listener->curveChanged ();
}
void MyCurve::setActiveParam (int ac) {