X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=21e8e90f76ce6d1e4cd80576abcd8e51480e3061;hp=94887b5ba6a9c5e2ff29ebf080228f3655f4857d;hb=667ff598ae2a94f48c7056aee1d77d7cde39066b;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 94887b5b..21e8e90f 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -92,23 +92,28 @@ CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
 	affected_track = 0;
-	affected_x = 0;
-	affected_y = 0;
-	affected_z = 0;
+	affected_x = affected_y = affected_z = 0;
 	mask_keyframe = 0;
 	orig_mask_keyframe = new MaskAuto(0, 0);
 	affected_point = 0;
-	x_offset = 0;
-	y_offset = 0;
-	x_origin = 0;
-	y_origin = 0;
+	x_offset = y_offset = 0;
+	x_origin = y_origin = 0;
 	current_operation = CWINDOW_NONE;
 	tool_panel = 0;
-	translating_zoom = 0;
 	active = 0;
 	inactive = 0;
-	crop_translate = 0;
+	crop_handle = -1; crop_translate = 0;
+	crop_origin_x = crop_origin_y = 0;
+	crop_origin_x1 = crop_origin_y1 = 0;
+	crop_origin_x2 = crop_origin_y2 = 0;
 	eyedrop_visible = 0;
+	eyedrop_x = eyedrop_y = 0;
+	ruler_origin_x = ruler_origin_y = 0;
+	ruler_handle = -1; ruler_translate = 0;
+	center_x = center_y = center_z = 0;
+	control_in_x = control_in_y = 0;
+	control_out_x = control_out_y = 0;
+	translating_zoom = 0;
 	highlighted = 0;
 }
 
@@ -381,7 +386,7 @@ void CWindowGUI::zoom_canvas(double value, int update_menu)
 		x = output_x - cx / zoom;
 		y = output_y - cy / zoom;
 	}
-	canvas->update_zoom((int)x, (int)y, zoom);
+	canvas->update_zoom((int)(x+0.5), (int)(y+0.5), zoom);
 
 	if( update_menu )
 		zoom_panel->update(value);
@@ -824,7 +829,7 @@ int CWindowSlider::handle_event()
 
 void CWindowSlider::set_position()
 {
-	double new_length = mwindow->edl->tracks->total_playable_length();
+	double new_length = mwindow->edl->tracks->total_length();
 // 	if(mwindow->edl->local_session->preview_end <= 0 ||
 // 		mwindow->edl->local_session->preview_end > new_length)
 // 		mwindow->edl->local_session->preview_end = new_length;
@@ -2162,15 +2167,24 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 	float blue = (float)*row++ / max; \
 	if(do_yuv) \
 	{ \
-		mwindow->edl->local_session->red += red + V_TO_R * (blue - 0.5); \
-		mwindow->edl->local_session->green += red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
-		mwindow->edl->local_session->blue += red + U_TO_B * (green - 0.5); \
+		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; \
 	} \
 }
 
@@ -2179,6 +2193,9 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 			mwindow->edl->local_session->red = 0;
 			mwindow->edl->local_session->green = 0;
 			mwindow->edl->local_session->blue = 0;
+			mwindow->edl->local_session->red_max = 0;
+			mwindow->edl->local_session->green_max = 0;
+			mwindow->edl->local_session->blue_max = 0;
 			for(int i = row1; i < row2; i++)
 			{
 				for(int j = column1; j < column2; j++)
@@ -3161,10 +3178,7 @@ int CWindowCanvas::cursor_motion_event()
 		gui->unlock_window();
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::cursor_motion_event 2");
 	}
@@ -3253,10 +3267,7 @@ int CWindowCanvas::button_press_event()
 
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::button_press_event 2");
 	}