X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=7cb5a1007d5bde2bdd77632f505f22e1f43eab0d;hb=b5bfe3e40a7255ae60a21d885587ada6e145e3d5;hp=567c9338c8f129dbd95995eae96831b6c70e88ef;hpb=b78b166faf60a1c7357f990b1e2fb0e70be29fee;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 567c9338..7cb5a100 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -21,6 +21,7 @@
 
 #include "automation.h"
 #include "autos.h"
+#include "bccolors.h"
 #include "bcsignals.h"
 #include "canvas.h"
 #include "clip.h"
@@ -162,8 +163,6 @@ void CWindowGUI::create_objects()
 	canvas = new CWindowCanvas(mwindow, this);
 
 	canvas->create_objects(mwindow->edl);
-	canvas->use_cwindow();
-
 
 	add_subwindow(timebar = new CTimeBar(mwindow,
 		this,
@@ -442,12 +441,13 @@ int CWindowGUI::keypress_event()
 		keyboard_zoomout();
 		result = 1;
 		break;
-	case 'f':
-		canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
+	case 'f': {
+		int on = canvas->get_fullscreen() ? 0 : 1;
+		canvas->set_fullscreen(on, 1);
 		result = 1;
-		break;
+		break; }
 	case ESC:
-		canvas->set_fullscreen(0);
+		canvas->set_fullscreen(0, 1);
 		result = 1;
 		break;
 	case 'x':
@@ -758,7 +758,8 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 		1, // use_cut
 		0, // use_commerical
 		0, // use_goto
-		1) // use_clk2play
+		1, // use_clk2play
+		1) // use_scope
 {
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
@@ -970,6 +971,22 @@ void CWindowTransport::goto_end()
 	gui->lock_window("CWindowTransport::goto_end 2");
 }
 
+CWindowCanvasToggleControls::CWindowCanvasToggleControls(CWindowCanvas *canvas)
+ : BC_MenuItem(calculate_text(canvas->get_controls()))
+{
+	this->canvas = canvas;
+}
+int CWindowCanvasToggleControls::handle_event()
+{
+	canvas->toggle_controls();
+	set_text(calculate_text(canvas->get_controls()));
+	return 1;
+}
+
+const char *CWindowCanvasToggleControls::calculate_text(int controls)
+{
+	return !controls ? _("Show controls") : _("Hide controls");
+}
 
 
 CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)
@@ -983,6 +1000,19 @@ CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)
 	last_xscroll = 0;
 	last_yscroll = 0;
 	last_zoom = 0;
+	controls = 0;
+}
+
+void CWindowCanvas::create_objects(EDL *edl)
+{
+	Canvas::create_objects(edl);
+	canvas_menu->add_item(new CanvasPopupAuto(this));
+	canvas_menu->add_item(new CanvasPopupResetCamera(this));
+	canvas_menu->add_item(new CanvasPopupResetProjector(this));
+	canvas_menu->add_item(new CanvasPopupCameraKeyframe(this));
+	canvas_menu->add_item(new CanvasPopupProjectorKeyframe(this));
+	canvas_menu->add_item(controls = new CWindowCanvasToggleControls(this));
+	fullscreen_menu->add_item(new CanvasPopupAuto(this));
 }
 
 void CWindowCanvas::status_event()
@@ -999,19 +1029,19 @@ void CWindowCanvas::update_zoom(int x, int y, float zoom)
 	mwindow->edl->session->cwindow_scrollbars = use_scrollbars;
 }
 
