popup->update(pen);
SketcherWindow *gui = popup->gui;
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
cv->pen = pen;
{
if( result ) color = orig_color | (~orig_alpha<<24);
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
cv->color = color;
gui->lock_window("SketcherCurveColor::update_gui");
update_gui(color);
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 ) {
SketcherCurve *cv = config.curves[ci];
cv->color = color;
SketcherCoord::SketcherCoord(SketcherWindow *gui, int x, int y,
coord output, coord mn, coord mx)
- : BC_TumbleTextBox(gui, output, mn, mx, x, y, 64, 1)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, xS(80), 1)
{
this->gui = gui;
set_increment(1);
SketcherNum::SketcherNum(SketcherWindow *gui, int x, int y,
int output, int mn, int mx)
- : BC_TumbleTextBox(gui, output, mn, mx, x, y, 54)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, xS(54))
{
this->gui = gui;
set_increment(1);
{
if( !SketcherCoord::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
SketcherPointList *point_list = gui->point_list;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
SketcherPoints &points = cv->points;
if( pi >= 0 && pi < points.size() ) {
coord v = atof(get_text());
{
if( !SketcherCoord::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
SketcherPointList *point_list = gui->point_list;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
SketcherPoints &points = cv->points;
if( pi >= 0 && pi < points.size() ) {
coord v = atof(get_text());
{
if( !SketcherNum::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
SketcherPointList *point_list = gui->point_list;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
SketcherPoints &points = cv->points;
if( pi >= 0 && pi < points.size() ) {
int id = atoi(get_text());
{
if( !SketcherNum::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
int v = atoi(get_text());
SketcherAliasing::SketcherAliasing(SketcherWindow *gui, Sketcher *plugin,
int x, int y)
- : BC_PopupMenu(x, y, xS(64),
+ : BC_PopupMenu(x, y, xS(80),
alias_to_text(plugin->config.aliasing), 1, 0, xS(3))
{
this->gui = gui;
this->plugin = plugin;
+ set_tooltip(_("Anti-Aliasing"));
}
SketcherAliasing::~SketcherAliasing()
{
const char *SketcherAliasing::alias_to_text(int alias)
{
if( alias < 0 ) return _("Off");
- if( alias > 0 ) return _("Dbl");
+ if( alias > 0 ) return _("Double");
return _("On");
}
SketcherWindow::SketcherWindow(Sketcher *plugin)
- : PluginClientWindow(plugin, xS(400), yS(620), xS(400), yS(620), 0)
+ : PluginClientWindow(plugin, xS(460), yS(680), xS(460), yS(680), 0)
{
this->plugin = plugin;
this->title_pen = 0; this->curve_pen = 0;
new_points = 0;
pending_motion = 0;
pending_config = 0;
+ helped = 0;
+ help_h = get_h();
+ last_time = 0;
}
SketcherWindow::~SketcherWindow()
int x = xS(10), y = yS(10), dy = 0, x1, y1;
int margin = plugin->get_theme()->widget_border;
BC_Title *title;
- int ci = plugin->config.cv_selected;
+ int ci = plugin->cv_selected;
if( ci < 0 || ci >= plugin->config.curves.size() )
ci = plugin->new_curve();
SketcherCurve *cv = plugin->config.curves[ci];
- reset_curves = new SketcherResetCurves(this, plugin, x1=x, y+yS(3));
+ reset_curves = new SketcherResetCurves(this, plugin, x1=x, y);
add_subwindow(reset_curves); dy = bmax(dy,reset_curves->get_h());
x1 += reset_curves->get_w() + 2*margin;
const char *curve_text = _("Curve");
add_subwindow(bar); dy = bmax(dy,bar->get_h());
y += dy + yS(2)*margin;
- int pi = plugin->config.pt_selected;
+ int pi = plugin->pt_selected;
SketcherPoint *pt = pi >= 0 && pi < cv->points.size() ? cv->points[pi] : 0;
reset_points = new SketcherResetPoints(this, plugin, x1=x, y+yS(3));
add_subwindow(reset_points); dy = bmax(dy,reset_points->get_h());
x1 += reset_points->get_w() + xS(2)*margin;
- if( plugin->config.drag ) {
+ if( plugin->drag ) {
if( !grab(plugin->server->mwindow->cwindow->gui) ) {
eprintf("drag enabled, but compositor already grabbed\n");
- plugin->config.drag = 0;
+ plugin->drag = 0;
}
}
drag = new SketcherDrag(this, x1, y);
y += dy + margin + yS(5); dy = 0;
point_list->update(pi);
+ add_subwindow(help = new SketcherHelp(this, plugin, x, y));
+ y += help->get_h() + yS(5);
+ help_y = y;
bar = new BC_Bar(x, y, get_w()-xS(2)*x);
add_subwindow(bar); dy = bmax(dy,bar->get_h());
y += dy + yS(2)*margin;
"drag point\n"
"drag all curves\n"
"new fill point"))); dy = bmax(dy, notes1->get_h());
- add_subwindow(notes2 = new BC_Title(x+xS(220), y,
+ add_subwindow(notes2 = new BC_Title(x+xS(280), y,
_(" RMB\n"
"new arc point\n"
"select curve\n"
y += dy + margin + yS(10);
add_subwindow(notes3 = new BC_Title(x, y,
- "Key DEL= delete point, +Shift= delete curve\n"));
+ _("Wheel: rotate, centered on cursor\n"
+ "Wheel: shift: scale, centered on cursor\n"
+ "Key DEL= delete point, +Shift= delete curve\n")));
+
+ resize_window(get_w(), help_y);
show_window(1);
}
int SketcherWindow::grab_button_press(XEvent *event)
{
SketcherConfig &config = plugin->config;
- int ci = config.cv_selected;
+ int ci = plugin->cv_selected;
if( ci < 0 || ci >= plugin->config.curves.size() )
return 0;
MWindow *mwindow = plugin->server->mwindow;
SketcherCurves &curves = config.curves;
SketcherCurve *cv = curves[ci];
SketcherPoints &points = cv->points;
- int pi = config.pt_selected;
-
+ int pi = plugin->pt_selected;
+
+ float s = 1.001; // min scale
+ float th = 0.1 * M_PI/180.f; // min theta .1 deg per wheel_btn
+ int64_t ms = event->xbutton.time;
+ double dt = (ms - last_time) / 1000.; // seconds
+ last_time = ms;
+ double mx_accel = 100., r = mx_accel / exp(1.);
+ double mx_dt = 1./2., mn_dt = 1./15.; // mn..mx period in sec/xev
+ bclip(dt, mn_dt, mx_dt);
+ double accel = r * exp(-(dt-mn_dt)/(mx_dt-mn_dt));
int button_no = event->xbutton.button;
switch( button_no ) {
+ case WHEEL_DOWN:
+ s = 2 - s;
+ th = -th; // fall thru
+ case WHEEL_UP: { // shift_down scale, !shift_down rotate
+ s = 1 + (s-1)*accel;
+ th *= accel;
+ float st = sin(th), ct = cos(th);
+ int sz = points.size();
+ int shift_down = (state & ShiftMask) ? 1 : 0;
+ for( int i=0; i<sz; ++i ) {
+ SketcherPoint *pt = points[i];
+ float px = pt->x - track_x, py = pt->y - track_y;
+ float nx = shift_down ? px*s : px*ct + py*st;
+ float ny = shift_down ? py*s : py*ct - px*st;
+ point_list->set_point(i, PT_X, pt->x = nx + track_x);
+ point_list->set_point(i, PT_Y, pt->y = ny + track_y);
+ }
+ point_list->update(-1);
+ button_no = 0;
+ break; }
+
case LEFT_BUTTON: {
if( (state & ShiftMask) ) { // create new point/string
++new_points;
return 0;
pending_motion = 0;
SketcherConfig &config = plugin->config;
- int ci = config.cv_selected;
+ int ci = plugin->cv_selected;
if( ci < 0 || ci >= plugin->config.curves.size() )
return 0;
SketcherCurves &curves = config.curves;
SketcherCurve *cv = curves[ci];
SketcherPoints &points = cv->points;
- int pi = config.pt_selected;
+ int pi = plugin->pt_selected;
if( (state & ShiftMask) ) { // string of points
if( (state & (Button1Mask|Button3Mask)) ) {
del_curve->handle_event() :
del_point->handle_event() ;
}
- return 0;
+ return context_help_check_and_show();
}
gui->curve_color->update_gui(cv->color);
ci = k;
}
- plugin->config.cv_selected = ci;
+ plugin->cv_selected = ci;
update_list(ci);
}
}
SketcherNewCurve::SketcherNewCurve(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, xS(64), _("New"))
+ : BC_GenericButton(x, y, xS(96), _("New"))
{
this->gui = gui;
this->plugin = plugin;
int pen = gui->curve_pen->pen;
int color = gui->curve_color->color;
int width = gui->curve_width->width;
- int ci = plugin->config.cv_selected;
+ int ci = plugin->cv_selected;
if( ci >= 0 && ci < plugin->config.curves.size() ) {
SketcherCurve *cv = plugin->config.curves[ci];
pen = cv->pen; width = cv->width; color = cv->color;
}
SketcherDelCurve::SketcherDelCurve(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, xS(64), C_("Del"))
+ : BC_GenericButton(x, y, xS(96), C_("Del"))
{
this->gui = gui;
this->plugin = plugin;
int SketcherDelCurve::handle_event()
{
SketcherConfig &config = plugin->config;
- int ci = config.cv_selected;
+ int ci = plugin->cv_selected;
SketcherCurves &curves = config.curves;
if( ci >= 0 && ci < curves.size() ) {
curves.remove_object_number(ci--);
}
SketcherCurveUp::SketcherCurveUp(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Up"))
+ : BC_GenericButton(x, y, xS(96), _("Up"))
{
this->gui = gui;
}
int SketcherCurveUp::handle_event()
{
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
SketcherCurves &curves = config.curves;
if( ci > 0 && ci < curves.size() ) {
SketcherCurve *&cv0 = curves[ci];
}
SketcherCurveDn::SketcherCurveDn(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Dn"))
+ : BC_GenericButton(x, y, xS(96), _("Dn"))
{
this->gui = gui;
}
int SketcherCurveDn::handle_event()
{
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
SketcherCurves &curves = config.curves;
if( ci >= 0 && ci < curves.size()-1 ) {
SketcherCurve *&cv0 = curves[ci];
SketcherWindow *gui = popup->gui;
SketcherConfig &config = gui->plugin->config;
SketcherCurves &curves = config.curves;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci < 0 || ci >= curves.size() )
return 1;
SketcherCurve *cv = curves[ci];
SketcherPoints &points = cv->points;
- int pi = config.pt_selected;
ArrayList<int> selected;
for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
gui->point_list->set_point(k, PT_TY, _(pt_type[arc]));
}
+ int pi = gui->plugin->pt_selected;
gui->point_list->update_list(pi);
gui->send_configure_change();
return 1;
void SketcherPointList::set_selected(int k)
{
SketcherPoint *pt = 0;
- int ci = plugin->config.cv_selected, pi = -1;
+ int ci = plugin->cv_selected, pi = -1;
if( ci >= 0 && ci < plugin->config.curves.size() ) {
SketcherCurve *cv = plugin->config.curves[ci];
pt = k >= 0 && k < cv->points.size() ? cv->points[pi=k] : 0;
gui->point_x->update(pt ? pt->x : 0.f);
gui->point_y->update(pt ? pt->y : 0.f);
gui->point_id->update(pt ? pt->id : 0);
- plugin->config.pt_selected = pi;
+ plugin->pt_selected = pi;
update_list(pi);
}
void SketcherPointList::update_list(int k)
void SketcherPointList::update(int k)
{
clear();
- int ci = plugin->config.cv_selected, sz = 0;
+ int ci = plugin->cv_selected, sz = 0;
if( ci >= 0 && ci < plugin->config.curves.size() ) {
SketcherCurve *cv = plugin->config.curves[ci];
SketcherPoints &points = cv->points;
void SketcherWindow::update_gui()
{
SketcherConfig &config = plugin->config;
- int ci = config.cv_selected;
- int pi = config.pt_selected;
- curve_list->update(ci);
- point_list->update(pi);
+ curve_list->update(plugin->cv_selected);
+ point_list->update(plugin->pt_selected);
+ int ci = plugin->cv_selected;
SketcherCurve *cv = ci >= 0 ? config.curves[ci] : 0;
curve_width->update(cv ? cv->width : 1);
curve_pen->update(cv ? cv->pen : PEN_SQUARE);
curve_color->set_color(cv ? cv->color : CV_COLOR);
- SketcherPoint *pt = pi >= 0 ? cv->points[pi] : 0;
+ int pi = plugin->pt_selected;
+ SketcherPoint *pt = pi >= 0 && pi<cv->points.size() ? cv->points[pi] : 0;
point_x->update(pt ? pt->x : 0);
point_y->update(pt ? pt->y : 0);
point_id->update(pt ? pt->id : 0);
- drag->update(plugin->config.drag);
+ drag->update(plugin->drag);
}
SketcherPointUp::SketcherPointUp(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Up"))
+ : BC_GenericButton(x, y, xS(96), _("Up"))
{
this->gui = gui;
}
int SketcherPointUp::handle_event()
{
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci < 0 || ci >= config.curves.size() )
return 1;
SketcherCurve *cv = config.curves[ci];
SketcherPoints &points = cv->points;
if( points.size() < 2 )
return 1;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
+ if( pi < 0 || pi >= points.size() )
+ return 1;
ArrayList<int> selected;
for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
}
SketcherPointDn::SketcherPointDn(SketcherWindow *gui, int x, int y)
- : BC_GenericButton(x, y, _("Dn"))
+ : BC_GenericButton(x, y, xS(96), _("Dn"))
{
this->gui = gui;
}
int SketcherPointDn::handle_event()
{
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci < 0 || ci >= config.curves.size() )
return 1;
SketcherCurve *cv = config.curves[ci];
int sz1 = points.size()-1;
if( sz1 < 1 )
return 1;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
+ if( pi < 0 || pi >= points.size() )
+ return 1;
ArrayList<int> selected;
for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
}
SketcherDrag::SketcherDrag(SketcherWindow *gui, int x, int y)
- : BC_CheckBox(x, y, gui->plugin->config.drag, _("Drag"))
+ : BC_CheckBox(x, y, gui->plugin->drag, (C_("Drag")))
{
this->gui = gui;
}
}
else
gui->ungrab(cwindow_gui);
- gui->plugin->config.drag = value;
+ gui->plugin->drag = value;
gui->send_configure_change();
return 1;
}
+int SketcherWindow::handle_ungrab()
+{
+ CWindowGUI *cwindow_gui = plugin->server->mwindow->cwindow->gui;
+ int ret = ungrab(cwindow_gui);
+ if( ret ) {
+ drag->update(0);
+ plugin->drag = 0;
+ }
+ return ret;
+}
SketcherNewPoint::SketcherNewPoint(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, xS(64), _("New"))
+ : BC_GenericButton(x, y, xS(96), _("New"))
{
this->gui = gui;
this->plugin = plugin;
}
int SketcherNewPoint::handle_event()
{
- int pi = plugin->config.pt_selected;
+ SketcherConfig &config = gui->plugin->config;
+ SketcherCurves &curves = config.curves;
+ int ci = gui->plugin->cv_selected;
+ if( ci < 0 || ci >= curves.size() )
+ return -1;
+ SketcherCurve *cv = curves[ci];
+ SketcherPoints &points = cv->points;
+ int pi = gui->plugin->pt_selected;
+ if( pi < 0 || pi >= points.size() )
+ return -1;
int arc = gui->point_type->type;
- int k = plugin->new_point(pi+1, arc);
+ int k = plugin->new_point(pi<0 ? 0 : pi+1, arc);
gui->point_list->update(k);
gui->send_configure_change();
return 1;
}
SketcherDelPoint::SketcherDelPoint(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, xS(64), C_("Del"))
+ : BC_GenericButton(x, y, xS(96), C_("Del"))
{
this->gui = gui;
this->plugin = plugin;
{
SketcherConfig &config = gui->plugin->config;
SketcherCurves &curves = config.curves;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci < 0 || ci >= curves.size() )
return 1;
SketcherCurve *cv = curves[ci];
SketcherPoints &points = cv->points;
- int pi = config.pt_selected;
+ int pi = gui->plugin->pt_selected;
+ if( pi < 0 || pi >= points.size() )
+ return 1;
ArrayList<int> selected;
for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
}
SketcherResetPoints::SketcherResetPoints(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_GenericButton(x, y, _("Reset"))
+ : BC_GenericButton(x, y-yS(2), _("Reset"))
{
this->gui = gui;
this->plugin = plugin;
int SketcherResetPoints::handle_event()
{
SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
+ int ci = gui->plugin->cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
cv->points.remove_all_objects();
return 1;
}
+SketcherHelp::SketcherHelp(SketcherWindow *gui, Sketcher *plugin, int x, int y)
+ : BC_CheckBox(x, y, 0, _("Help"))
+{
+ this->gui = gui;
+ this->plugin = plugin;
+ set_tooltip(_("Show help text"));
+}
+SketcherHelp::~SketcherHelp()
+{
+}
+
+int SketcherHelp::handle_event()
+{
+ gui->helped = get_value();
+ gui->resize_window(gui->get_w(),
+ gui->helped ? gui->help_h : gui->help_y);
+ gui->update_gui();
+ return 1;
+}
+
projects / goodguy / cinelerra.git / blobdiff