X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsketcher%2Fsketcherwindow.h;h=71c8ac45018b8f1dbf50e9d1ec3d98aefa0cb6ec;hb=537b18f6fd34e3499123fb25287cd35b28efc491;hp=35e7e898346ef6feb712722d4a7bea4c8aee20ca;hpb=b46dd3711f7aaa94d2df9f27cd2ce16f7487693a;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.h b/cinelerra-5.1/plugins/sketcher/sketcherwindow.h index 35e7e898..71c8ac45 100644 --- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.h +++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.h @@ -21,10 +21,12 @@ #ifndef __CRIKEYWINDOW_H__ #define __CRIKEYWINDOW_H__ +#include "sketcher.h" #include "guicast.h" #include "colorpicker.h" class Sketcher; +class SketcherCoord; class SketcherNum; class SketcherCurveTypeItem; class SketcherCurveType; @@ -37,10 +39,11 @@ class SketcherNewCurve; class SketcherDelCurve; class SketcherCurveUp; class SketcherCurveDn; -class SketcherCurveRadius; +class SketcherCurveWidth; class SketcherCurveList; class SketcherPointX; class SketcherPointY; +class SketcherPointId; class SketcherDrag; class SketcherPointTypeItem; class SketcherPointType; @@ -54,6 +57,17 @@ class SketcherResetPoints; class SketcherWindow; +class SketcherCoord : public BC_TumbleTextBox +{ +public: + SketcherWindow *gui; + + SketcherCoord(SketcherWindow *gui, int x, int y, coord output, + coord mn=-32767, coord mx=32767); + ~SketcherCoord(); + int update(coord v) { return BC_TumbleTextBox::update((coord)v); } +}; + class SketcherNum : public BC_TumbleTextBox { public: @@ -81,6 +95,7 @@ public: void update(int pen); SketcherWindow *gui; + int pen; }; class SketcherCurveColor : public BC_Button @@ -175,14 +190,15 @@ public: SketcherWindow *gui; }; -class SketcherCurveRadius : public SketcherNum +class SketcherCurveWidth : public SketcherNum { public: - SketcherCurveRadius(SketcherWindow *gui, int x, int y, float output) - : SketcherNum(gui, x, y, output, 0, 255) {} - ~SketcherCurveRadius() {} + SketcherCurveWidth(SketcherWindow *gui, int x, int y, int width); + ~SketcherCurveWidth(); int handle_event(); + void update(int width); + int width; }; class SketcherCurveList : public BC_ListBox @@ -197,39 +213,48 @@ public: ArrayList cols[CV_SZ]; void clear(); void add_curve(const char *id, const char *pen, - const char *radius, const char *color); + const char *width, const char *color, const char *alpha); void del_curve(int i); - void set_curve(int i, int c, const char *cp); void set_selected(int k); void update(int k); void update_list(int k); SketcherWindow *gui; Sketcher *plugin; - const char *titles[CV_SZ]; - int widths[CV_SZ]; + const char *col_titles[CV_SZ]; + int col_widths[CV_SZ]; }; -class SketcherPointX : public SketcherNum +class SketcherPointX : public SketcherCoord { public: SketcherPointX(SketcherWindow *gui, int x, int y, float output) - : SketcherNum(gui, x, y, output) {} + : SketcherCoord(gui, x, y, output) {} ~SketcherPointX() {} int handle_event(); }; -class SketcherPointY : public SketcherNum +class SketcherPointY : public SketcherCoord { public: SketcherPointY(SketcherWindow *gui, int x, int y, float output) - : SketcherNum(gui, x, y, output) {} + : SketcherCoord(gui, x, y, output) {} ~SketcherPointY() {} int handle_event(); }; +class SketcherPointId : public SketcherNum +{ +public: + SketcherPointId(SketcherWindow *gui, int x, int y, int output) + : SketcherNum(gui, x, y, output) {} + ~SketcherPointId() {} + + int handle_event(); +}; + class SketcherDrag : public BC_CheckBox { @@ -243,19 +268,20 @@ public: class SketcherPointTypeItem : public BC_MenuItem { public: - SketcherPointTypeItem(int pty); + SketcherPointTypeItem(int arc); int handle_event(); - int pty; + int arc; }; class SketcherPointType : public BC_PopupMenu { public: - SketcherPointType(SketcherWindow *gui, int x, int y, int pty); + SketcherPointType(SketcherWindow *gui, int x, int y, int arc); void create_objects(); - void update(int pty); + void update(int arc); SketcherWindow *gui; + int type; }; @@ -272,6 +298,7 @@ public: void clear(); void add_point(const char *id, const char *ty, const char *xp, const char *yp); void set_point(int i, int c, int v); + void set_point(int i, int c, coord v); void set_point(int i, int c, const char *cp); void set_selected(int k); void update(int k); @@ -280,8 +307,8 @@ public: SketcherWindow *gui; Sketcher *plugin; - const char *titles[PT_SZ]; - int widths[PT_SZ]; + const char *col_titles[PT_SZ]; + int col_widths[PT_SZ]; }; class SketcherNewPoint : public BC_GenericButton @@ -362,17 +389,19 @@ public: ~SketcherWindow(); void create_objects(); + void done_event(int result); void update_gui(); void start_color_thread(SketcherCurveColor *curve_color); int grab_event(XEvent *event); int do_grab_event(XEvent *event); - void done_event(int result); + int grab_button_press(XEvent *event); + int grab_cursor_motion(); void send_configure_change(); int keypress_event(); Sketcher *plugin; - BC_Title *title_pen, *title_color, *title_radius; + BC_Title *title_pen, *title_color, *title_width; SketcherCurveType *curve_type; SketcherCurvePen *curve_pen; SketcherCurveColor *curve_color; @@ -381,7 +410,7 @@ public: SketcherDelCurve *del_curve; SketcherCurveUp *curve_up; SketcherCurveDn *curve_dn; - SketcherCurveRadius *curve_radius; + SketcherCurveWidth *curve_width; SketcherCurveList *curve_list; SketcherResetCurves *reset_curves; @@ -389,17 +418,25 @@ public: SketcherDrag *drag; SketcherPointType *point_type; SketcherPointList *point_list; - BC_Title *title_x, *title_y; + BC_Title *title_x, *title_y, *title_id; SketcherPointX *point_x; SketcherPointY *point_y; + SketcherPointId *point_id; SketcherNewPoint *new_point; SketcherDelPoint *del_point; SketcherPointUp *point_up; SketcherPointDn *point_dn; - int dragging, pending_config; + int64_t position; + float projector_x, projector_y, projector_z; + int track_w, track_h; int new_points; + float cursor_x, cursor_y; + float output_x, output_y; + int state, dragging; + int pending_motion, pending_config; + XEvent motion_event; float last_x, last_y; - BC_Title *notes0, *notes1, *notes2; + BC_Title *notes0, *notes1, *notes2, *notes3; }; #endif