X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=480663981dfdcdae24e9aa306aea562e25baedef;hb=0d719427668c3e1fd8982596317e3264a47aa6d9;hp=6a9c0f77b59a82bc25135bd8e464ca682f826182;hpb=fb661e853152fd63537629a20f493a4cdcd4f019;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h index 6a9c0f77..48066398 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.h +++ b/cinelerra-5.1/cinelerra/cwindowtool.h @@ -31,6 +31,17 @@ #include "maskautos.inc" #include "mwindow.inc" +enum { + MASK_SHAPE_SQUARE, + MASK_SHAPE_CIRCLE, + MASK_SHAPE_TRIANGLE, + MASK_SHAPE_OVAL, +}; +enum { + MASK_SCALE_X, + MASK_SCALE_Y, + MASK_SCALE_XY, +}; // This common thread supports all the tool GUI's. class CWindowTool : public Thread @@ -79,45 +90,125 @@ public: virtual void handle_event() {}; // Update text boxes from keyframe here virtual void update() {}; + // Update EDL and preview only void update_preview(int changed_edl=0); + void update_auto(Track *track, int idx, CWindowCoord *vp); void draw_preview(int changed_edl); int current_operation; virtual int close_event(); int keypress_event(); int translation_event(); + int press(void (CWindowCanvas::*fn)()); MWindow *mwindow; CWindowTool *thread; CWindowCoord *event_caller; + int edge, span; }; class CWindowCoord : public BC_TumbleTextBox { public: - CWindowCoord(CWindowToolGUI *gui, int x, int y, - float value, int logincrement); - CWindowCoord(CWindowToolGUI *gui, int x, int y, - int value); - + CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int group=-1); + CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int group=-1); + void create_objects(); + void update_gui(float value); // Calls the window's handle_event int handle_event(); CWindowToolGUI *gui; + int type; + CWindowToolAutoRangeTumbler *min_tumbler; + CWindowCoordSlider *slider; + CWindowToolAutoRangeTumbler *max_tumbler; + CWindowToolAutoRangeReset *range_reset; + CWindowToolAutoRangeTextBox *range_text; + CWindowCoordRangeTumbler *range; +}; + +class CWindowCoordSlider : public BC_FSlider +{ +public: + CWindowCoordSlider(CWindowCoord *coord, int x, int y, int w, + float mn, float mx, float value); + ~CWindowCoordSlider(); + int handle_event(); + + CWindowCoord *coord; +}; + +class CWindowCoordRangeTumbler : public BC_Tumbler +{ +public: + CWindowCoordRangeTumbler(CWindowCoord *coord, int x, int y); + ~CWindowCoordRangeTumbler(); + int update(float scale); + int handle_up_event(); + int handle_down_event(); + + CWindowCoord *coord; +}; + +class CWindowCurveAutoEdge : public BC_Toggle +{ +public: + CWindowCurveAutoEdge(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + int handle_event(); + + MWindow *mwindow; + CWindowToolGUI *gui; +}; + +class CWindowCurveAutoSpan : public BC_Toggle +{ +public: + CWindowCurveAutoSpan(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + + int handle_event(); + MWindow *mwindow; + CWindowToolGUI *gui; }; -class CWindowCropOK : public BC_GenericButton + +class CWindowCropApply : public BC_GenericButton { public: - CWindowCropOK(MWindow *mwindow, CWindowToolGUI *gui, + CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui, int x, int y); // Perform the cropping operation int handle_event(); int keypress_event(); MWindow *mwindow; - CWindowToolGUI *gui; + CWindowCropGUI *crop_gui; +}; + +class CWindowCropOpMode : public BC_PopupMenu +{ + static const char *crop_ops[CROP_MODES]; +public: + CWindowCropOpMode(MWindow *mwindow, CWindowCropGUI *crop_gui, + int mode, int x, int y); + ~CWindowCropOpMode(); + void create_objects(); + int handle_event(); + + MWindow *mwindow; + CWindowCropGUI *crop_gui; + int mode; +}; + +class CWindowCropOpItem : public BC_MenuItem +{ +public: + CWindowCropOpItem(CWindowCropOpMode *popup, const char *text, int id); + int handle_event(); + + CWindowCropOpMode *popup; + int id; }; + class CWindowCropGUI : public CWindowToolGUI { public: @@ -128,6 +219,7 @@ public: // Update the gui void handle_event(); CWindowCoord *x1, *y1, *width, *height; + CWindowCropOpMode *crop_mode; }; class CWindowMaskItem : public BC_ListBoxItem @@ -189,11 +281,11 @@ public: void update_items(MaskAuto *keyframe); }; -class CWindowMaskUnclear : public BC_GenericButton +class CWindowMaskUnclear : public BC_Button { public: CWindowMaskUnclear(MWindow *mwindow, CWindowMaskGUI *gui, - int x, int y, int w); + int x, int y); int handle_event(); MWindow *mwindow; CWindowMaskGUI *gui; @@ -323,6 +415,17 @@ public: CWindowMaskGUI *gui; }; +class CWindowMaskGangPoint : public BC_Toggle +{ +public: + CWindowMaskGangPoint(MWindow *mwindow, CWindowMaskGUI *gui, + int x, int y); + ~CWindowMaskGangPoint(); + int handle_event(); + MWindow *mwindow; + CWindowMaskGUI *gui; +}; + class CWindowMaskSmoothButton : public BC_Button { public: @@ -409,7 +512,6 @@ public: CWindowMaskDelPoint(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y); int handle_event(); - int keypress_event(); MWindow *mwindow; CWindowMaskGUI *gui; }; @@ -435,11 +537,13 @@ public: ~CWindowMaskFeatherSlider(); int handle_event(); int update(float v); + int update(int r, float v, float mn, float mx); char *get_caption() { return 0; } MWindow *mwindow; CWindowMaskGUI *gui; int stick; float last_v; + float max; Timer *timer; }; @@ -463,7 +567,20 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskLoad : public BC_GenericButton +class CWindowMaskLoadList : public BC_ListBox +{ +public: + CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui); + ~CWindowMaskLoadList(); + void create_objects(); + int handle_event(); + + MWindow *mwindow; + CWindowMaskGUI *gui; + CWindowMaskItems shape_items; +}; + +class CWindowMaskLoad : public BC_Button { public: CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui, @@ -474,7 +591,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskSave : public BC_GenericButton +class CWindowMaskSave : public BC_Button { public: CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui, @@ -527,7 +644,7 @@ public: CWindowMaskItems mask_items; }; -class CWindowMaskDelete : public BC_GenericButton +class CWindowMaskDelete : public BC_Button { public: CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui, @@ -538,7 +655,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskCenter : public BC_GenericButton +class CWindowMaskCenter : public BC_Button { public: CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui, @@ -549,7 +666,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskNormal : public BC_GenericButton +class CWindowMaskNormal : public BC_Button { public: CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui, @@ -560,21 +677,18 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskShape : public BC_ListBox +class CWindowMaskShape : public BC_Button { public: - enum { MASK_SHAPE_SQUARE, MASK_SHAPE_CIRCLE, - MASK_SHAPE_TRIANGLE, MASK_SHAPE_OVAL, - MASK_SHAPE_BUILTIN }; - CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui); + CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui, + const char *images, int shape, int x, int y, const char *tip); ~CWindowMaskShape(); - void create_objects(); void builtin_shape(int i, SubMask *sub_mask); - void load_shape(int i, SubMask *sub_mask); int handle_event(); MWindow *mwindow; CWindowMaskGUI *gui; + int shape; CWindowMaskItems shape_items; }; @@ -620,9 +734,13 @@ public: CWindowMaskDelMask *mask_del; CWindowMaskUnclear *mask_unclr; CWindowMaskClrMask *mask_clr; - CWindowMaskShape *mask_shape; - CWindowMaskSave *mask_save; + CWindowMaskShape *mask_shape_sqr; + CWindowMaskShape *mask_shape_crc; + CWindowMaskShape *mask_shape_tri; + CWindowMaskShape *mask_shape_ovl; + CWindowMaskLoadList *mask_load_list; CWindowMaskLoad *mask_load; + CWindowMaskSave *mask_save; CWindowMaskDelete *mask_delete; CWindowMaskPresetDialog *preset_dialog; CWindowMaskCenter *mask_center; @@ -632,6 +750,7 @@ public: CWindowMaskGangFader *gang_fader; CWindowMaskAffectedPoint *active_point; CWindowMaskDelPoint *del_point; + CWindowMaskGangPoint *gang_point; CWindowMaskSmoothButton *mask_pnt_linear, *mask_pnt_smooth; CWindowMaskSmoothButton *mask_crv_linear, *mask_crv_smooth; CWindowMaskSmoothButton *mask_all_linear, *mask_all_smooth; @@ -689,22 +808,56 @@ public: }; +class CWindowToolAutoRangeTumbler : public BC_Tumbler +{ +public: + CWindowToolAutoRangeTumbler(CWindowCoord *coord, int x, int y, + int use_max, const char *tip); + int handle_up_event(); + int handle_down_event(); + + CWindowCoord *coord; + int use_max; +}; + +class CWindowToolAutoRangeReset : public BC_Button +{ +public: + CWindowToolAutoRangeReset(CWindowCoord *coord, int x, int y); + int handle_event(); + + CWindowCoord *coord; +}; + +class CWindowToolAutoRangeTextBox : public BC_TextBox +{ +public: + CWindowToolAutoRangeTextBox(CWindowCoord *coord, int x, int y); + int button_press_event(); + int handle_event(); + int update_range(); + + CWindowCoord *coord; +}; + class CWindowCameraGUI : public CWindowToolGUI { public: CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread); ~CWindowCameraGUI(); + void handle_event(); void create_objects(); void update(); -// Update the keyframe from text boxes - void handle_event(); -// BezierAuto* get_keyframe(); + BC_TitleBar *bar1, *bar2; CWindowCoord *x, *y, *z; -private: -// Toggles for keyframe curve mode (for camera automation only) - CWindowCurveToggle *t_smooth, *t_linear; + CWindowCameraAddKeyframe *add_keyframe; + CWindowCameraReset *reset; + BC_TitleBar *bar3, *bar4, *bar5; + CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump; + CWindowCurveAutoSpan *auto_span; + CWindowCurveAutoEdge *auto_edge; }; class CWindowCameraLeft : public BC_Button @@ -767,19 +920,44 @@ public: CWindowCameraGUI *gui; }; +class CWindowCameraAddKeyframe : public BC_Button +{ +public: + CWindowCameraAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + int handle_event(); + + MWindow *mwindow; + CWindowToolGUI *gui; +}; + +class CWindowCameraReset : public BC_Button +{ +public: + CWindowCameraReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + int handle_event(); + + MWindow *mwindow; + CWindowToolGUI *gui; +}; + + class CWindowProjectorGUI : public CWindowToolGUI { public: CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread); ~CWindowProjectorGUI(); + void handle_event(); void create_objects(); void update(); - void handle_event(); -// BezierAuto* get_keyframe(); + + BC_TitleBar *bar1, *bar2; CWindowCoord *x, *y, *z; -private: -// Toggles for keyframe curve mode (projector automation only) - CWindowCurveToggle *t_smooth, *t_linear; + CWindowProjectorAddKeyframe *add_keyframe; + CWindowProjectorReset *reset; + BC_TitleBar *bar3, *bar4, *bar5; + CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump; + CWindowCurveAutoSpan *auto_span; + CWindowCurveAutoEdge *auto_edge; }; class CWindowProjectorLeft : public BC_Button @@ -842,6 +1020,26 @@ public: CWindowProjectorGUI *gui; }; +class CWindowProjectorAddKeyframe : public BC_Button +{ +public: + CWindowProjectorAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + int handle_event(); + + MWindow *mwindow; + CWindowToolGUI *gui; +}; + +class CWindowProjectorReset : public BC_Button +{ +public: + CWindowProjectorReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y); + int handle_event(); + + MWindow *mwindow; + CWindowToolGUI *gui; +}; + @@ -864,5 +1062,4 @@ public: }; - #endif