#include "theme.h"
#include "track.h"
-#define COLOR_W 30
-#define COLOR_H 30
+#define AltMask Mod1Mask
-const char *SketcherCurve::types[] = {
+#define COLOR_W 40
+#define COLOR_H 24
+
+const char *SketcherPoint::types[] = {
N_("off"),
N_("line"),
- N_("smooth"),
+ N_("curve"),
+ N_("fill"),
};
const char *SketcherCurve::pens[] = {
+ N_("off"),
N_("box"),
N_("+"),
N_("/"),
N_("X"),
};
-SketcherCurveTypeItem::SketcherCurveTypeItem(int ty)
- : BC_MenuItem(_(cv_type[ty]))
-{
- this->ty = ty;
-}
-int SketcherCurveTypeItem::handle_event()
-{
- SketcherCurveType *popup = (SketcherCurveType*)get_popup_menu();
- popup->update(ty);
- SketcherWindow *gui = popup->gui;
- SketcherConfig &config = gui->plugin->config;
- int ci = config.cv_selected;
- if( ci >= 0 && ci < config.curves.size() ) {
- SketcherCurve *cv = config.curves[ci];
- cv->ty = ty;
- gui->curve_list->update(ci);
- gui->send_configure_change();
- }
- return 1;
-}
-
-SketcherCurveType::SketcherCurveType(SketcherWindow *gui, int x, int y, int ty)
- : BC_PopupMenu(x,y,64,_(cv_type[ty]))
-{
- this->gui = gui;
-}
-void SketcherCurveType::create_objects()
-{
- int n = sizeof(cv_type)/sizeof(cv_type[0]);
- for( int ty=0; ty<n; ++ty )
- add_item(new SketcherCurveTypeItem(ty));
-}
-void SketcherCurveType::update(int ty)
-{
- set_text(_(cv_type[ty]));
-}
-
SketcherCurvePenItem::SketcherCurvePenItem(int pen)
- : BC_MenuItem(_(cv_pen[pen]))
+ : BC_MenuItem(_(SketcherCurve::pens[pen]))
{
this->pen = pen;
}
: BC_PopupMenu(x,y,72,_(cv_pen[pen]))
{
this->gui = gui;
+ this->pen = pen;
}
void SketcherCurvePen::create_objects()
{
}
void SketcherCurvePen::update(int pen)
{
- set_text(_(cv_pen[pen]));
+ set_text(_(cv_pen[this->pen=pen]));
}
-SketcherCurveColor::SketcherCurveColor(SketcherWindow *gui, int x, int y, int w)
- : BC_Button(x, y, w, vframes)
+SketcherCurveColor::SketcherCurveColor(SketcherWindow *gui,
+ int x, int y, int w, int h, int color, int alpha)
+ : ColorBoxButton(_("Curve Color"), x, y, w, h, color, alpha, 1)
{
this->gui = gui;
- this->color = BLACK;
+ this->color = CV_COLOR;
for( int i=0; i<3; ++i ) {
- vframes[i] = new VFrame(w, w, BC_RGBA8888);
+ vframes[i] = new VFrame(w, h, BC_RGB888);
vframes[i]->clear_frame();
}
}
delete vframes[i];
}
-void SketcherCurveColor::set_color(int color)
-{
- this->color = color;
- int r = (color>>16) & 0xff;
- int g = (color>>8) & 0xff;
- int b = (color>>0) & 0xff;
- for( int i=0; i<3; ++i ) {
- VFrame *vframe = vframes[i];
- int ww = vframe->get_w(), hh = vframe->get_h();
- int cx = (ww+1)/2, cy = hh/2;
- double cc = (cx*cx + cy*cy) / 4.;
- uint8_t *bp = vframe->get_data(), *dp = bp;
- uint8_t *ep = dp + vframe->get_data_size();
- int rr = r, gg = g, bb = b;
- int bpl = vframe->get_bytes_per_line();
- switch( i ) {
- case BUTTON_UP:
- break;
- case BUTTON_UPHI:
- if( (rr+=48) > 0xff ) rr = 0xff;
- if( (gg+=48) > 0xff ) gg = 0xff;
- if( (bb+=48) > 0xff ) bb = 0xff;
- break;
- case BUTTON_DOWNHI:
- if( (rr-=48) < 0x00 ) rr = 0x00;
- if( (gg-=48) < 0x00 ) gg = 0x00;
- if( (bb-=48) < 0x00 ) bb = 0x00;
- break;
- }
- while( dp < ep ) {
- int yy = (dp-bp) / bpl, xx = ((dp-bp) % bpl) >> 2;
- int dy = cy - yy, dx = cx - xx;
- double s = dx*dx + dy*dy - cc;
- double ss = s < 0 ? 1 : s >= cc ? 0 : 1 - s/cc;
- int aa = ss * 0xff;
- *dp++ = rr; *dp++ = gg; *dp++ = bb; *dp++ = aa;
- }
- }
- set_images(vframes);
-}
-
-void SketcherCurveColor::update_gui(int color)
+void SketcherCurveColor::handle_done_event(int result)
{
- set_color(color);
- draw_face();
-}
-
-int SketcherCurveColor::handle_event()
-{
- gui->start_color_thread(this);
- return 1;
-}
-
-SketcherCurveColorPicker::SketcherCurveColorPicker(SketcherWindow *gui, SketcherCurveColor *color_button)
- : ColorPicker(0, _("Color"))
-{
- this->gui = gui;
- this->color_button = color_button;
- this->color = 0;
- color_update = new SketcherCurveColorThread(this);
-}
-
-SketcherCurveColorPicker::~SketcherCurveColorPicker()
-{
- delete color_update;
-}
-
-void SketcherCurveColorPicker::start(int color)
-{
- start_window(color, 0, 1);
- color_update->start();
-}
-
-void SketcherCurveColorPicker::handle_done_event(int result)
-{
- color_update->stop();
- gui->lock_window("SketcherCurveColorPicker::handle_done_event");
- if( result ) color = orig_color;
- color_button->update_gui(color);
- gui->unlock_window();
+ if( result ) color = orig_color | (~orig_alpha<<24);
SketcherConfig &config = gui->plugin->config;
int ci = config.cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
cv->color = color;
+ gui->lock_window("SketcherCurveColor::handle_done_event");
gui->curve_list->update(ci);
+ gui->unlock_window();
gui->send_configure_change();
}
}
-int SketcherCurveColorPicker::handle_new_color(int color, int alpha)
-{
- this->color = color;
- color_update->update_lock->unlock();
- return 1;
-}
-
-void SketcherCurveColorPicker::update_gui()
+int SketcherCurveColor::handle_new_color(int color, int alpha)
{
- gui->lock_window("SketcherCurveColorPicker::update_gui");
- color_button->update_gui(color);
+ color |= ~alpha<<24; this->color = color;
+ gui->lock_window("SketcherCurveColor::update_gui");
+ update_gui(color);
SketcherConfig &config = gui->plugin->config;
int ci = config.cv_selected;
if( ci >= 0 ) {
gui->send_configure_change();
}
gui->unlock_window();
+ return 1;
}
-SketcherCurveColorThread::SketcherCurveColorThread(SketcherCurveColorPicker *color_picker)
- : Thread(1, 0, 0)
-{
- this->color_picker = color_picker;
- this->update_lock = new Condition(0,"SketcherCurveColorThread::update_lock");
- done = 1;
-}
-
-SketcherCurveColorThread::~SketcherCurveColorThread()
-{
- stop();
- delete update_lock;
-}
-
-void SketcherCurveColorThread::start()
-{
- if( done ) {
- done = 0;
- Thread::start();
- }
-}
-void SketcherCurveColorThread::stop()
+SketcherCoord::SketcherCoord(SketcherWindow *gui, int x, int y,
+ coord output, coord mn, coord mx)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, 64, 1)
{
- if( !done ) {
- done = 1;
- update_lock->unlock();
- join();
- }
+ this->gui = gui;
+ set_increment(1);
}
-
-void SketcherCurveColorThread::run()
+SketcherCoord::~SketcherCoord()
{
- while( !done ) {
- update_lock->lock("SketcherCurveColorThread::run");
- if( done ) break;
- color_picker->update_gui();
- }
}
-
-SketcherNum::SketcherNum(SketcherWindow *gui, int x, int y, int output,
- int mn, int mx)
- : BC_TumbleTextBox(gui, output, mn, mx, x, y, 64)
+SketcherNum::SketcherNum(SketcherWindow *gui, int x, int y,
+ int output, int mn, int mx)
+ : BC_TumbleTextBox(gui, output, mn, mx, x, y, 54)
{
this->gui = gui;
set_increment(1);
}
-
SketcherNum::~SketcherNum()
{
}
int SketcherPointX::handle_event()
{
- if( !SketcherNum::handle_event() ) return 0;
+ if( !SketcherCoord::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
int ci = config.cv_selected;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
SketcherPointList *point_list = gui->point_list;
- int hot_point = point_list->get_selection_number(0, 0);
+ int pi = config.pt_selected;
SketcherPoints &points = cv->points;
- if( hot_point >= 0 && hot_point < points.size() ) {
- int v = atoi(get_text());
- points[hot_point]->x = v;
- point_list->set_point(hot_point, PT_X, v);
- point_list->update_list(hot_point);
+ if( pi >= 0 && pi < points.size() ) {
+ coord v = atof(get_text());
+ points[pi]->x = v;
+ point_list->set_point(pi, PT_X, v);
+ point_list->update_list(pi);
gui->send_configure_change();
}
}
return 1;
}
int SketcherPointY::handle_event()
+{
+ if( !SketcherCoord::handle_event() ) return 0;
+ SketcherConfig &config = gui->plugin->config;
+ int ci = config.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;
+ SketcherPoints &points = cv->points;
+ if( pi >= 0 && pi < points.size() ) {
+ coord v = atof(get_text());
+ points[pi]->y = v;
+ point_list->set_point(pi, PT_Y, v);
+ point_list->update_list(pi);
+ gui->send_configure_change();
+ }
+ }
+ return 1;
+}
+
+int SketcherPointId::handle_event()
{
if( !SketcherNum::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
SketcherPointList *point_list = gui->point_list;
- int hot_point = point_list->get_selection_number(0, 0);
+ int pi = config.pt_selected;
SketcherPoints &points = cv->points;
- if( hot_point >= 0 && hot_point < points.size() ) {
- int v = atoi(get_text());
- points[hot_point]->y = v;
- point_list->set_point(hot_point, PT_Y, v);
- point_list->update_list(hot_point);
+ if( pi >= 0 && pi < points.size() ) {
+ int id = atoi(get_text());
+ points[pi]->id = id;
+ point_list->set_point(pi, PT_ID, id);
+ point_list->update_list(pi);
gui->send_configure_change();
}
}
return 1;
}
-int SketcherCurveRadius::handle_event()
+SketcherCurveWidth::SketcherCurveWidth(SketcherWindow *gui, int x, int y, int width)
+ : SketcherNum(gui, x, y, width, 0, 255)
+{
+ this->width = width;
+}
+SketcherCurveWidth::~SketcherCurveWidth()
+{
+}
+
+int SketcherCurveWidth::handle_event()
{
if( !SketcherNum::handle_event() ) return 0;
SketcherConfig &config = gui->plugin->config;
if( ci >= 0 && ci < config.curves.size() ) {
SketcherCurve *cv = config.curves[ci];
int v = atoi(get_text());
- cv->radius = v;
+ cv->width = v;
gui->curve_list->update(ci);
gui->send_configure_change();
}
return 1;
}
+void SketcherCurveWidth::update(int width)
+{
+ SketcherNum::update(this->width=width);
+}
+
SketcherWindow::SketcherWindow(Sketcher *plugin)
- : PluginClientWindow(plugin, 380, 580, 380, 580, 0)
+ : PluginClientWindow(plugin, 380, 620, 380, 620, 0)
{
this->plugin = plugin;
- this->title_type = 0; this->curve_type = 0;
this->title_pen = 0; this->curve_pen = 0;
this->title_color = 0; this->curve_color = 0;
- this->color_picker = 0; this->new_points = 0;
+ this->drag = 0;
this->new_curve = 0; this->del_curve = 0;
this->curve_up = 0; this->curve_dn = 0;
this->title_x = 0; this->point_x = 0;
this->title_y = 0; this->point_y = 0;
+ this->title_id = 0; this->point_id = 0;
this->new_point = 0; this->del_point = 0;
this->point_up = 0; this->point_dn = 0;
- this->drag = 0; this->dragging = 0;
- this->last_x = 0; this->last_y = 0;
- this->point_list = 0; this->pending_config = 0;
+ this->point_list = 0; this->notes0 = 0;
+ this->notes1 = 0; this->notes2 = 0;
+
+ position = -1;
+ track_w = track_h -1;
+ cursor_x = cursor_y = -1;
+ output_x = output_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;
}
SketcherWindow::~SketcherWindow()
{
- delete curve_radius;
+ delete curve_width;
delete point_x;
delete point_y;
- delete color_picker;
}
void SketcherWindow::create_objects()
{
- int x = 10, y = 10, x1, y1;
+ int x = 10, y = 10, dy = 0, x1, y1;
int margin = plugin->get_theme()->widget_border;
BC_Title *title;
int ci = plugin->config.cv_selected;
if( ci < 0 || ci >= plugin->config.curves.size() )
- ci = plugin->new_curve(0, 1, 0, BLACK);
+ ci = plugin->new_curve();
SketcherCurve *cv = plugin->config.curves[ci];
- add_subwindow(reset_curves = new SketcherResetCurves(this, plugin, x1=x, y+3));
+
+ reset_curves = new SketcherResetCurves(this, plugin, x1=x, y+3);
+ 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(title_radius = new BC_Title(x1, y, _("Width:")));
- x1 += title_radius->get_w() + margin;
- curve_radius = new SketcherCurveRadius(this, x1, y, cv->radius);
- curve_radius->create_objects();
- y += reset_curves->get_h() + 2*margin;
+ title_width = new BC_Title(x1, y, _("Width:"));
+ add_subwindow(title_width); dy = bmax(dy,title_width->get_h());
+ x1 += title_width->get_w() + margin;
+ curve_width = new SketcherCurveWidth(this, x1, y, cv->width);
+ curve_width->create_objects();
+ y += dy + 2*margin; dy = 0;
+
x1 = get_w()-x - BC_Title::calculate_w(this, curve_text, LARGEFONT);
y1 = y-margin - BC_Title::calculate_h(this, curve_text, LARGEFONT);
- add_subwindow(title = new BC_Title(x1, y1, curve_text, LARGEFONT,
- get_resources()->menu_highlighted_fontcolor));
- add_subwindow(curve_list = new SketcherCurveList(this, plugin, x, y));
- y += curve_list->get_h() + margin;
- add_subwindow(title_type = new BC_Title(x, y, _("Type:")));
- x1 = x + title_type->get_w() + margin;
- add_subwindow(curve_type = new SketcherCurveType(this, x1, y, cv->ty));
- curve_type->create_objects();
- x1 += curve_type->get_w() + margin;
- add_subwindow(new_curve = new SketcherNewCurve(this, plugin, x1, y));
+ title = new BC_Title(x1, y1, curve_text, LARGEFONT,
+ get_resources()->menu_highlighted_fontcolor);
+ add_subwindow(title); dy = bmax(dy,title->get_h());
+ curve_list = new SketcherCurveList(this, plugin, x, y);
+ add_subwindow(curve_list); dy = bmax(dy,curve_list->get_h());
+ y += dy + margin; dy = 0;
+
+ new_curve = new SketcherNewCurve(this, plugin, x1=x, y);
+ add_subwindow(new_curve); dy = bmax(dy,new_curve->get_h());
x1 += new_curve->get_w() + margin;
- add_subwindow(curve_up = new SketcherCurveUp(this, x1, y));
- x1 += curve_up->get_w() + 2*margin;
- add_subwindow(title_color = new BC_Title(x1, y, _("Color:")));
- y += curve_type->get_h() + margin;
-
- add_subwindow(title_pen = new BC_Title(x, y, _("Pen:")));
- x1 = x + title_pen->get_w() + margin;
- add_subwindow(curve_pen = new SketcherCurvePen(this, x1, y, cv->pen));
- curve_pen->create_objects();
- x1 += curve_pen->get_w() + margin;
- add_subwindow(del_curve = new SketcherDelCurve(this, plugin, x1, y));
+ curve_up = new SketcherCurveUp(this, x1, y);
+ 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:"));
+ add_subwindow(title_pen); dy = bmax(dy,title_pen->get_h());
+ int x2 = (get_w()+x1)/2 + 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());
+ y += dy + margin; dy = 0;
+
+ del_curve = new SketcherDelCurve(this, plugin, x1=x, y);
+ add_subwindow(del_curve); dy = bmax(dy,del_curve->get_h());
x1 += del_curve->get_w() + margin;
- add_subwindow(curve_dn = new SketcherCurveDn(this, x1, y));
- x1 += curve_dn->get_w() + 2*margin;
- add_subwindow(curve_color = new SketcherCurveColor(this, x1, y, COLOR_W));
- curve_color->create_objects();
- curve_color->set_color(cv->color);
- curve_color->draw_face();
- y += COLOR_H + margin;
+ curve_dn = new SketcherCurveDn(this, x1, y);
+ add_subwindow(curve_dn); dy = bmax(dy,curve_dn->get_h());
+ x1 += curve_dn->get_w() + 4*margin;
+ curve_pen = new SketcherCurvePen(this, x1, y, cv->pen);
+ add_subwindow(curve_pen); dy = bmax(dy,curve_pen->get_h());
+ curve_pen->create_objects();
+ curve_color = new SketcherCurveColor(this, x2, y, COLOR_W, COLOR_H,
+ cv->color&0xffffff, (~cv->color>>24)&0xff);
+ add_subwindow(curve_color); dy = bmax(dy,curve_color->get_h());
+ y += dy + margin; dy = 0;
curve_list->update(ci);
BC_Bar *bar;
- add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
- y += bar->get_h() + 2*margin;
+ bar = new BC_Bar(x, y, get_w()-2*x);
+ add_subwindow(bar); dy = bmax(dy,bar->get_h());
+ bar = new BC_Bar(x, y+=dy, get_w()-2*x);
+ add_subwindow(bar); dy = bmax(dy,bar->get_h());
+ y += dy + 2*margin;
int pi = plugin->config.pt_selected;
SketcherPoint *pt = pi >= 0 && pi < cv->points.size() ? cv->points[pi] : 0;
- add_subwindow(reset_points = new SketcherResetPoints(this, plugin, x1=x, y+3));
- x1 += reset_points->get_w() + 2*margin;
- add_subwindow(drag = new SketcherDrag(this, x1, y));
- y += drag->get_h() + margin;
+ reset_points = new SketcherResetPoints(this, plugin, x1=x, y+3);
+ add_subwindow(reset_points); dy = bmax(dy,reset_points->get_h());
+ x1 += reset_points->get_w() + 2*margin;
if( plugin->config.drag ) {
- if( !grab(plugin->server->mwindow->cwindow->gui) )
+ if( !grab(plugin->server->mwindow->cwindow->gui) ) {
eprintf("drag enabled, but compositor already grabbed\n");
+ plugin->config.drag = 0;
+ }
}
+ drag = new SketcherDrag(this, x1, y);
+ add_subwindow(drag); dy = bmax(dy,drag->get_h());
+ x1 += drag->get_w() + 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());
+ point_type->create_objects();
+ y += dy + margin; dy = 0;
+
const char *point_text = _("Point");
x1 = get_w()-x - BC_Title::calculate_w(this, point_text, LARGEFONT);
y1 = y-margin - BC_Title::calculate_h(this, point_text, LARGEFONT);
add_subwindow(title = new BC_Title(x1, y1, point_text, LARGEFONT,
get_resources()->menu_highlighted_fontcolor));
- add_subwindow(point_list = new SketcherPointList(this, plugin, x, y));
+ point_list = new SketcherPointList(this, plugin, x, y);
+ add_subwindow(point_list); dy = bmax(dy,point_list->get_h());
+ y += dy + margin; dy = 0;
- y += point_list->get_h() + margin;
- add_subwindow(title_x = new BC_Title(x, y, _("X:")));
- x1 = x + title_x->get_w() + margin;
- point_x = new SketcherPointX(this, x1, y, !pt ? 0.f : pt->x);
- point_x->create_objects();
- x1 += point_x->get_w() + 2*margin;
- add_subwindow(new_point = new SketcherNewPoint(this, plugin, x1, y));
+ new_point = new SketcherNewPoint(this, plugin, x1=x, y);
+ add_subwindow(new_point); dy = bmax(dy,new_point->get_h());
x1 += new_point->get_w() + margin;
- add_subwindow(point_up = new SketcherPointUp(this, x1, y));
- y += point_x->get_h() + margin;
- add_subwindow(title_y = new BC_Title(x, y, _("Y:")));
- x1 = x + title_y->get_w() + margin;
- point_y = new SketcherPointY(this, x1, y, !pt ? 0.f : pt->y);
- point_y->create_objects();
- x1 += point_y->get_w() + 2*margin;
- add_subwindow(del_point = new SketcherDelPoint(this, plugin, x1, y));
+ 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;
+ 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;
+ y1 = BC_Title::calculate_h(this, _("ID:"));
+ title_id = new BC_Title(x2+16, y+dy-y1, _("ID:"));
+ add_subwindow(title_id); dy = bmax(dy, title_id->get_h());
+ y += dy + margin; dy = 0;
+
+ del_point = new SketcherDelPoint(this, plugin, x1=x, y);
+ add_subwindow(del_point); dy = bmax(dy,del_point->get_h());
x1 += del_point->get_w() + margin;
- add_subwindow(point_dn = new SketcherPointDn(this, x1, y));
- y += point_y->get_h() + margin + 10;
+ 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;
+ 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 = new SketcherPointY(this, x1, y, !pt ? 0.f : pt->y);
+ 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;
point_list->update(pi);
+ bar = new BC_Bar(x, y, get_w()-2*x);
+ add_subwindow(bar); dy = bmax(dy,bar->get_h());
+ y += dy + 2*margin;
+
add_subwindow(notes0 = new BC_Title(x, y,
_("\n"
- "LMB=\n"
- "Alt+LMB=\n"
- "MMB=\n"
- "DEL=\n")));
- add_subwindow(notes1 = new BC_Title(x+80, y,
- _(" No Shift\n"
+ "Shift=\n"
+ "None=\n"
+ "Ctrl=\n"
+ "Alt=\n"
+ "Ctrl+Shift="))); dy = bmax(dy, notes0->get_h());
+ add_subwindow(notes1 = new BC_Title(x+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,
+ _(" RMB\n"
+ "new arc point\n"
+ "select curve\n"
"drag curve\n"
- "next curve type\n"
- "deletes point\n")));
- add_subwindow(notes2 = new BC_Title(x+200, y,
- _(" Shift\n"
- "append new points\n"
- "drag image\n"
- "append new curve\n"
- "delete curve\n")));
+ "new curve\n"
+ "new off point"))); dy = bmax(dy, notes2->get_h());
+ y += dy + margin + 10;
+
+ add_subwindow(notes3 = new BC_Title(x, y,
+ "Key DEL= delete point, +Shift= delete curve\n"));
show_window(1);
}
+void SketcherWindow::done_event(int result)
+{
+}
+
void SketcherWindow::send_configure_change()
{
pending_config = 0;
plugin->send_configure_change();
}
+
int SketcherWindow::grab_event(XEvent *event)
{
int ret = do_grab_event(event);
- if( pending_config && !grab_event_count() )
- send_configure_change();
+ if( !grab_event_count() ) {
+ if( grab_cursor_motion() )
+ pending_config = 1;
+ if( pending_config ) {
+ last_x = output_x; last_y = output_y;
+ send_configure_change();
+ }
+ }
return ret;
}
if( keysym_lookup(event) > 0 ) {
switch( get_keysym() ) {
case XK_Delete:
+ pending_config = 1;
return (event->xkey.state & ShiftMask) ?
del_curve->handle_event() :
del_point->handle_event() ;
switch( event->type ) {
case ButtonPress:
if( dragging ) return 0;
- dragging = event->xbutton.state & Mod1Mask ? -1 : 1; // alt_down
+ dragging = 1;
break;
case ButtonRelease:
- case MotionNotify:
- if( !dragging ) return 0;
+ dragging = 0;
break;
- default:
+ case MotionNotify:
+ if( dragging ) break;
+ default: // fall thru
return 0;
}
-
- int ci = plugin->config.cv_selected;
- if( ci < 0 || ci >= plugin->config.curves.size() )
- return 1;
-
- float cursor_x = cx, cursor_y = cy;
+ cursor_x = cx, cursor_y = cy;
canvas->canvas_to_output(mwindow->edl, 0, cursor_x, cursor_y);
- int64_t position = plugin->get_source_position();
- float projector_x, projector_y, projector_z;
+ position = plugin->get_source_position();
Track *track = plugin->server->plugin->track;
- int track_w = track->track_w, track_h = track->track_h;
+ 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;
- float output_x = (cursor_x - projector_x) / projector_z + track_w / 2;
- float output_y = (cursor_y - projector_y) / projector_z + track_h / 2;
- SketcherCurve *cv = plugin->config.curves[ci];
- SketcherPoints &points = cv->points;
- int state = event->xmotion.state;
+ output_x = (cursor_x - projector_x) / projector_z + track_w / 2;
+ output_y = (cursor_y - projector_y) / projector_z + track_h / 2;
+ state = event->xmotion.state;
+
+ if( event->type == MotionNotify ) {
+ memcpy(&motion_event, event, sizeof(motion_event));
+ pending_motion = 1;
+ return 1;
+ }
+ if( grab_cursor_motion() )
+ pending_config = 1;
switch( event->type ) {
- case ButtonPress: {
- if( dragging < 0 ) break;
- int hot_point = -1;
- int button_no = event->xbutton.button;
- if( button_no == LEFT_BUTTON ) {
-// create new point string
- if( (state & ShiftMask) ) {
- ++new_points;
- hot_point = plugin->new_point(cv, output_x, output_y);
- point_list->update(hot_point);
- }
- else {
-// select point
- int sz = points.size();
- int last_point = hot_point;
- if( sz > 0 ) {
- SketcherPoint *pt = points[hot_point=0];
- double dist = DISTANCE(output_x,output_y, pt->x,pt->y);
- for( int i=1; i<sz; ++i ) {
- pt = points[i];
- double d = DISTANCE(output_x,output_y, pt->x,pt->y);
- if( d >= dist ) continue;
- dist = d; hot_point = i;
- }
- pt = points[hot_point];
- float px = (pt->x - track_w / 2) * projector_z + projector_x;
- float py = (pt->y - track_h / 2) * projector_z + projector_y;
- dist = DISTANCE(px, py, cursor_x,cursor_y);
- if( dist >= HANDLE_W ) hot_point = -1;
- }
- if( hot_point != last_point ) {
- SketcherPoint *pt = 0;
- if( hot_point >= 0 && hot_point < sz ) {
- pt = points[hot_point];
- point_list->set_point(hot_point, PT_X, pt->x = output_x);
- point_list->set_point(hot_point, PT_Y, pt->y = output_y);
- }
- point_list->update_list(hot_point);
- point_x->update(pt ? pt->x : 0.f);
- point_y->update(pt ? pt->y : 0.f);
- }
- }
+ case ButtonPress:
+ pending_config = grab_button_press(event);
+ break;
+ case ButtonRelease:
+ new_points = 0;
+ break;
+ }
+
+ return 1;
+}
+
+int SketcherWindow::grab_button_press(XEvent *event)
+{
+ SketcherConfig &config = plugin->config;
+ int ci = config.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 button_no = event->xbutton.button;
+ switch( button_no ) {
+ 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);
+ point_list->update(pi);
+ break;
}
- else if( button_no == MIDDLE_BUTTON ) {
- if( (state & ShiftMask) ) {
- int ci = plugin->new_curve(cv->ty, cv->radius, cv->pen, cv->color);
- curve_list->update(ci);
- point_list->update(-1);
+ SketcherPoint *pt = 0; // select point
+ double dist = cv->nearest_point(pi, output_x,output_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; }
+ }
+ point_list->set_selected(pi);
+ break; }
+ case RIGHT_BUTTON: {
+ if( (state & ShiftMask) ) { // create new curve point
+ ++new_points;
+ pi = plugin->new_point(cv,
+ !(state & ControlMask) ? ARC_CURVE : ARC_OFF,
+ output_x, output_y, pi+1);
+ point_list->update(pi);
+ break;
+ }
+ if( (state & AltMask) ) { // create new curve
+ ci = plugin->new_curve(cv->pen, cv->width, curve_color->color);
+ curve_list->update(ci);
+ point_list->update(-1);
+ break;
+ }
+ SketcherPoint *pt = 0;
+ double dist = config.nearest_point(ci, pi, output_x,output_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; }
+ }
+ if( pt ) {
+ curve_list->update(ci);
+ point_list->update(pi);
+ }
+ break; }
+ }
+ return 1;
+}
+
+int SketcherWindow::grab_cursor_motion()
+{
+ if( !pending_motion )
+ return 0;
+ pending_motion = 0;
+ SketcherConfig &config = plugin->config;
+ int ci = config.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;
+
+ 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);
+ if( dist < get_w()*0.1 ) return 0; // tolerance w/10
}
- else {
- int ty = cv->ty + 1;
- if( ty >= TYP_SZ ) ty = 0;
- cv->ty = ty;
- curve_type->update(ty);
- curve_list->update(ci);
+ ++new_points;
+ int arc = (state & Button1Mask) ? ARC_LINE : ARC_CURVE;
+ pi = plugin->new_point(cv, arc, output_x, output_y, pi+1);
+ point_list->update(pi);
+ }
+ return 1;
+ }
+ if( (state & Button1Mask) ) {
+ if( (state & ControlMask) ) { // 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->update_list(pi);
+ point_x->update(pt->x);
+ point_y->update(pt->y);
}
+ return 1;
}
- break; }
- case MotionNotify: {
- int hot_point = point_list->get_selection_number(0, 0);
- if( dragging < 0 ) {
- SketcherCurves &curves = plugin->config.curves;
+ if( (state & AltMask) ) { // drag all curves
int dx = round(output_x - last_x);
int dy = round(output_y - last_y);
- int mnc = (state & ShiftMask) || ci<0 ? 0 : ci;
- int mxc = (state & ShiftMask) ? curves.size() : ci+1;
- for( int i=mnc; i<mxc; ++i ) {
+ for( int i=0; i<curves.size(); ++i ) {
SketcherCurve *crv = plugin->config.curves[i];
int pts = crv->points.size();
for( int k=0; k<pts; ++k ) {
pt->x += dx; pt->y += dy;
}
}
- SketcherPoint *pt = hot_point >= 0 && hot_point < points.size() ?
- points[hot_point] : 0;
+ SketcherPoint *pt = pi >= 0 && pi < points.size() ?
+ points[pi] : 0;
point_x->update(pt ? pt->x : 0.f);
point_y->update(pt ? pt->y : 0.f);
- point_list->update(hot_point);
- break;
+ point_id->update(pt ? pt->id : 0);
+ point_list->update(pi);
+ return 1;
}
- if( (state & Button1Mask) ) {
- SketcherPoint *pt = hot_point >= 0 && hot_point < points.size() ?
- points[hot_point] : 0;
- if( pt && pt->x == output_x && pt->y == output_y ) break;
- if( new_points ) {
- if( pt ) {
- float frac_w = DISTANCE(pt->x, pt->y, output_x, output_y) / get_w();
- if( frac_w < 0.01 ) break; // 1 percent w
- }
- if( (state & ShiftMask) ) {
- ++new_points;
- hot_point = plugin->new_point(cv, output_x, output_y);
- point_list->update(hot_point);
- }
- }
- else if( pt ) {
- point_list->set_point(hot_point, PT_X, pt->x = output_x);
- point_list->set_point(hot_point, PT_Y, pt->y = output_y);
- point_list->update_list(hot_point);
- point_x->update(pt->x);
- point_y->update(pt->y);
+ double dist = cv->nearest_point(pi, output_x,output_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);
+ for( int i=0; i<points.size(); ++i ) {
+ SketcherPoint *pt = points[i];
+ pt->x += dx; pt->y += dy;
}
+ SketcherPoint *pt = pi >= 0 && pi < points.size() ?
+ points[pi] : 0;
+ point_x->update(pt ? pt->x : 0.f);
+ point_y->update(pt ? pt->y : 0.f);
+ point_id->update(pt ? pt->id : 0);
+ point_list->update(pi);
+ return 1;
}
- break; }
- case ButtonRelease: {
- new_points = 0;
- dragging = 0;
- break; }
+ double dist = config.nearest_point(ci, pi, output_x,output_y);
+ if( dist >= 0 ) {
+ curve_list->update(ci);
+ point_list->update(pi);
+ }
+ return 1;
}
-
- last_x = output_x; last_y = output_y;
- pending_config = 1;
- return 1;
+ return 0;
}
int SketcherWindow::keypress_event()
return 0;
}
-void SketcherWindow::done_event(int result)
-{
- ungrab(client->server->mwindow->cwindow->gui);
-}
-
-void SketcherWindow::start_color_thread(SketcherCurveColor *color_button)
-{
- unlock_window();
- delete color_picker;
- color_picker = new SketcherCurveColorPicker(this, color_button);
- int color = BLACK, ci = plugin->config.cv_selected;
- if( ci >= 0 && ci < plugin->config.curves.size() ) {
- SketcherCurve *cv = plugin->config.curves[ci];
- color = cv->color;
- }
- color_picker->start(color);
- lock_window("SketcherWindow::start_color_thread");
-}
-
SketcherCurveList::SketcherCurveList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
: BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
{
this->gui = gui;
this->plugin = plugin;
- titles[CV_ID] = _("id"); widths[CV_ID] = 64;
- titles[CV_TY] = _("type"); widths[CV_TY] = 64;
- titles[CV_RAD] = _("radius"); widths[CV_RAD] = 64;
- titles[CV_PEN] = _("pen"); widths[CV_PEN] = 64;
- titles[CV_CLR] = _("color"); widths[CV_CLR] = 64;
+ 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;
}
SketcherCurveList::~SketcherCurveList()
{
int SketcherCurveList::column_resize_event()
{
for( int i=CV_SZ; --i>=0; )
- widths[i] = get_column_width(i);
+ col_widths[i] = get_column_width(i);
return 1;
}
int ci = -1;
if( k >= 0 && k < plugin->config.curves.size() ) {
SketcherCurve *cv = plugin->config.curves[k];
- gui->curve_type->update(cv->ty);
- gui->curve_radius->update(cv->radius);
+ gui->curve_width->update(cv->width);
gui->curve_pen->update(cv->pen);
gui->curve_color->update_gui(cv->color);
ci = k;
}
plugin->config.cv_selected = ci;
- update_selection(&cols[0], ci);
- update_list(-1);
+ update_list(ci);
}
void SketcherCurveList::update_list(int k)
{
int xpos = get_xposition(), ypos = get_yposition();
- if( k < 0 ) k = get_selection_number(0, 0);
- update_selection(&cols[0], k);
- BC_ListBox::update(&cols[0], &titles[0],&widths[0],CV_SZ, xpos,ypos,k);
+ if( k >= 0 ) update_selection(&cols[0], k);
+ BC_ListBox::update(&cols[0], &col_titles[0],&col_widths[0],CV_SZ, xpos,ypos,k);
center_selection();
}
for( int i=0; i<sz; ++i ) {
SketcherCurve *cv = curves[i];
char itxt[BCSTRLEN]; sprintf(itxt,"%d", cv->id);
- char ttxt[BCSTRLEN]; sprintf(ttxt,"%s", cv_type[cv->ty]);
- char rtxt[BCSTRLEN]; sprintf(rtxt,"%d", cv->radius);
char ptxt[BCSTRLEN]; sprintf(ptxt,"%s", cv_pen[cv->pen]);
+ char rtxt[BCSTRLEN]; sprintf(rtxt,"%d", cv->width);
int color = cv->color;
- int r = (color>>16)&0xff, g = (color>>8)&0xff, b = (color>>0)&0xff;
+ int r = (color>>16)&0xff;
+ int g = (color>> 8)&0xff;
+ int b = (color>> 0)&0xff;
+ int a = (~color>>24)&0xff;
char ctxt[BCSTRLEN]; sprintf(ctxt,"#%02x%02x%02x", r, g, b);
- add_curve(itxt, ttxt, rtxt, ptxt, ctxt);
+ char atxt[BCSTRLEN]; sprintf(atxt,"%5.3f", a/255.);
+ add_curve(itxt, ptxt, rtxt, ctxt, atxt);
}
set_selected(k);
}
-void SketcherCurveList::add_curve(const char *id, const char *type,
- const char *radius, const char *pen, const char *color)
+void SketcherCurveList::add_curve(const char *id, const char *pen,
+ const char *width, const char *color, const char *alpha)
{
cols[CV_ID].append(new BC_ListBoxItem(id));
- cols[CV_TY].append(new BC_ListBoxItem(type));
- cols[CV_RAD].append(new BC_ListBoxItem(radius));
+ cols[CV_RAD].append(new BC_ListBoxItem(width));
cols[CV_PEN].append(new BC_ListBoxItem(pen));
cols[CV_CLR].append(new BC_ListBoxItem(color));
+ cols[CV_ALP].append(new BC_ListBoxItem(alpha));
}
SketcherNewCurve::SketcherNewCurve(SketcherWindow *gui, Sketcher *plugin, int x, int y)
}
int SketcherNewCurve::handle_event()
{
- int ty = 1, pen = 0, color = 0, radius = 1;
+ int pen = gui->curve_pen->pen;
+ int color = gui->curve_color->color;
+ int width = gui->curve_width->width;
int ci = plugin->config.cv_selected;
if( ci >= 0 && ci < plugin->config.curves.size() ) {
SketcherCurve *cv = plugin->config.curves[ci];
- ty = cv->ty; pen = cv->pen;
- color = cv->color; radius = cv->radius;
+ pen = cv->pen; width = cv->width; color = cv->color;
}
- int k = plugin->new_curve(ty, radius, pen, color);
- gui->curve_list->update(k);
+ ci = plugin->new_curve(pen, width, color);
+ gui->curve_list->update(ci);
gui->point_list->update(-1);
gui->send_configure_change();
return 1;
}
int SketcherDelCurve::handle_event()
{
- int hot_curve = gui->curve_list->get_selection_number(0, 0);
- SketcherCurves &curves = plugin->config.curves;
- if( hot_curve >= 0 && hot_curve < curves.size() ) {
- curves.remove_object_number(hot_curve);
- if( --hot_curve < 0 )
- hot_curve = plugin->new_curve(0, 1, 0, BLACK);
- gui->curve_list->update(hot_curve);
+ SketcherConfig &config = plugin->config;
+ int ci = config.cv_selected;
+ SketcherCurves &curves = config.curves;
+ if( ci >= 0 && ci < curves.size() ) {
+ curves.remove_object_number(ci--);
+ if( ci < 0 ) ci = 0;
+ if( !curves.size() )
+ ci = plugin->new_curve();
+ gui->curve_list->update(ci);
gui->point_list->update(-1);
gui->send_configure_change();
}
int SketcherCurveUp::handle_event()
{
- SketcherCurves &curves = gui->plugin->config.curves;
- int hot_curve = gui->curve_list->get_selection_number(0, 0);
-
- if( hot_curve > 0 && hot_curve < curves.size() ) {
- SketcherCurve *&cv0 = curves[hot_curve];
- SketcherCurve *&cv1 = curves[--hot_curve];
+ SketcherConfig &config = gui->plugin->config;
+ int ci = config.cv_selected;
+ SketcherCurves &curves = config.curves;
+ if( ci > 0 && ci < curves.size() ) {
+ SketcherCurve *&cv0 = curves[ci];
+ SketcherCurve *&cv1 = curves[--ci];
SketcherCurve *t = cv0; cv0 = cv1; cv1 = t;
- gui->curve_list->update(hot_curve);
+ gui->curve_list->update(ci);
}
gui->send_configure_change();
return 1;
int SketcherCurveDn::handle_event()
{
- SketcherCurves &curves = gui->plugin->config.curves;
- int hot_curve = gui->curve_list->get_selection_number(0, 0);
-
- if( hot_curve >= 0 && hot_curve < curves.size()-1 ) {
- SketcherCurve *&cv0 = curves[hot_curve];
- SketcherCurve *&cv1 = curves[++hot_curve];
+ SketcherConfig &config = gui->plugin->config;
+ int ci = config.cv_selected;
+ SketcherCurves &curves = config.curves;
+ if( ci >= 0 && ci < curves.size()-1 ) {
+ SketcherCurve *&cv0 = curves[ci];
+ SketcherCurve *&cv1 = curves[++ci];
SketcherCurve *t = cv0; cv0 = cv1; cv1 = t;
- gui->curve_list->update(hot_curve);
+ gui->curve_list->update(ci);
+ }
+ gui->send_configure_change();
+ return 1;
+}
+
+
+SketcherPointTypeItem::SketcherPointTypeItem(int arc)
+ : BC_MenuItem(_(pt_type[arc]))
+{
+ this->arc = arc;
+}
+int SketcherPointTypeItem::handle_event()
+{
+ SketcherPointType *popup = (SketcherPointType*)get_popup_menu();
+ popup->update(arc);
+ SketcherWindow *gui = popup->gui;
+ SketcherConfig &config = gui->plugin->config;
+ SketcherCurves &curves = config.curves;
+ int ci = config.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 )
+ selected.append(v);
+
+ for( int i=selected.size(); --i>=0; ) {
+ int k = selected[i];
+ if( k < 0 || k >= points.size() ) continue;
+ SketcherPoint *pt = cv->points[k];
+ pt->arc = arc;
+ gui->point_list->set_point(k, PT_TY, _(pt_type[arc]));
}
+
+ 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,64,_(pt_type[arc]))
+{
+ this->gui = gui;
+ this->type = arc;
+}
+void SketcherPointType::create_objects()
+{
+ for( int arc=0; arc<PT_SZ; ++arc )
+ add_item(new SketcherPointTypeItem(arc));
+}
+void SketcherPointType::update(int arc)
+{
+ set_text(_(pt_type[this->type=arc]));
+}
+
SketcherPointList::SketcherPointList(SketcherWindow *gui, Sketcher *plugin, int x, int y)
: BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
{
this->gui = gui;
this->plugin = plugin;
- titles[PT_X] = _("X"); widths[PT_X] = 90;
- titles[PT_Y] = _("Y"); widths[PT_Y] = 90;
- titles[PT_ID] = _("ID"); widths[PT_ID] = 50;
+ 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;
+ set_selection_mode(LISTBOX_MULTIPLE);
}
SketcherPointList::~SketcherPointList()
{
int SketcherPointList::column_resize_event()
{
for( int i=PT_SZ; --i>=0; )
- widths[i] = get_column_width(i);
+ col_widths[i] = get_column_width(i);
return 1;
}
int SketcherPointList::handle_event()
{
int pi = get_selection_number(0, 0);
+ if( get_selection_number(0, 1) >= 0 ) pi = -1;
set_selected(pi);
gui->send_configure_change();
return 1;
return 1;
}
-void SketcherPointList::add_point(const char *id, const char *xp, const char *yp)
+void SketcherPointList::add_point(const char *id, const char *ty, const char *xp, const char *yp)
{
cols[PT_ID].append(new BC_ListBoxItem(id));
+ cols[PT_TY].append(new BC_ListBoxItem(ty));
cols[PT_X].append(new BC_ListBoxItem(xp));
cols[PT_Y].append(new BC_ListBoxItem(yp));
}
sprintf(stxt,"%d",v);
set_point(i,c,stxt);
}
+void SketcherPointList::set_point(int i, int c, coord v)
+{
+ char stxt[BCSTRLEN];
+ sprintf(stxt,"%0.1f",v);
+ set_point(i,c,stxt);
+}
void SketcherPointList::set_point(int i, int c, const char *cp)
{
cols[c].get(i)->set_text(cp);
SketcherCurve *cv = plugin->config.curves[ci];
pt = k >= 0 && k < cv->points.size() ? cv->points[pi=k] : 0;
}
+ gui->point_type->update(pt ? pt->arc : ARC_OFF);
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;
- update_selection(&cols[0], pi);
- update_list(k);
+ update_list(pi);
}
void SketcherPointList::update_list(int k)
{
int xpos = get_xposition(), ypos = get_yposition();
- if( k < 0 ) k = get_selection_number(0, 0);
- update_selection(&cols[0], k);
- BC_ListBox::update(&cols[0], &titles[0],&widths[0],PT_SZ, xpos,ypos,k);
+ if( k >= 0 ) update_selection(&cols[0], k);
+ BC_ListBox::update(&cols[0], &col_titles[0],&col_widths[0],PT_SZ, xpos,ypos,k);
center_selection();
}
void SketcherPointList::update(int k)
for( int i=0; i<sz; ++i ) {
SketcherPoint *pt = points[i];
char itxt[BCSTRLEN]; sprintf(itxt,"%d", pt->id);
- char xtxt[BCSTRLEN]; sprintf(xtxt,"%d", pt->x);
- char ytxt[BCSTRLEN]; sprintf(ytxt,"%d", pt->y);
- add_point(itxt, xtxt, ytxt);
+ char ttxt[BCSTRLEN]; sprintf(ttxt,"%s", _(pt_type[pt->arc]));
+ char xtxt[BCSTRLEN]; sprintf(xtxt,"%0.1f", pt->x);
+ char ytxt[BCSTRLEN]; sprintf(ytxt,"%0.1f", pt->y);
+ add_point(itxt, ttxt, xtxt, ytxt);
}
}
set_selected(k);
curve_list->update(ci);
point_list->update(pi);
SketcherCurve *cv = ci >= 0 ? config.curves[ci] : 0;
- curve_radius->update(cv ? cv->radius : 1);
- curve_type->update(cv ? cv->ty : TYP_OFF);
+ curve_width->update(cv ? cv->width : 1);
curve_pen->update(cv ? cv->pen : PEN_SQUARE);
- curve_color->set_color(cv ? cv->color : BLACK);
+ curve_color->set_color(cv ? cv->color : CV_COLOR);
SketcherPoint *pt = pi >= 0 ? 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);
}
return 1;
SketcherCurve *cv = config.curves[ci];
SketcherPoints &points = cv->points;
- int sz = points.size();
- int hot_point = gui->point_list->get_selection_number(0, 0);
+ if( points.size() < 2 )
+ return 1;
+ int pi = config.pt_selected;
- if( sz > 1 && hot_point > 0 ) {
- SketcherPoint *&pt0 = points[hot_point];
- SketcherPoint *&pt1 = points[--hot_point];
+ ArrayList<int> selected;
+ for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
+ selected.append(v);
+
+ for( int i=0; i<selected.size(); ++i ) {
+ int k = selected[i];
+ if( k <= 0 ) continue;
+ if( k == pi ) --pi;
+ SketcherPoint *&pt0 = points[k];
+ SketcherPoint *&pt1 = points[--k];
SketcherPoint *t = pt0; pt0 = pt1; pt1 = t;
- gui->point_list->update(hot_point);
}
+ gui->point_list->update(pi);
gui->send_configure_change();
return 1;
}
return 1;
SketcherCurve *cv = config.curves[ci];
SketcherPoints &points = cv->points;
- int sz = points.size();
- int hot_point = gui->point_list->get_selection_number(0, 0);
- if( sz > 1 && hot_point < sz-1 ) {
- SketcherPoint *&pt0 = points[hot_point];
- SketcherPoint *&pt1 = points[++hot_point];
+ int sz1 = points.size()-1;
+ if( sz1 < 1 )
+ return 1;
+ int pi = config.pt_selected;
+
+ ArrayList<int> selected;
+ for( int v,i=0; (v=gui->point_list->get_selection_number(0, i))>=0; ++i )
+ selected.append(v);
+
+ for( int i=selected.size(); --i>=0; ) {
+ int k = selected[i];
+ if( k >= sz1 ) continue;
+ if( k == pi ) ++pi;
+ SketcherPoint *&pt0 = points[k];
+ SketcherPoint *&pt1 = points[++k];
SketcherPoint *t = pt0; pt0 = pt1; pt1 = t;
- gui->point_list->update(hot_point);
}
+ gui->point_list->update(pi);
gui->send_configure_change();
return 1;
}
}
int SketcherNewPoint::handle_event()
{
- int k = plugin->new_point();
+ int pi = plugin->config.pt_selected;
+ int arc = gui->point_type->type;
+ int k = plugin->new_point(pi+1, arc);
gui->point_list->update(k);
gui->send_configure_change();
return 1;
int SketcherDelPoint::handle_event()
{
SketcherConfig &config = gui->plugin->config;
+ SketcherCurves &curves = config.curves;
int ci = config.cv_selected;
- if( ci >= 0 && ci < config.curves.size() ) {
- SketcherCurve *cv = config.curves[ci];
- SketcherPoints &points = cv->points;
- int hot_point = gui->point_list->get_selection_number(0, 0);
- if( hot_point >= 0 && hot_point < points.size() ) {
- points.remove_object_number(hot_point);
- gui->point_list->update(--hot_point);
- gui->send_configure_change();
- }
+ 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 )
+ selected.append(v);
+
+ for( int i=selected.size(); --i>=0; ) {
+ int k = selected[i];
+ if( k < 0 || k >= points.size() ) continue;
+ points.remove_object_number(k);
+ if( k == pi && --pi < 0 && points.size() > 0 ) pi = 0;
}
+ gui->point_list->update(pi);
+ gui->send_configure_change();
return 1;
}
{
SketcherConfig &config = plugin->config;
config.curves.remove_all_objects();
- int ci = plugin->new_curve(0, 1, 0, BLACK);
+ int ci = plugin->new_curve();
gui->curve_list->update(ci);
gui->point_list->update(-1);
gui->send_configure_change();
projects / goodguy / cinelerra.git / blobdiff