X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=cb3a1d7e4f7cf4d0187a8ce82e631d34d6702451;hb=9d8694b7d2e0f4202e025eaf78d096340184b4e6;hp=caf0bf82d2953b65b9f4eeb2d9917d9a958cdd9b;hpb=63ced327c156ea7fe4448a18b0b1b0f2571dce7e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index caf0bf82..cb3a1d7e 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -1,7 +1,6 @@ - /* * CINELERRA - * Copyright (C) 2008-2014 Adam Williams + * Copyright (C) 2008-2017 Adam Williams * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +22,7 @@ #include #include "automation.h" -#include "cicolors.h" +#include "bccolors.h" #include "clip.h" #include "condition.h" #include "cpanel.h" @@ -290,9 +289,28 @@ int CWindowToolGUI::close_event() int CWindowToolGUI::keypress_event() { - if(get_keypress() == 'w' || get_keypress() == 'W') + int result = 0; + int cwindow_operation = CWINDOW_NONE; + + switch( get_keypress() ) { + case 'w': + case 'W': return close_event(); - return 0; + case KEY_F1: + case KEY_F2: + case KEY_F3: + case KEY_F4: + case KEY_F5: + case KEY_F6: + case KEY_F7: + case KEY_F8: + case KEY_F9: + case KEY_F10: + resend_event(thread->gui); + result = 1; + } + + return result; } int CWindowToolGUI::translation_event() @@ -461,11 +479,7 @@ void CWindowCropGUI::update() CWindowEyedropGUI::CWindowEyedropGUI(MWindow *mwindow, CWindowTool *thread) - : CWindowToolGUI(mwindow, - thread, - _(PROGRAM_NAME ": Color"), - 200, - 250) + : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Color"), 220, 290) { } @@ -476,9 +490,9 @@ CWindowEyedropGUI::~CWindowEyedropGUI() void CWindowEyedropGUI::create_objects() { int margin = mwindow->theme->widget_border; - int x = margin; - int y = margin; - int x2 = 70; + int x = 10 + margin; + int y = 10 + margin; + int x2 = 70, x3 = x2 + 60; lock_window("CWindowEyedropGUI::create_objects"); BC_Title *title0, *title1, *title2, *title3, *title4, *title5, *title6, *title7; add_subwindow(title0 = new BC_Title(x, y,_("X,Y:"))); @@ -506,17 +520,20 @@ void CWindowEyedropGUI::create_objects() radius->create_objects(); radius->set_boundaries((int64_t)0, (int64_t)255); - add_subwindow(red = new BC_Title(x2, title1->get_y(), "0")); add_subwindow(green = new BC_Title(x2, title2->get_y(), "0")); add_subwindow(blue = new BC_Title(x2, title3->get_y(), "0")); + add_subwindow(rgb_hex = new BC_Title(x3, red->get_y(), "#000000")); add_subwindow(this->y = new BC_Title(x2, title4->get_y(), "0")); add_subwindow(this->u = new BC_Title(x2, title5->get_y(), "0")); add_subwindow(this->v = new BC_Title(x2, title6->get_y(), "0")); + add_subwindow(yuv_hex = new BC_Title(x3, this->y->get_y(), "#000000")); - y = title6->get_y() + this->v->get_h() + margin; + y = title6->get_y() + this->v->get_h() + 2*margin; add_subwindow(sample = new BC_SubWindow(x, y, 50, 50)); + y += sample->get_h() + margin; + add_subwindow(use_max = new CWindowEyedropCheckBox(mwindow, this, x, y)); update(); unlock_window(); } @@ -531,25 +548,37 @@ void CWindowEyedropGUI::update() radius->update((int64_t)mwindow->edl->session->eyedrop_radius); - red->update(mwindow->edl->local_session->red); - green->update(mwindow->edl->local_session->green); - blue->update(mwindow->edl->local_session->blue); - + LocalSession *local_session = mwindow->edl->local_session; + int use_max = local_session->use_max; + float r = use_max ? local_session->red_max : local_session->red; + float g = use_max ? local_session->green_max : local_session->green; + float b = use_max ? local_session->blue_max : local_session->blue; + this->red->update(r); + this->green->update(g); + this->blue->update(b); + + int rx = 255*r + 0.5; bclamp(rx,0,255); + int gx = 255*g + 0.5; bclamp(gx,0,255); + int bx = 255*b + 0.5; bclamp(bx,0,255); + char rgb_text[BCSTRLEN]; + sprintf(rgb_text, "#%02x%02x%02x", rx, gx, bx); + rgb_hex->update(rgb_text); + float y, u, v; - YUV::rgb_to_yuv_f(mwindow->edl->local_session->red, - mwindow->edl->local_session->green, - mwindow->edl->local_session->blue, - y, - u, - v); + YUV::yuv.rgb_to_yuv_f(r, g, b, y, u, v); this->y->update(y); - this->u->update(u); - this->v->update(v); - - int red = (int)(CLIP(mwindow->edl->local_session->red, 0, 1) * 0xff); - int green = (int)(CLIP(mwindow->edl->local_session->green, 0, 1) * 0xff); - int blue = (int)(CLIP(mwindow->edl->local_session->blue, 0, 1) * 0xff); - sample->set_color((red << 16) | (green << 8) | blue); + this->u->update(u); u += 0.5; + this->v->update(v); v += 0.5; + + int yx = 255*y + 0.5; bclamp(yx,0,255); + int ux = 255*u + 0.5; bclamp(ux,0,255); + int vx = 255*v + 0.5; bclamp(vx,0,255); + char yuv_text[BCSTRLEN]; + sprintf(yuv_text, "#%02x%02x%02x", yx, ux, vx); + yuv_hex->update(yuv_text); + + int rgb = (rx << 16) | (gx << 8) | (bx << 0); + sample->set_color(rgb); sample->draw_box(0, 0, sample->get_w(), sample->get_h()); sample->set_color(BLACK); sample->draw_rectangle(0, 0, sample->get_w(), sample->get_h()); @@ -682,6 +711,23 @@ int CWindowCurveToggle::handle_event() } +CWindowEyedropCheckBox::CWindowEyedropCheckBox(MWindow *mwindow, + CWindowEyedropGUI *gui, int x, int y) + : BC_CheckBox(x, y, mwindow->edl->local_session->use_max, _("Use maximum")) +{ + this->mwindow = mwindow; + this->gui = gui; +} + +int CWindowEyedropCheckBox::handle_event() +{ + mwindow->edl->local_session->use_max = get_value(); + + gui->update(); + return 1; +} + + CWindowCameraGUI::CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread) : CWindowToolGUI(mwindow, thread, @@ -762,16 +808,12 @@ void CWindowCameraGUI::create_objects() void CWindowCameraGUI::update_preview() { - mwindow->restart_brender(); - mwindow->sync_parameters(CHANGE_PARAMS); - - mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_NONE, - mwindow->edl, - 1); mwindow->gui->lock_window("CWindowCameraGUI::update_preview"); + mwindow->restart_brender(); mwindow->gui->draw_overlays(1); + mwindow->sync_parameters(CHANGE_PARAMS); mwindow->gui->unlock_window(); + mwindow->cwindow->refresh_frame(CHANGE_NONE); mwindow->cwindow->gui->lock_window("CWindowCameraGUI::update_preview"); mwindow->cwindow->gui->canvas->draw_refresh(); mwindow->cwindow->gui->unlock_window(); @@ -1210,16 +1252,12 @@ void CWindowProjectorGUI::create_objects() void CWindowProjectorGUI::update_preview() { + mwindow->gui->lock_window("CWindowProjectorGUI::update_preview"); mwindow->restart_brender(); mwindow->sync_parameters(CHANGE_PARAMS); - mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_NONE, - mwindow->edl, - 1); - // TODO: really need to lock the main window?? - mwindow->gui->lock_window("CWindowProjectorGUI::update_preview"); mwindow->gui->draw_overlays(1); mwindow->gui->unlock_window(); + mwindow->cwindow->refresh_frame(CHANGE_NONE); mwindow->cwindow->gui->lock_window("CWindowProjectorGUI::update_preview"); mwindow->cwindow->gui->canvas->draw_refresh(); mwindow->cwindow->gui->unlock_window(); @@ -1643,6 +1681,9 @@ int CWindowMaskDelete::handle_event() temp_keyframe.copy_data(keyframe); // Update parameter SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask); + if( shift_down() ) + submask->points.remove_all_objects(); + for(int i = mwindow->cwindow->gui->affected_point; i < submask->points.total - 1; i++) @@ -1664,6 +1705,8 @@ int CWindowMaskDelete::handle_event() current; ) { SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask); + if( shift_down() ) + submask->points.remove_all_objects(); for(int i = mwindow->cwindow->gui->affected_point; i < submask->points.total - 1; @@ -2026,11 +2069,8 @@ int CWindowDisableOpenGLMasking::handle_event() CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread) - : CWindowToolGUI(mwindow, - thread, - _(PROGRAM_NAME ": Mask"), - 330, - 310) + : CWindowToolGUI(mwindow, thread, + _(PROGRAM_NAME ": Mask"), 330, 320) { this->mwindow = mwindow; this->thread = thread; @@ -2098,6 +2138,8 @@ void CWindowMaskGUI::create_objects() y += title->get_h() + margin; add_subwindow(title = new BC_Title(x, y, _("Press Ctrl to move a control point"))); y += title->get_h() + margin; + add_subwindow(title = new BC_Title(x, y, _("Shift+click Delete to delete the mask"))); + y += title->get_h() + margin; add_subwindow(title = new BC_Title(x, y, _("Press Alt to translate the mask"))); y += 30; @@ -2237,12 +2279,12 @@ void CWindowMaskGUI::handle_event() void CWindowMaskGUI::update_preview() { + mwindow->gui->lock_window("CWindowMaskGUI::update_preview"); mwindow->restart_brender(); mwindow->sync_parameters(CHANGE_PARAMS); - mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_NONE, - mwindow->edl, - 1); + mwindow->gui->draw_overlays(1); + mwindow->gui->unlock_window(); + mwindow->cwindow->refresh_frame(CHANGE_NONE); mwindow->cwindow->gui->lock_window("CWindowMaskGUI::update_preview"); mwindow->cwindow->gui->canvas->draw_refresh(); mwindow->cwindow->gui->unlock_window();