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

Total removal of fullMode

Browse Source
This commit is contained in:
Thanatomanic 2018-06-14 21:58:51 +02:00
parent 4481fa4699
commit c4853034ed
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/histogrampanel.cc
View File

@ -44,7 +44,7 @@ HistogramPanel::HistogramPanel ()
set_halign(Gtk::ALIGN_FILL); set_halign(Gtk::ALIGN_FILL);
set_name("HistogramPanel"); set_name("HistogramPanel");
histogramArea = Gtk::manage (new HistogramArea (this)); histogramArea = Gtk::manage (new HistogramArea (/*this*/));
histogramArea->set_hexpand(true); histogramArea->set_hexpand(true);
histogramArea->set_vexpand(true); histogramArea->set_vexpand(true);
histogramRGBArea = Gtk::manage (new HistogramRGBArea ()); histogramRGBArea = Gtk::manage (new HistogramRGBArea ());
@ -326,7 +326,7 @@ void HistogramPanel::bar_toggled ()
void HistogramPanel::rgbv_toggled () void HistogramPanel::rgbv_toggled ()
{ {
// Update Display // Update Display
histogramArea->updateOptions (showRed->get_active(), showGreen->get_active(), showBlue->get_active(), showValue->get_active(), showRAW->get_active(), showFull->get_active(), showChro->get_active()); histogramArea->updateOptions (showRed->get_active(), showGreen->get_active(), showBlue->get_active(), showValue->get_active(), showRAW->get_active(), /*showFull->get_active(),*/ showChro->get_active());
histogramArea->queue_draw (); histogramArea->queue_draw ();
histogramRGBArea->updateOptions (showRed->get_active(), showGreen->get_active(), showBlue->get_active(), showValue->get_active(), showRAW->get_active(), showBAR->get_active(), showChro->get_active()); histogramRGBArea->updateOptions (showRed->get_active(), showGreen->get_active(), showBlue->get_active(), showValue->get_active(), showRAW->get_active(), showBAR->get_active(), showChro->get_active());
@ -739,7 +739,7 @@ void HistogramArea::get_preferred_width_for_height_vfunc (int height, int &minim
get_preferred_width_vfunc (minimum_width, natural_width); get_preferred_width_vfunc (minimum_width, natural_width);
} }
void HistogramArea::updateOptions (bool r, bool g, bool b, bool l, bool raw, bool full, bool c) void HistogramArea::updateOptions (bool r, bool g, bool b, bool l, bool raw, /*bool full,*/ bool c)
{ {
needRed = r; needRed = r;

24
rtgui/histogrampanel.h
View File

@ -101,12 +101,12 @@ private:
}; };
class FullModeListener /*class FullModeListener
{ {
public: public:
virtual ~FullModeListener() {} virtual ~FullModeListener() {}
virtual void toggle_button_full () {} virtual void toggle_button_full () {}
}; };*/
class HistogramArea : public Gtk::DrawingArea, public BackBuffer class HistogramArea : public Gtk::DrawingArea, public BackBuffer
{ {
@ -118,8 +118,8 @@ protected:
LUTu lhistRaw, rhistRaw, ghistRaw, bhistRaw; LUTu lhistRaw, rhistRaw, ghistRaw, bhistRaw;
bool valid; bool valid;
bool fullMode; //bool fullMode;
FullModeListener *myFullModeListener; //FullModeListener *myFullModeListener;
int oldwidth, oldheight; int oldwidth, oldheight;
bool needLuma, needRed, needGreen, needBlue, rawMode, needChroma; bool needLuma, needRed, needGreen, needBlue, rawMode, needChroma;
@ -127,12 +127,12 @@ protected:
HistogramAreaIdleHelper* haih; HistogramAreaIdleHelper* haih;
public: public:
explicit HistogramArea(FullModeListener *fml = nullptr); explicit HistogramArea(/*FullModeListener *fml = nullptr*/);
~HistogramArea(); ~HistogramArea();
void updateBackBuffer (); void updateBackBuffer ();
void update (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma, LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw, LUTu &histChroma); 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 full , bool c); void updateOptions (bool r, bool g, bool b, bool l, bool raw, /*bool full ,*/ bool c);
void on_realize(); void on_realize();
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
bool on_button_press_event (GdkEventButton* event); bool on_button_press_event (GdkEventButton* event);
@ -147,7 +147,7 @@ private:
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
}; };
class HistogramPanel : public Gtk::Grid, public PointerMotionListener, public FullModeListener class HistogramPanel : public Gtk::Grid, public PointerMotionListener/*, public FullModeListener*/
{ {
protected: protected:
@ -161,7 +161,7 @@ protected:
Gtk::ToggleButton* showBlue; Gtk::ToggleButton* showBlue;
Gtk::ToggleButton* showValue; Gtk::ToggleButton* showValue;
Gtk::ToggleButton* showRAW; Gtk::ToggleButton* showRAW;
Gtk::ToggleButton* showFull; //Gtk::ToggleButton* showFull;
Gtk::ToggleButton* showBAR; Gtk::ToggleButton* showBAR;
Gtk::ToggleButton* showChro; Gtk::ToggleButton* showChro;
@ -170,7 +170,7 @@ protected:
Gtk::Image *blueImage; Gtk::Image *blueImage;
Gtk::Image *valueImage; Gtk::Image *valueImage;
Gtk::Image *rawImage; Gtk::Image *rawImage;
Gtk::Image *fullImage; //Gtk::Image *fullImage;
Gtk::Image *barImage; Gtk::Image *barImage;
Gtk::Image *chroImage; Gtk::Image *chroImage;
@ -179,7 +179,7 @@ protected:
Gtk::Image *blueImage_g; Gtk::Image *blueImage_g;
Gtk::Image *valueImage_g; Gtk::Image *valueImage_g;
Gtk::Image *rawImage_g; Gtk::Image *rawImage_g;
Gtk::Image *fullImage_g; //Gtk::Image *fullImage_g;
Gtk::Image *barImage_g; Gtk::Image *barImage_g;
Gtk::Image *chroImage_g; Gtk::Image *chroImage_g;
@ -209,14 +209,14 @@ public:
void blue_toggled (); void blue_toggled ();
void value_toggled (); void value_toggled ();
void raw_toggled (); void raw_toggled ();
void full_toggled (); //void full_toggled ();
void chro_toggled (); void chro_toggled ();
void bar_toggled (); void bar_toggled ();
void rgbv_toggled (); void rgbv_toggled ();
void resized (Gtk::Allocation& req); void resized (Gtk::Allocation& req);
// fullModeListener interface // fullModeListener interface
void toggle_button_full (); //void toggle_button_full ();
}; };
#endif #endif