}
CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value)
- : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 70, 3)
+ : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 70)
{
this->gui = gui;
}
}
-CWindowCropOK::CWindowCropOK(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
- : BC_GenericButton(x, y, _("Do it"))
+CWindowCropApply::CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui, int x, int y)
+ : BC_GenericButton(x, y, _("Apply"))
{
this->mwindow = mwindow;
- this->gui = gui;
+ this->crop_gui = crop_gui;
}
-int CWindowCropOK::handle_event()
+int CWindowCropApply::handle_event()
{
- mwindow->crop_video();
+ mwindow->crop_video(crop_gui->crop_mode->mode);
return 1;
}
-int CWindowCropOK::keypress_event()
+int CWindowCropApply::keypress_event()
{
if(get_keypress() == 0xd)
{
return 0;
}
+const char *CWindowCropOpMode::crop_ops[] = {
+ N_("Reformat"),
+ N_("Resize"),
+ N_("Shrink"),
+};
+
+CWindowCropOpMode::CWindowCropOpMode(MWindow *mwindow, CWindowCropGUI *crop_gui,
+ int mode, int x, int y)
+ : BC_PopupMenu(x, y, 140, _(crop_ops[mode]), 1)
+{
+ this->mwindow = mwindow;
+ this->crop_gui = crop_gui;
+ this->mode = mode;
+}
+CWindowCropOpMode::~CWindowCropOpMode()
+{
+}
+
+void CWindowCropOpMode::create_objects()
+{
+ for( int id=0,nid=sizeof(crop_ops)/sizeof(crop_ops[0]); id<nid; ++id )
+ add_item(new CWindowCropOpItem(this, _(crop_ops[id]), id));
+ handle_event();
+}
+
+int CWindowCropOpMode::handle_event()
+{
+ set_text(_(crop_ops[mode]));
+ return 1;
+}
+CWindowCropOpItem::CWindowCropOpItem(CWindowCropOpMode *popup, const char *text, int id)
+ : BC_MenuItem(text)
+{
+ this->popup = popup;
+ this->id = id;
+}
+
+int CWindowCropOpItem::handle_event()
+{
+ popup->set_text(get_text());
+ popup->mode = id;
+ return popup->handle_event();
+}
add_subwindow(title = new BC_Title(x, y, _("W:")));
column1 = MAX(column1, title->get_w());
y += pad;
- add_subwindow(new CWindowCropOK(mwindow, thread->tool_gui, x, y));
+ add_subwindow(new CWindowCropApply(mwindow, this, x, y));
x += column1 + 5;
y = 10;
x1 = new CWindowCoord(thread->tool_gui, x, y,
mwindow->edl->session->crop_x1);
x1->create_objects();
+ x1->set_boundaries((int64_t)0, (int64_t)65536);
y += pad;
width = new CWindowCoord(thread->tool_gui, x, y,
mwindow->edl->session->crop_x2 - mwindow->edl->session->crop_x1);
width->create_objects();
+ width->set_boundaries((int64_t)1, (int64_t)65536);
x += x1->get_w() + 10;
y1 = new CWindowCoord(thread->tool_gui, x, y,
mwindow->edl->session->crop_y1);
y1->create_objects();
+ y1->set_boundaries((int64_t)0, (int64_t)65536);
y += pad;
+
height = new CWindowCoord(thread->tool_gui, x, y,
mwindow->edl->session->crop_y2 - mwindow->edl->session->crop_y1);
height->create_objects();
+ height->set_boundaries((int64_t)1, (int64_t)65536);
+ y += pad;
+
+ add_subwindow(crop_mode = new CWindowCropOpMode(mwindow, this,
+ CROP_REFORMAT, x, y));
+ crop_mode->create_objects();
+
unlock_window();
}
CWindowMaskUnclear::CWindowMaskUnclear(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y)
- : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("unclear_button"))
{
this->mwindow = mwindow;
this->gui = gui;
return 1;
}
-int CWindowMaskDelPoint::keypress_event()
-{
- if( get_keypress() == BACKSPACE ||
- get_keypress() == DELETE )
- return handle_event();
- return 0;
-}
-
-
-
CWindowMaskAffectedPoint::CWindowMaskAffectedPoint(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y)
int CWindowMaskScaleXY::handle_event()
{
gui->scale_mode = id;
- gui->mask_scale_x->update(id == 0);
- gui->mask_scale_y->update(id == 1);
- gui->mask_scale_xy->update(id == 2);
+ gui->mask_scale_x->update(id == MASK_SCALE_X);
+ gui->mask_scale_y->update(id == MASK_SCALE_Y);
+ gui->mask_scale_xy->update(id == MASK_SCALE_XY);
return 1;
}
CWindowMaskFeather::CWindowMaskFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, -FEATHER_MAX, FEATHER_MAX, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, INT_MIN, INT_MAX, x, y, 64, 2)
{
this->mwindow = mwindow;
this->gui = gui;
if( !gui->mask_enables[i]->get_value() ) continue;
SubMask *sub_mask = keyframe->get_submask(i);
float feather = sub_mask->feather + change;
- bclamp(feather, -FEATHER_MAX, FEATHER_MAX);
sub_mask->feather = feather;
}
#ifdef USE_KEYFRAME_SPANNING
int CWindowMaskFeather::handle_event()
{
float v = atof(get_text());
+ if( fabsf(v) > MAX_FEATHER )
+ BC_TumbleTextBox::update((float)(v>=0 ? MAX_FEATHER : -MAX_FEATHER));
gui->feather_slider->update(v);
return gui->feather->update_value(v);
}
CWindowMaskFeatherSlider::CWindowMaskFeatherSlider(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w, float v)
- : BC_FSlider(x, y, 0, w, w, -FEATHER_MAX, FEATHER_MAX, v)
+ : BC_FSlider(x, y, 0, w, w, -FEATHER_MAX-5, FEATHER_MAX+5, v)
{
this->mwindow = mwindow;
this->gui = gui;
timer = new Timer();
stick = 0;
last_v = 0;
+ max = FEATHER_MAX;
}
CWindowMaskFeatherSlider::~CWindowMaskFeatherSlider()
int CWindowMaskFeatherSlider::handle_event()
{
+ int sticky = 0;
float v = get_value();
- if( stick > 0 ) {
- int64_t ms = timer->get_difference();
- if( ms < 250 && --stick > 0 ) {
- if( get_value() == 0 ) return 1;
- update(v = 0);
+ if( fabsf(v) > MAX_FEATHER )
+ v = v>=0 ? MAX_FEATHER : -MAX_FEATHER;
+ if( stick && timer->get_difference() >= 250 )
+ stick = 0; // no events for .25 sec
+ if( stick && (last_v * (v-last_v)) < 0 )
+ stick = 0; // dv changed direction
+ if( stick ) {
+ if( --stick > 0 ) {
+ timer->update();
+ update(last_v);
+ return 1;
}
- else {
- stick = 0;
- last_v = v;
+ if( last_v ) {
+ max *= 1.25;
+ if( max > MAX_FEATHER ) max = MAX_FEATHER;
+ update(get_w(), v=last_v, -max-5, max+5);
+ button_release_event();
}
}
- else if( (last_v>=0 && v<0) || (last_v<0 && v>=0) ) {
- stick = 16;
- v = 0;
- }
- else
- last_v = v;
- timer->update();
+ else if( v > max ) { v = max; sticky = 24; }
+ else if( v < -max ) { v = -max; sticky = 24; }
+ else if( v>=0 ? last_v<0 : last_v>=0 ) { v = 0; sticky = 16; }
+ if( sticky ) { update(v); stick = sticky; timer->update(); }
+ last_v = v;
gui->feather->BC_TumbleTextBox::update(v);
return gui->feather->update_value(v);
}
int CWindowMaskFeatherSlider::update(float v)
{
- return BC_FSlider::update(v);
+ float vv = fabsf(v);
+ if( vv > MAX_FEATHER ) vv = MAX_FEATHER;
+ while( max < vv ) max *= 1.25;
+ return update(get_w(), v, -max-5, max+5);
+}
+int CWindowMaskFeatherSlider::update(int r, float v, float mn, float mx)
+{
+ return BC_FSlider::update(r, v, mn, mx);
}
CWindowMaskFade::CWindowMaskFade(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
return 1;
}
+CWindowMaskGangPoint::CWindowMaskGangPoint(MWindow *mwindow,
+ CWindowMaskGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
+{
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_tooltip(_("Gang points"));
+}
+
+CWindowMaskGangPoint::~CWindowMaskGangPoint()
+{
+}
+
+int CWindowMaskGangPoint::handle_event()
+{
+ return 1;
+}
+
CWindowMaskSmoothButton::CWindowMaskSmoothButton(MWindow *mwindow, CWindowMaskGUI *gui,
const char *tip, int type, int on, int x, int y, const char *images)
}
add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, clr_x, y));
y += mask_enables[0]->get_h() + 2*margin;
- add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Presets shapes")));
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Preset Shapes")));
y += title_bar->get_h() + margin;
add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this,
"mask_prst_sqr_images", MASK_SHAPE_SQUARE, t[0], y, _("Square")));
add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, t[1], y, 80));
add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
- t[5], y, theme->get_image_set("mask_scale_x"), 0, 0, _("scale x")));
+ t[5], y, theme->get_image_set("mask_scale_x"), 0, MASK_SCALE_X, _("xlate/scale x")));
add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this,
- t[6], y, theme->get_image_set("mask_scale_y"), 0, 1, _("scale y")));
+ t[6], y, theme->get_image_set("mask_scale_y"), 0, MASK_SCALE_Y, _("xlate/scale y")));
add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
- t[7], y, theme->get_image_set("mask_scale_xy"), 1, 2, _("scale xy")));
+ t[7], y, theme->get_image_set("mask_scale_xy"), 1, MASK_SCALE_XY, _("xlate/scale xy")));
y += mask_center->get_h() + 2*margin;
add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
y += title_bar->get_h() + 2*margin;
add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this,
_("smooth point"), 0, 1, t[4], y, "mask_pnt_smooth_images"));
add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y));
+ add_subwindow(gang_point = new CWindowMaskGangPoint(mwindow, this, clr_x, y));
y += active_point->get_h() + margin;
add_subwindow(title = new BC_Title(x, y, "X:"));
this->x = new CWindowCoord(this, t[0], y, (float)0.0);
"Shift+LMB: move an end point\n"
"Ctrl+LMB: move a control point\n"
"Alt+LMB: to drag translate the mask\n"
- "Shift+Key Delete: to delete the point\n"
"Shift+MMB: Set Pivot Point at pointer\n"
"Wheel: rotate around Pivot Point\n"
"Shift+Wheel: scale around Pivot Point\n"
void CWindowMaskGUI::handle_event()
{
- Track *track;
- MaskAuto *keyframe;
- MaskAutos *autos;
- SubMask *mask;
- MaskPoint *point;
- get_keyframe(track, autos, keyframe, mask, point, 0);
-
- mwindow->undo->update_undo_before(_("mask point"), this);
-
- if(point)
- {
+ int redraw = 0;
+ if( event_caller == this->focus_x ||
+ event_caller == this->focus_y ) {
+ redraw = 1;
+ }
+ else if( event_caller == this->x ||
+ event_caller == this->y ) {
+ Track *track;
+ MaskAuto *keyframe;
+ MaskAutos *autos;
+ SubMask *mask;
+ MaskPoint *point;
+ get_keyframe(track, autos, keyframe, mask, point, 0);
+
+ mwindow->undo->update_undo_before(_("mask point"), this);
+
+ if( point ) {
+ float px = atof(x->get_text());
+ float py = atof(y->get_text());
+ float dx = px - point->x, dy = py - point->y;
#ifdef USE_KEYFRAME_SPANNING
// Create temp keyframe
- MaskAuto temp_keyframe(mwindow->edl, autos);
- temp_keyframe.copy_data(keyframe);
+ MaskAuto temp_keyframe(mwindow->edl, autos);
+ temp_keyframe.copy_data(keyframe);
// Get affected point in temp keyframe
- mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
- if(mwindow->cwindow->gui->affected_point < mask->points.total &&
- mwindow->cwindow->gui->affected_point >= 0)
- {
- point = mask->points.values[mwindow->cwindow->gui->affected_point];
- }
-
- if(point)
- {
- point->x = atof(x->get_text());
- point->y = atof(y->get_text());
+ mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+ MaskPoints &points = mask->points;
+ int gang = gang_point->get_value();
+ int k = mwindow->cwindow->gui->affected_point;
+ int n = gang ? points.size() : k+1;
+ for( int i=gang? 0 : k; i<n; ++i ) {
+ if( i < 0 || i >= points.size() ) continue;
+ MaskPoint *point = points[i];
+ point->x += dx; point->y += dy;
+ }
+#ifdef USE_KEYFRAME_SPANNING
// Commit to spanned keyframes
autos->update_parameter(&temp_keyframe);
- }
-#else
- point->x = atof(x->get_text());
- point->y = atof(y->get_text());
#endif
+ }
+ mwindow->undo->update_undo_after(_("mask point"), LOAD_AUTOMATION);
+ redraw = 1;
}
- update_preview();
- mwindow->undo->update_undo_after(_("mask point"), LOAD_AUTOMATION);
+ if( redraw )
+ update_preview();
}
void CWindowMaskGUI::set_focused(int v, float cx, float cy)
{
this->mwindow = mwindow;
this->gui = gui;
- set_tooltip(_("delete preset"));
+ set_tooltip(_("Delete preset"));
}
int CWindowMaskDelete::handle_event()
projects / goodguy / cinelerra.git / blobdiff