Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -46,6 +46,9 @@ class CurveEditorGroup : public Gtk::VBox, public CurveListener {
|
||||
friend class DiagonalCurveEditorSubGroup;
|
||||
friend class FlatCurveEditorSubGroup;
|
||||
|
||||
private:
|
||||
Glib::ustring& curveDir;
|
||||
|
||||
protected:
|
||||
Gtk::Label* curveGroupLabel;
|
||||
Gtk::Button* curve_reset;
|
||||
@@ -60,7 +63,12 @@ protected:
|
||||
unsigned int numberOfPackedCurve;
|
||||
|
||||
public:
|
||||
CurveEditorGroup(Glib::ustring groupLabel = "");
|
||||
/**
|
||||
* @param curveDir The folder used by load and save dialogs for the curve.
|
||||
* This variable will be updated with actions in the
|
||||
* dialogs.
|
||||
*/
|
||||
CurveEditorGroup(Glib::ustring& curveDir, Glib::ustring groupLabel = "");
|
||||
~CurveEditorGroup();
|
||||
void newLine();
|
||||
void curveListComplete();
|
||||
@@ -88,6 +96,9 @@ class CurveEditorSubGroup {
|
||||
|
||||
friend class CurveEditorGroup;
|
||||
|
||||
private:
|
||||
Glib::ustring& curveDir;
|
||||
|
||||
protected:
|
||||
int valLinear;
|
||||
int valUnchanged;
|
||||
@@ -100,6 +111,14 @@ public:
|
||||
virtual void setColorProvider (ColorProvider* p) = 0;
|
||||
|
||||
protected:
|
||||
|
||||
/**
|
||||
* @param curveDir The folder used by load and save dialogs for the curve.
|
||||
* This variable will be updated with actions in the
|
||||
* dialogs.
|
||||
*/
|
||||
CurveEditorSubGroup(Glib::ustring& curveDir);
|
||||
|
||||
Glib::ustring outputFile ();
|
||||
Glib::ustring inputFile ();
|
||||
|
||||
|
Reference in New Issue
Block a user