-int CWindowCanvas::set_fullscreen(int on)
+int CWindowCanvas::set_fullscreen(int on, int unlock)
 {
 	int ret = 0;
 	if( on && !get_fullscreen() ) {
 		last_xscroll = get_xscroll();
 		last_yscroll = get_yscroll();
 		last_zoom = get_zoom();
-		Canvas::set_fullscreen(1);
-		zoom_auto();
+		Canvas::set_fullscreen(1, unlock);
+//		zoom_auto();
 		ret = 1;
 	}
 	if( !on && get_fullscreen() ) {
-		Canvas::set_fullscreen(0);
+		Canvas::set_fullscreen(0, unlock);
 		gui->zoom_panel->update(get_zoom());
 		update_zoom(last_xscroll, last_yscroll, last_zoom);
 		gui->update_canvas();
@@ -1062,6 +1092,18 @@ int CWindowCanvas::do_scroll(EDL *edl, float cursor_x, float cursor_y)
 	return 1;
 }
 
+int CWindowCanvas::scope_on()
+{
+	return !gui->edit_panel->scope_dialog ? 0 :
+		gui->edit_panel->scope_dialog->running();
+}
+
+void CWindowCanvas::draw_scope(VFrame *output)
+{
+	if( gui->edit_panel->scope_dialog )
+		gui->edit_panel->scope_dialog->process(output);
+}
+
 void CWindowCanvas::draw_refresh(int flush)
 {
 	BC_WindowBase *window = get_canvas();
@@ -2344,45 +2386,22 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 				gui->eyedrop_visible = 1;
 			}
 
-// Decompression coefficients straight out of jpeglib
-#define V_TO_R    1.40200
-#define V_TO_G    -0.71414
-
-#define U_TO_G    -0.34414
-#define U_TO_B    1.77200
-
-#define GET_COLOR(type, components, max, do_yuv) \
-{ \
+#define GET_COLOR(type, components, max, do_yuv) { \
 	type *row = (type*)(refresh_frame->get_rows()[i]) + \
 		j * components; \
 	float red = (float)*row++ / max; \
 	float green = (float)*row++ / max; \
 	float blue = (float)*row++ / max; \
 	if( do_yuv ) \
-	{ \
-		float r = red + V_TO_R * (blue - 0.5); \
-		float g = red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
-		float b = red + U_TO_B * (green - 0.5); \
-		mwindow->edl->local_session->red += r; \
-		mwindow->edl->local_session->green += g; \
-		mwindow->edl->local_session->blue += b; \
-		if( r > mwindow->edl->local_session->red_max ) mwindow->edl->local_session->red_max = r; \
-		if( g > mwindow->edl->local_session->green_max ) mwindow->edl->local_session->green_max = g; \
-		if( b > mwindow->edl->local_session->blue_max ) mwindow->edl->local_session->blue_max = b; \
-	} \
-	else \
-	{ \
-		mwindow->edl->local_session->red += red; \
-		mwindow->edl->local_session->green += green; \
-		mwindow->edl->local_session->blue += blue; \
-		if( red > mwindow->edl->local_session->red_max ) mwindow->edl->local_session->red_max = red; \
-		if( green > mwindow->edl->local_session->green_max ) mwindow->edl->local_session->green_max = green; \
-		if( blue > mwindow->edl->local_session->blue_max ) mwindow->edl->local_session->blue_max = blue; \
-	} \
+		YUV::yuv.yuv_to_rgb_f(red, green, blue, red, green-0.5, blue-0.5); \
+	mwindow->edl->local_session->red += red; \
+	mwindow->edl->local_session->green += green; \
+	mwindow->edl->local_session->blue += blue; \
+	if( red > mwindow->edl->local_session->red_max ) mwindow->edl->local_session->red_max = red; \
+	if( green > mwindow->edl->local_session->green_max ) mwindow->edl->local_session->green_max = green; \
+	if( blue > mwindow->edl->local_session->blue_max ) mwindow->edl->local_session->blue_max = blue; \
 }
 
-
-
 			mwindow->edl->local_session->red = 0;
 			mwindow->edl->local_session->green = 0;
 			mwindow->edl->local_session->blue = 0;
@@ -3394,7 +3413,7 @@ void CWindowCanvas::toggle_controls()
 	gui->resize_event(gui->get_w(), gui->get_h());
 }
 
-int CWindowCanvas::get_cwindow_controls()
+int CWindowCanvas::get_controls()
 {
 	return mwindow->session->cwindow_controls;
 }