#define AltMask Mod1Mask
-#define COLOR_W 40
-#define COLOR_H 24
+#define COLOR_W xS(40)
+#define COLOR_H yS(24)
const char *SketcherPoint::types[] = {
N_("off"),
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;
}
SketcherCurvePen::SketcherCurvePen(SketcherWindow *gui, int x, int y, int pen)
- : BC_PopupMenu(x,y,100,_(cv_pen[pen]))
+ : BC_PopupMenu(x,y,xS(100),_(cv_pen[pen]))
{
this->gui = gui;
this->pen = pen;
{
this->gui = gui;
this->color = CV_COLOR;
- for( int i=0; i<3; ++i ) {
- vframes[i] = new VFrame(w, h, BC_RGB888);
- vframes[i]->clear_frame();
- }
}
SketcherCurveColor::~SketcherCurveColor()
{
- for( int i=0; i<3; ++i )
- delete vframes[i];
}
void SketcherCurveColor::handle_done_event(int result)
{
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());
}
+SketcherAliasItem::SketcherAliasItem(SketcherAliasing *popup, int v)
+ : BC_MenuItem(popup->alias_to_text(v))
+{
+ this->popup = popup;
+ this->v = v;
+}
+
+int SketcherAliasItem::handle_event()
+{
+ popup->set_text(get_text());
+ popup->plugin->config.aliasing = v;
+ popup->gui->send_configure_change();
+ return 1;
+}
+
+
+SketcherAliasing::SketcherAliasing(SketcherWindow *gui, Sketcher *plugin,
+ int x, int y)
+ : 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()
+{
+}
+
+void SketcherAliasing::create_objects()
+{
+ add_item(new SketcherAliasItem(this, -1));
+ add_item(new SketcherAliasItem(this, 0));
+ add_item(new SketcherAliasItem(this, 1));
+}
+
+const char *SketcherAliasing::alias_to_text(int alias)
+{
+ if( alias < 0 ) return _("Off");
+ if( alias > 0 ) return _("Double");
+ return _("On");
+}
+
+
+
SketcherWindow::SketcherWindow(Sketcher *plugin)
- : PluginClientWindow(plugin, 380, 620, 380, 620, 0)
+ : PluginClientWindow(plugin, xS(460), yS(680), xS(460), yS(680), 0)
{
this->plugin = plugin;
this->title_pen = 0; this->curve_pen = 0;
position = -1;
track_w = track_h -1;
- cursor_x = cursor_y = -1;
output_x = output_y = -1;
+ track_x = track_y = -1;
last_x = last_y = -1;
projector_x = projector_y = projector_z = -1;
state = 0; dragging = 0;
new_points = 0;
pending_motion = 0;
pending_config = 0;
+ helped = 0;
+ help_h = get_h();
+ last_time = 0;
}
SketcherWindow::~SketcherWindow()
void SketcherWindow::create_objects()
{
- int x = 10, y = 10, dy = 0, x1, y1;
+ 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+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");
x1 += title_width->get_w() + margin;
curve_width = new SketcherCurveWidth(this, x1, y, cv->width);
curve_width->create_objects();
+ x1 += curve_width->get_w() + margin;
+ aliasing = new SketcherAliasing(this, plugin, x1, y);
+ add_subwindow(aliasing); dy = bmax(dy,aliasing->get_h());
+ aliasing->create_objects();
y += dy + 2*margin; dy = 0;
x1 = get_w()-x - BC_Title::calculate_w(this, curve_text, LARGEFONT);
add_subwindow(curve_up); dy = bmax(dy,curve_up->get_h());
x1 += curve_up->get_w() + 4*margin;
y1 = BC_Title::calculate_h(this, _("Pen:"));
- title_pen = new BC_Title(x1+30, y+dy-y1, _("Pen:"));
+ title_pen = new BC_Title(x1+xS(30), y+dy-y1, _("Pen:"));
add_subwindow(title_pen); dy = bmax(dy,title_pen->get_h());
- int x2 = (get_w()+x1)/2 + 20;
+ int x2 = (get_w()+x1)/2 + xS(20);
y1 = BC_Title::calculate_h(this, _("Color:"));
title_color = new BC_Title(x2, y+dy-y1, _("Color:"));
add_subwindow(title_color); dy = bmax(dy,title_color->get_h());
curve_list->update(ci);
BC_Bar *bar;
- bar = new BC_Bar(x, y, get_w()-2*x);
+ bar = new BC_Bar(x, y, get_w()-xS(2)*x);
add_subwindow(bar); dy = bmax(dy,bar->get_h());
- bar = new BC_Bar(x, y+=dy, get_w()-2*x);
+ bar = new BC_Bar(x, y+=dy, get_w()-xS(2)*x);
add_subwindow(bar); dy = bmax(dy,bar->get_h());
- y += dy + 2*margin;
+ 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+3);
+ 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() + 2*margin;
- if( plugin->config.drag ) {
+ x1 += reset_points->get_w() + xS(2)*margin;
+ 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);
add_subwindow(drag); dy = bmax(dy,drag->get_h());
- x1 += drag->get_w() + 2*margin;
+ x1 += drag->get_w() + xS(2)*margin;
int arc = pt ? pt->arc : ARC_LINE;
point_type = new SketcherPointType(this, x1, y, arc);
add_subwindow(point_type); dy = bmax(dy,point_type->get_h());
x1 += new_point->get_w() + margin;
point_up = new SketcherPointUp(this, x1, y);
add_subwindow(point_up); dy = bmax(dy,point_up->get_h());
- x1 += point_up->get_w() + 2*margin;
+ x1 += point_up->get_w() + xS(2)*margin;
title_x = new BC_Title(x1, y, _("X:"));
add_subwindow(title_x); dy = bmax(dy,title_x->get_h());
x1 += title_x->get_w() + margin;
point_x = new SketcherPointX(this, x1, y, !pt ? 0.f : pt->x);
point_x->create_objects(); dy = bmax(dy, point_x->get_h());
- x2 = x1 + point_x->get_w() + 2*margin + 10;
+ x2 = x1 + point_x->get_w() + xS(2)*margin + xS(10);
y1 = BC_Title::calculate_h(this, _("ID:"));
- title_id = new BC_Title(x2+16, y+dy-y1, _("ID:"));
+ title_id = new BC_Title(x2+xS(16), y+dy-y1, _("ID:"));
add_subwindow(title_id); dy = bmax(dy, title_id->get_h());
y += dy + margin; dy = 0;
x1 += del_point->get_w() + margin;
point_dn = new SketcherPointDn(this, x1, y);
add_subwindow(point_dn); dy = bmax(dy,point_dn->get_h());
- x1 += point_dn->get_w() + 2*margin;
+ x1 += point_dn->get_w() + xS(2)*margin;
title_y = new BC_Title(x1, y, _("Y:"));
add_subwindow(title_y); dy = bmax(dy,title_y->get_h());
x1 += title_y->get_w() + margin;
point_y->create_objects(); dy = bmax(dy, point_y->get_h());
point_id = new SketcherPointId(this, x2, y, !pt ? 0 : pt->id);
point_id->create_objects(); dy = bmax(dy, point_id->get_h());
- y += dy + margin + 5; dy = 0;
+ y += dy + margin + yS(5); dy = 0;
point_list->update(pi);
- bar = new BC_Bar(x, y, get_w()-2*x);
+ 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 + 2*margin;
+ y += dy + yS(2)*margin;
add_subwindow(notes0 = new BC_Title(x, y,
_("\n"
"Ctrl=\n"
"Ctrl+Alt=\n"
"Ctrl+Shift="))); dy = bmax(dy, notes0->get_h());
- add_subwindow(notes1 = new BC_Title(x+100, y,
+ add_subwindow(notes1 = new BC_Title(x+xS(100), y,
_(" LMB\n"
"new line point\n"
"select point\n"
"drag point\n"
"drag all curves\n"
"new fill point"))); dy = bmax(dy, notes1->get_h());
- add_subwindow(notes2 = new BC_Title(x+220, y,
+ add_subwindow(notes2 = new BC_Title(x+xS(280), y,
_(" RMB\n"
"new arc point\n"
"select curve\n"
"drag curve\n"
"new curve\n"
"new off point"))); dy = bmax(dy, notes2->get_h());
- y += dy + margin + 10;
+ 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);
}
void SketcherWindow::done_event(int result)
{
+ curve_color->close_picker();
ungrab(plugin->server->mwindow->cwindow->gui);
}
if( grab_cursor_motion() )
pending_config = 1;
if( pending_config ) {
- last_x = output_x; last_y = output_y;
+ last_x = track_x; last_y = track_y;
send_configure_change();
}
}
MWindow *mwindow = plugin->server->mwindow;
CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
CWindowCanvas *canvas = cwindow_gui->canvas;
- int cx, cy; cwindow_gui->get_relative_cursor(cx, cy);
- cx -= canvas->view_x;
- cy -= canvas->view_y;
+ cwindow_gui->get_relative_cursor(cursor_x, cursor_y);
+ output_x = cursor_x - canvas->view_x;
+ output_y = cursor_y - canvas->view_y;
if( !dragging ) {
- if( cx < 0 || cx >= canvas->view_w ||
- cy < 0 || cy >= canvas->view_h )
+ if( output_x < 0 || output_x >= canvas->view_w ||
+ output_y < 0 || output_y >= canvas->view_h )
return 0;
}
return 0;
}
- cursor_x = cx, cursor_y = cy;
- canvas->canvas_to_output(mwindow->edl, 0, cursor_x, cursor_y);
- position = plugin->get_source_position();
- Track *track = plugin->server->plugin->track;
- track_w = track->track_w;
- track_h = track->track_h;
- track->automation->get_projector(
- &projector_x, &projector_y, &projector_z,
- position, PLAY_FORWARD);
- projector_x += mwindow->edl->session->output_w / 2;
- projector_y += mwindow->edl->session->output_h / 2;
- output_x = (cursor_x - projector_x) / projector_z + track_w / 2;
- output_y = (cursor_y - projector_y) / projector_z + track_h / 2;
+ canvas->canvas_to_output(mwindow->edl, 0, output_x, output_y);
+ plugin->output_to_track(output_x, output_y, track_x, track_y);
state = event->xmotion.state;
if( event->type == MotionNotify ) {
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;
+ CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
+ CWindowCanvas *canvas = cwindow_gui->canvas;
+
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;
pi = plugin->new_point(cv,
!(state & ControlMask) ? ARC_LINE : ARC_FILL,
- output_x, output_y, pi+1);
+ track_x, track_y, pi+1);
point_list->update(pi);
break;
}
SketcherPoint *pt = 0; // select point
- double dist = cv->nearest_point(pi, output_x,output_y);
+ double dist = cv->nearest_point(pi, track_x,track_y);
if( dist >= 0 ) {
pt = points[pi];
- Track *track = plugin->server->plugin->track;
- int track_w = track->track_w, track_h = track->track_h;
- float px = (pt->x - track_w / 2) * projector_z + projector_x;
- float py = (pt->y - track_h / 2) * projector_z + projector_y;
- float pix = DISTANCE(px, py, cursor_x,cursor_y);
- if( (state & ControlMask) && pix >= HANDLE_W ) { pi = -1; pt = 0; }
+ float cx, cy;
+ plugin->track_to_output(pt->x, pt->y, cx, cy);
+ canvas->output_to_canvas(mwindow->edl, 0, cx, cy);
+ cx += canvas->view_x; cy += canvas->view_y;
+ dist = DISTANCE(cx,cy, cursor_x,cursor_y);
+ if( (state & ControlMask) && dist >= HANDLE_W ) {
+ pi = -1; pt = 0;
+ }
}
point_list->set_selected(pi);
break; }
++new_points;
pi = plugin->new_point(cv,
!(state & ControlMask) ? ARC_CURVE : ARC_OFF,
- output_x, output_y, pi+1);
+ track_x, track_y, pi+1);
point_list->update(pi);
break;
}
break;
}
SketcherPoint *pt = 0;
- double dist = config.nearest_point(ci, pi, output_x,output_y);
+ double dist = config.nearest_point(ci, pi, track_x,track_y);
if( dist >= 0 ) {
pt = curves[ci]->points[pi];
- Track *track = plugin->server->plugin->track;
- int track_w = track->track_w, track_h = track->track_h;
- float px = (pt->x - track_w / 2) * projector_z + projector_x;
- float py = (pt->y - track_h / 2) * projector_z + projector_y;
- float pix = DISTANCE(px, py, cursor_x,cursor_y);
- if( (state & ControlMask) && pix >= HANDLE_W ) { ci = pi = -1; pt = 0; }
+ float cx, cy;
+ plugin->track_to_output(pt->x, pt->y, cx, cy);
+ canvas->output_to_canvas(mwindow->edl, 0, cx, cy);
+ cx += canvas->view_x; cy += canvas->view_y;
+ dist = DISTANCE(cx,cy, cursor_x,cursor_y);
+ if( (state & ControlMask) && dist >= HANDLE_W ) {
+ ci = pi = -1; pt = 0;
+ }
}
if( pt ) {
curve_list->update(ci);
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)) ) {
SketcherPoint *pt = pi >= 0 && pi < points.size() ? points[pi] : 0;
if( pt ) {
- float dist = DISTANCE(pt->x, pt->y, output_x, output_y);
+ float dist = DISTANCE(pt->x, pt->y, track_x, track_y);
if( dist < get_w()*0.1 ) return 0; // tolerance w/10
}
++new_points;
int arc = (state & Button1Mask) ? ARC_LINE : ARC_CURVE;
- pi = plugin->new_point(cv, arc, output_x, output_y, pi+1);
+ pi = plugin->new_point(cv, arc, track_x, track_y, pi+1);
point_list->update(pi);
}
return 1;
if( (state & ControlMask) && !(state & AltMask) ) { // drag selected point
SketcherPoint *pt = pi >= 0 && pi < points.size() ? points[pi] : 0;
if( pt ) {
- point_list->set_point(pi, PT_X, pt->x = output_x);
- point_list->set_point(pi, PT_Y, pt->y = output_y);
+ point_list->set_point(pi, PT_X, pt->x = track_x);
+ point_list->set_point(pi, PT_Y, pt->y = track_y);
point_list->update_list(pi);
point_x->update(pt->x);
point_y->update(pt->y);
return 1;
}
if( (state & ControlMask) && (state & AltMask) ) { // drag all curves
- int dx = round(output_x - last_x);
- int dy = round(output_y - last_y);
+ int dx = round(track_x - last_x);
+ int dy = round(track_y - last_y);
for( int i=0; i<curves.size(); ++i ) {
SketcherCurve *crv = plugin->config.curves[i];
int pts = crv->points.size();
point_list->update(pi);
return 1;
}
- double dist = cv->nearest_point(pi, output_x,output_y);
+ double dist = cv->nearest_point(pi, track_x,track_y);
if( dist >= 0 )
point_list->set_selected(pi);
return 1;
}
if( (state & Button3Mask) ) {
if( (state & (ControlMask | AltMask)) ) { // drag selected curve(s)
- int dx = round(output_x - last_x);
- int dy = round(output_y - last_y);
+ int dx = round(track_x - last_x);
+ int dy = round(track_y - last_y);
for( int i=0; i<points.size(); ++i ) {
SketcherPoint *pt = points[i];
pt->x += dx; pt->y += dy;
point_list->update(pi);
return 1;
}
- double dist = config.nearest_point(ci, pi, output_x,output_y);
+ double dist = config.nearest_point(ci, pi, track_x,track_y);
if( dist >= 0 ) {
curve_list->update(ci);
point_list->update(pi);
SketcherCurveList::SketcherCurveList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
+ : BC_ListBox(x, y, xS(360), yS(130), LISTBOX_TEXT)
{
this->gui = gui;
this->plugin = plugin;
- col_titles[CV_ID] = _("ID"); col_widths[CV_ID] = 64;
- col_titles[CV_RAD] = _("width"); col_widths[CV_RAD] = 64;
- col_titles[CV_PEN] = _("pen"); col_widths[CV_PEN] = 64;
- col_titles[CV_CLR] = _("color"); col_widths[CV_CLR] = 80;
- col_titles[CV_ALP] = _("alpha"); col_widths[CV_ALP] = 64;
+ col_titles[CV_ID] = _("ID"); col_widths[CV_ID] = xS(64);
+ col_titles[CV_RAD] = _("width"); col_widths[CV_RAD] = xS(64);
+ col_titles[CV_PEN] = _("pen"); col_widths[CV_PEN] = xS(64);
+ col_titles[CV_CLR] = _("color"); col_widths[CV_CLR] = xS(80);
+ col_titles[CV_ALP] = _("alpha"); col_widths[CV_ALP] = xS(64);
}
SketcherCurveList::~SketcherCurveList()
{
int SketcherCurveList::selection_changed()
{
+ gui->curve_color->close_picker();
handle_event();
return 1;
}
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, 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, 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;
}
SketcherPointType::SketcherPointType(SketcherWindow *gui, int x, int y, int arc)
- : BC_PopupMenu(x,y,100,_(pt_type[arc]))
+ : BC_PopupMenu(x,y,xS(100),_(pt_type[arc]))
{
this->gui = gui;
this->type = arc;
SketcherPointList::SketcherPointList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
- : BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
+ : BC_ListBox(x, y, xS(360), yS(130), LISTBOX_TEXT)
{
this->gui = gui;
this->plugin = plugin;
- col_titles[PT_ID] = _("ID"); col_widths[PT_ID] = 50;
- col_titles[PT_TY] = _("Type"); col_widths[PT_TY] = 80;
- col_titles[PT_X] = _("X"); col_widths[PT_X] = 90;
- col_titles[PT_Y] = _("Y"); col_widths[PT_Y] = 90;
+ col_titles[PT_ID] = _("ID"); col_widths[PT_ID] = xS(50);
+ col_titles[PT_TY] = _("Type"); col_widths[PT_TY] = xS(80);
+ col_titles[PT_X] = _("X"); col_widths[PT_X] = xS(90);
+ col_titles[PT_Y] = _("Y"); col_widths[PT_Y] = xS(90);
set_selection_mode(LISTBOX_MULTIPLE);
}
SketcherPointList::~SketcherPointList()
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, 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, 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;
+}
+