mod scope for smooth graphic, tweaks to scope layout

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / scopewindow.h

diff --git a/cinelerra-5.1/cinelerra/scopewindow.h b/cinelerra-5.1/cinelerra/scopewindow.h
index 86f9efa91155147d2c94fc6988057ace0dd9d21a..7258374b7680edd89a0fa56c28c2f53cfdc65c3b 100644 (file)
--- a/cinelerra-5.1/cinelerra/scopewindow.h
+++ b/cinelerra-5.1/cinelerra/scopewindow.h
@@ -26,6 +26,7 @@
 #include "guicast.h"
 #include "loadbalance.h"
 #include "mwindow.h"
+#include "overlayframe.inc"
 #include "pluginclient.h"
 #include "recordmonitor.inc"
 #include "scopewindow.inc"
@@ -34,7 +35,7 @@
 enum {
        SCOPE_HISTOGRAM, SCOPE_HISTOGRAM_RGB,
        SCOPE_WAVEFORM, SCOPE_WAVEFORM_RGB, SCOPE_WAVEFORM_PLY,
-       SCOPE_VECTORSCOPE,
+       SCOPE_VECTORSCOPE, SCOPE_VECTORWHEEL,
 };
 
 // Number of divisions in histogram.
@@ -49,7 +50,7 @@ enum {
 #define HISTOGRAM_MAX 110
 #define FLOAT_MAX 1.1
 
-#define MIN_SCOPE_W xS(640)
+#define MIN_SCOPE_W xS(320)
 #define MIN_SCOPE_H yS(320)
 
 
@@ -119,6 +120,9 @@ public:
        virtual void update_point(int x, int y);
        virtual void draw_point();
        virtual void clear_point();
+       void draw_point(float th, float r, int color);
+       void draw_radient(float th, float r1, float r2, int color);
+
        int drag_radius;
        float drag_angle;
 };
@@ -160,6 +164,34 @@ public:
        ScopeScopesOn *wave_rgb_on;
        ScopeScopesOn *wave_ply_on;
        ScopeScopesOn *vect_on;
+       ScopeScopesOn *vect_wheel;
+};
+
+
+class ScopeGratPaths : public ArrayList<const char *>
+{
+public:
+       ScopeGratPaths() { set_array_delete(); }
+       ~ScopeGratPaths() { remove_all_objects(); }
+};
+
+class ScopeGratItem : public BC_MenuItem
+{
+public:
+       ScopeGratItem(ScopeVectGrats *vect_grats, const char *text, int idx);
+       int handle_event();
+
+       ScopeVectGrats *vect_grats;
+       int idx;
+};
+
+class ScopeVectGrats : public BC_PopupMenu
+{
+public:
+       ScopeVectGrats(ScopeGUI *gui, int x, int y);
+       void create_objects();
+
+       ScopeGUI *gui;
 };
 
 
@@ -248,6 +280,9 @@ public:
        void calculate_sizes(int w, int h);
        void allocate_vframes();
        void draw_overlays(int overlays, int borders, int flush);
+       void update_graticule(int idx);
+       void draw_colorwheel(VFrame *dst, int bg_color);
+       void draw_scope();
        void process(VFrame *output_frame);
        void draw(int flash, int flush);
        void clear_points(int flash);
@@ -259,19 +294,27 @@ public:
        BoxBlur *box_blur;
        VFrame *waveform_vframe;
        VFrame *vector_vframe;
+       VFrame *wheel_vframe;
        ScopeHistogram *histogram;
        ScopeWaveform *waveform;
        ScopeVectorscope *vectorscope;
        ScopeMenu *scope_menu;
        ScopeWaveSlider *wave_slider;
        ScopeVectSlider *vect_slider;
+       ScopeVectGrats *vect_grats;
        ScopeSmooth *smooth;
-       BC_Title *value_text;
+       VFrame *grat_image;
+       OverlayFrame *overlay;
 
        int x, y, w, h;
        int vector_x, vector_y, vector_w, vector_h;
+       int vector_cx, vector_cy, radius;
        int wave_x, wave_y, wave_w, wave_h;
        int hist_x, hist_y, hist_w, hist_h;
+       int text_color, dark_color;
+
+       ScopeGratPaths grat_paths;
+       int grat_idx, use_graticule;
 
        int cpus;
        int use_hist, use_wave, use_vector;