X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.h;h=383bd87703aed1008683e8ea161568120ab63f77;hb=624f99bd6dccb2af28fdbef8fbb3ae41c19fcbd2;hp=683fe13578ac33f435b7687094007b216bcaf460;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/colorpicker.h b/cinelerra-5.1/cinelerra/colorpicker.h index 683fe135..383bd877 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.h +++ b/cinelerra-5.1/cinelerra/colorpicker.h @@ -2,26 +2,28 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program 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 2 of the License, or * (at your option) any later version. - * + * * This program 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 this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #ifndef COLORPICKER_H #define COLORPICKER_H +#include "bcdialog.h" +#include "clip.h" #include "condition.inc" #include "guicast.h" #include "mutex.inc" @@ -33,66 +35,81 @@ class PaletteWheel; class PaletteWheelValue; class PaletteOutput; class PaletteHue; -class PaletteSaturation; -class PaletteValue; +class PaletteSat; +class PaletteVal; class PaletteRed; -class PaletteGreen; -class PaletteBlue; +class PaletteGrn; +class PaletteBlu; +class PaletteLum; +class PaletteCr; +class PaletteCb; class PaletteAlpha; +class PalletteHSV; +class PalletteRGB; +class PalletteYUV; +class PalletteAPH; -class ColorThread : public Thread +class ColorThread : public BC_DialogThread { public: - ColorThread(int do_alpha = 0, char *title = 0); + ColorThread(int do_alpha = 0, const char *title = 0); ~ColorThread(); - - void run(); - void start_window(int output, int alpha); + void start_window(int output, int alpha, int do_okcancel=0); virtual int handle_new_color(int output, int alpha); void update_gui(int output, int alpha); - ColorWindow* get_gui(); - -private: - friend class ColorWindow; + BC_Window* new_gui(); - ColorWindow *window; - Condition *completion; -// protects window, output, alpha - Mutex *mutex; -// Starting color - int output; - int alpha; - int do_alpha; - char *title; + int output, alpha; + int do_alpha, do_okcancel; + const char *title; }; class ColorWindow : public BC_Window { public: - ColorWindow(ColorThread *thread, int x, int y, char *title); + ColorWindow(ColorThread *thread, int x, int y, int w, int h, const char *title); + ~ColorWindow(); void create_objects(); void change_values(); int close_event(); void update_display(); void update_rgb(); + void update_hsv(); + void update_yuv(); int handle_event(); + struct { float r, g, b; } rgb; + struct { float y, u, v; } yuv; + struct { float h, s, v; } hsv; + float aph; + void update_rgb(float r, float g, float b); + void update_hsv(float h, float s, float v); + void update_yuv(float y, float u, float v); + ColorThread *thread; PaletteWheel *wheel; PaletteWheelValue *wheel_value; PaletteOutput *output; PaletteHue *hue; - PaletteSaturation *saturation; - PaletteValue *value; + PaletteSat *sat; + PaletteVal *val; PaletteRed *red; - PaletteGreen *green; - PaletteBlue *blue; + PaletteGrn *grn; + PaletteBlu *blu; + PaletteLum *lum; + PaletteCr *c_r; + PaletteCb *c_b; PaletteAlpha *alpha; + + PalletteHSV *hsv_h, *hsv_s, *hsv_v; + PalletteRGB *rgb_r, *rgb_g, *rgb_b; + PalletteYUV *yuv_y, *yuv_u, *yuv_v; + PalletteAPH *aph_a; + VFrame *value_bitmap; - float h, s, v, r, g, b, a; }; @@ -151,20 +168,20 @@ public: ColorWindow *window; }; -class PaletteSaturation : public BC_FSlider +class PaletteSat : public BC_FSlider { public: - PaletteSaturation(ColorWindow *window, int x, int y); - ~PaletteSaturation(); + PaletteSat(ColorWindow *window, int x, int y); + ~PaletteSat(); int handle_event(); ColorWindow *window; }; -class PaletteValue : public BC_FSlider +class PaletteVal : public BC_FSlider { public: - PaletteValue(ColorWindow *window, int x, int y); - ~PaletteValue(); + PaletteVal(ColorWindow *window, int x, int y); + ~PaletteVal(); int handle_event(); ColorWindow *window; }; @@ -178,20 +195,20 @@ public: ColorWindow *window; }; -class PaletteGreen : public BC_FSlider +class PaletteGrn : public BC_FSlider { public: - PaletteGreen(ColorWindow *window, int x, int y); - ~PaletteGreen(); + PaletteGrn(ColorWindow *window, int x, int y); + ~PaletteGrn(); int handle_event(); ColorWindow *window; }; -class PaletteBlue : public BC_FSlider +class PaletteBlu : public BC_FSlider { public: - PaletteBlue(ColorWindow *window, int x, int y); - ~PaletteBlue(); + PaletteBlu(ColorWindow *window, int x, int y); + ~PaletteBlu(); int handle_event(); ColorWindow *window; }; @@ -205,4 +222,80 @@ public: ColorWindow *window; }; +class PaletteLum : public BC_FSlider +{ +public: + PaletteLum(ColorWindow *window, int x, int y); + ~PaletteLum(); + int handle_event(); + ColorWindow *window; +}; + +class PaletteCr : public BC_FSlider +{ +public: + PaletteCr(ColorWindow *window, int x, int y); + ~PaletteCr(); + int handle_event(); + ColorWindow *window; +}; + +class PaletteCb : public BC_FSlider +{ +public: + PaletteCb(ColorWindow *window, int x, int y); + ~PaletteCb(); + int handle_event(); + ColorWindow *window; +}; + +class PalletteNum : public BC_TumbleTextBox +{ +public: + ColorWindow *window; + float *output; + + PalletteNum(ColorWindow *window, int x, int y, + float &output, float min, float max); + ~PalletteNum(); + void update_output() { *output = atof(get_text()); } + static int calculate_h() { return BC_Tumbler::calculate_h(); } +}; + +class PalletteRGB : public PalletteNum +{ +public: + PalletteRGB(ColorWindow *window, int x, int y, + float &output, float min, float max) + : PalletteNum(window, x, y, output, min, max) {} + int handle_event(); +}; + +class PalletteYUV : public PalletteNum +{ +public: + PalletteYUV(ColorWindow *window, int x, int y, + float &output, float min, float max) + : PalletteNum(window, x, y, output, min, max) {} + int handle_event(); +}; + +class PalletteHSV : public PalletteNum +{ +public: + PalletteHSV(ColorWindow *window, int x, int y, + float &output, float min, float max) + : PalletteNum(window, x, y, output, min, max) {} + int handle_event(); +}; + +class PalletteAPH : public PalletteNum +{ +public: + PalletteAPH(ColorWindow *window, int x, int y, + float &output, float min, float max) + : PalletteNum(window, x, y, output, min, max) {} + int handle_event(); +}; + #endif