PopUpButton widget and PopUpToggleButton added ; Curve editor changed to handle any numbe of curve, since the curve editor is now shared between the curves. (CMakeLists changed -> CMake you project)
This commit is contained in:
Hombre
@@ -1,85 +1,71 @@
|
||||
/*
|
||||
* 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 _CURVEEDITOR_
|
||||
#define _CURVEEDITOR_
|
||||
|
||||
#include <gtkmm.h>
|
||||
#include <mycurve.h>
|
||||
#include <shcselector.h>
|
||||
#include <adjuster.h>
|
||||
|
||||
class CurveEditor : public Gtk::VBox, public CurveListener, public SHCListener, public AdjusterListener {
|
||||
|
||||
Gtk::ComboBoxText* curveType;
|
||||
Gtk::Button* curve_reset;
|
||||
Gtk::VBox* paramCurveBox;
|
||||
Gtk::VBox* customCurveBox;
|
||||
Gtk::VBox* NURBSCurveBox;
|
||||
|
||||
MyCurve* customCurve;
|
||||
MyCurve* NURBSCurve;
|
||||
MyCurve* paramCurve;
|
||||
SHCSelector* shcSelector;
|
||||
|
||||
Adjuster* highlights;
|
||||
Adjuster* lights;
|
||||
Adjuster* darks;
|
||||
Adjuster* shadows;
|
||||
|
||||
Gtk::Button* saveCustom;
|
||||
Gtk::Button* loadCustom;
|
||||
Gtk::Button* saveNURBS;
|
||||
Gtk::Button* loadNURBS;
|
||||
|
||||
CurveListener* cl;
|
||||
|
||||
bool realized;
|
||||
std::vector<double> tmpCurve;
|
||||
CurveType curveTypeIx;
|
||||
|
||||
int activeParamControl;
|
||||
|
||||
sigc::connection typeconn;
|
||||
|
||||
public:
|
||||
|
||||
CurveEditor ();
|
||||
virtual ~CurveEditor ();
|
||||
void setBatchMode (bool batchMode);
|
||||
bool isUnChanged ();
|
||||
void setUnChanged (bool uc);
|
||||
|
||||
void on_realize ();
|
||||
void setCurveListener (CurveListener* l) { cl = l; }
|
||||
void savePressed ();
|
||||
void loadPressed ();
|
||||
void typeSelectionChanged ();
|
||||
void setCurve (const std::vector<double>& c);
|
||||
std::vector<double> getCurve ();
|
||||
void curveChanged ();
|
||||
void curveResetPressed ();
|
||||
void shcChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
bool adjusterEntered (GdkEventCrossing* ev, int ac);
|
||||
bool adjusterLeft (GdkEventCrossing* ev, int ac);
|
||||
void updateBackgroundHistogram (unsigned int* hist);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
/*
|
||||
* 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 _CURVEEDITOR_
|
||||
#define _CURVEEDITOR_
|
||||
|
||||
#include <gtkmm.h>
|
||||
#include <popuptogglebutton.h>
|
||||
#include <curveeditorgroup.h>
|
||||
#include <mycurve.h>
|
||||
|
||||
class CurveEditorGroup;
|
||||
|
||||
/*
|
||||
* This class is an interface between RT and the curve editor group ; it handles the methods
|
||||
* related to a specific curve. It is created by CurveEditorGroup::addCurve
|
||||
*/
|
||||
class CurveEditor {
|
||||
|
||||
private:
|
||||
|
||||
/*
|
||||
* The curve editor contains only one widget (the curve type button) to receive the signals
|
||||
* but it's co-handled by the CurveEditorGroup too
|
||||
*/
|
||||
|
||||
// reflects the buttonType active selection ; used as a pre-'selectionChange' reminder value
|
||||
CurveType selected;
|
||||
|
||||
PopUpToggleButton* curveType;
|
||||
unsigned int histogram[256]; // histogram values
|
||||
bool bgHistValid;
|
||||
|
||||
CurveEditorGroup* group;
|
||||
std::vector<double> tempCurve;
|
||||
std::vector<double> customCurveEd;
|
||||
std::vector<double> paramCurveEd;
|
||||
std::vector<double> NURBSCurveEd;
|
||||
sigc::connection typeconn;
|
||||
|
||||
public:
|
||||
|
||||
friend class CurveEditorGroup;
|
||||
CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup);
|
||||
//~CurveEditor ();
|
||||
void typeSelectionChanged (int n);
|
||||
void curveTypeToggled();
|
||||
void setCurve (const std::vector<double>& p);
|
||||
std::vector<double> getCurve ();
|
||||
bool isUnChanged ();
|
||||
void setUnChanged (bool uc);
|
||||
void updateBackgroundHistogram (unsigned int* hist);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user