Modifications to store histogram settings across sessions

This commit is contained in:
Thanatomanic
2018-09-02 13:39:55 +02:00
parent 1874259bee
commit f59e7c31e4
5 changed files with 89 additions and 55 deletions

View File

@@ -70,10 +70,10 @@ protected:
bool needGreen;
bool needBlue;
bool needLuma;
bool needChroma;
bool rawMode;
bool showMode;
bool barDisplayed;
bool needChroma;
Gtk::Grid* parent;
@@ -91,7 +91,7 @@ public:
};
void update (int val, int rh, int gh, int bh);
void updateOptions (bool r, bool g, bool b, bool l, bool raw, bool show, bool c);
void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, bool show);
void on_realize();
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
@@ -104,7 +104,7 @@ private:
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
void get_preferred_width_for_height_vfunc (int h, int &minimum_width, int &natural_width) const;
// Some ...
};
class DrawModeListener
@@ -124,15 +124,16 @@ private:
type_signal_factor_changed sigFactorChanged;
protected:
LUTu lhist, rhist, ghist, bhist, chist;
LUTu lhistRaw, rhistRaw, ghistRaw, bhistRaw;
LUTu rhist, ghist, bhist, lhist, chist;
LUTu rhistRaw, ghistRaw, bhistRaw, lhistRaw; //lhistRaw is unused?
bool valid;
int drawMode;
DrawModeListener *myDrawModeListener;
int oldwidth, oldheight;
bool needLuma, needRed, needGreen, needBlue, rawMode, needChroma;
bool needRed, needGreen, needBlue, needLuma, needChroma;
bool rawMode;
bool isPressed;
double movingPosition;
@@ -143,8 +144,8 @@ public:
~HistogramArea();
void updateBackBuffer ();
void update (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma, LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw, LUTu &histChroma);
void updateOptions (bool r, bool g, bool b, bool l, bool raw, bool c, int mode);
void update (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma, LUTu &histChroma, LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw);
void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, int mode);
void on_realize();
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
bool on_button_press_event (GdkEventButton* event);
@@ -208,9 +209,9 @@ public:
HistogramPanel ();
~HistogramPanel ();
void histogramChanged (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma, LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw, LUTu &histChroma)
void histogramChanged (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma, LUTu &histChroma, LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw)
{
histogramArea->update (histRed, histGreen, histBlue, histLuma, histRedRaw, histGreenRaw, histBlueRaw, histChroma);
histogramArea->update (histRed, histGreen, histBlue, histLuma, histChroma, histRedRaw, histGreenRaw, histBlueRaw);
}
// pointermotionlistener interface
void pointerMoved (bool validPos, const Glib::ustring &profile, const Glib::ustring &profileW, int x, int y, int r, int g, int b, bool isRaw = false);