index 4de36d0d7f40f3a233c3ef3218438de3f003a51c..c56ba7a4c197092d932ae979f8108b648530d833 100644 (file)
#include "svg/svg.h"
#include "display/canvas-bpath.h"
#include "display/bezier-utils.h"
-
+#include "display/curve.h"
#include <glib/gmem.h>
#include "macros.h"
#include "document.h"
#include "message-context.h"
#include "prefs-utils.h"
#include "pixmaps/cursor-calligraphy.xpm"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
#include "libnr/nr-matrix-ops.h"
#include "libnr/nr-scale-translate-ops.h"
+#include "libnr/nr-convert2geom.h"
#include "xml/repr.h"
#include "context-fns.h"
#include "sp-item.h"
#include "display/canvas-bpath.h"
#include "display/canvas-arena.h"
#include "livarot/Shape.h"
-#include "isnan.h"
+#include <2geom/isnan.h>
+#include <2geom/pathvector.h>
#include "dyna-draw-context.h"
#define DYNA_MIN_WIDTH 1.0e-6
-#define DRAG_MIN 0.0
-#define DRAG_DEFAULT 1.0
-#define DRAG_MAX 1.0
-
-// FIXME: move it to some shared file to be reused by both calligraphy and dropper
-#define C1 0.552
-static NArtBpath const hatch_area_circle[] = {
- { NR_MOVETO, 0, 0, 0, 0, -1, 0 },
- { NR_CURVETO, -1, C1, -C1, 1, 0, 1 },
- { NR_CURVETO, C1, 1, 1, C1, 1, 0 },
- { NR_CURVETO, 1, -C1, C1, -1, 0, -1 },
- { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 },
- { NR_END, 0, 0, 0, 0, 0, 0 }
-};
-#undef C1
-
-
static void sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass);
static void sp_dyna_draw_context_init(SPDynaDrawContext *ddc);
static void sp_dyna_draw_context_dispose(GObject *object);
static void clear_current(SPDynaDrawContext *dc);
static void set_to_accumulated(SPDynaDrawContext *dc, bool unionize);
-static void add_cap(SPCurve *curve, NR::Point const &pre, NR::Point const &from, NR::Point const &to, NR::Point const &post, double rounding);
-static void accumulate_calligraphic(SPDynaDrawContext *dc);
+static void add_cap(SPCurve *curve, NR::Point const &from, NR::Point const &to, double rounding);
+static bool accumulate_calligraphic(SPDynaDrawContext *dc);
static void fit_and_split(SPDynaDrawContext *ddc, gboolean release);
@@ -117,24 +100,25 @@ static NR::Point sp_dyna_draw_get_vpoint(SPDynaDrawContext const *ddc, NR::Point
static void draw_temporary_box(SPDynaDrawContext *dc);
-static SPEventContextClass *parent_class;
+static SPEventContextClass *dd_parent_class = 0;
-GtkType
-sp_dyna_draw_context_get_type(void)
+GType sp_dyna_draw_context_get_type(void)
{
static GType type = 0;
if (!type) {
GTypeInfo info = {
sizeof(SPDynaDrawContextClass),
- NULL, NULL,
- (GClassInitFunc) sp_dyna_draw_context_class_init,
- NULL, NULL,
+ 0, // base_init
+ 0, // base_finalize
+ (GClassInitFunc)sp_dyna_draw_context_class_init,
+ 0, // class_finalize
+ 0, // class_data
sizeof(SPDynaDrawContext),
- 4,
- (GInstanceInitFunc) sp_dyna_draw_context_init,
- NULL, /* value_table */
+ 0, // n_preallocs
+ (GInstanceInitFunc)sp_dyna_draw_context_init,
+ 0 // value_table
};
- type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPDynaDrawContext", &info, (GTypeFlags)0);
+ type = g_type_register_static(SP_TYPE_COMMON_CONTEXT, "SPDynaDrawContext", &info, static_cast<GTypeFlags>(0));
}
return type;
}
GObjectClass *object_class = (GObjectClass *) klass;
SPEventContextClass *event_context_class = (SPEventContextClass *) klass;
- parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass);
+ dd_parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass);
object_class->dispose = sp_dyna_draw_context_dispose;
static void
sp_dyna_draw_context_init(SPDynaDrawContext *ddc)
{
- SPEventContext *event_context = SP_EVENT_CONTEXT(ddc);
-
- event_context->cursor_shape = cursor_calligraphy_xpm;
- event_context->hot_x = 4;
- event_context->hot_y = 4;
-
- ddc->accumulated = NULL;
- ddc->segments = NULL;
- ddc->currentcurve = NULL;
- ddc->currentshape = NULL;
- ddc->npoints = 0;
- ddc->cal1 = NULL;
- ddc->cal2 = NULL;
- ddc->repr = NULL;
-
- /* DynaDraw values */
- ddc->cur = NR::Point(0,0);
- ddc->last = NR::Point(0,0);
- ddc->vel = NR::Point(0,0);
- ddc->vel_max = 0;
- ddc->acc = NR::Point(0,0);
- ddc->ang = NR::Point(0,0);
- ddc->del = NR::Point(0,0);
-
- /* attributes */
- ddc->dragging = FALSE;
-
- ddc->mass = 0.3;
- ddc->drag = DRAG_DEFAULT;
- ddc->angle = 30.0;
- ddc->width = 0.2;
- ddc->pressure = DDC_DEFAULT_PRESSURE;
+ ddc->cursor_shape = cursor_calligraphy_xpm;
+ ddc->hot_x = 4;
+ ddc->hot_y = 4;
ddc->vel_thin = 0.1;
ddc->flatness = 0.9;
ddc->hatch_area = NULL;
}
- if (ddc->accumulated) {
- ddc->accumulated = ddc->accumulated->unref();
- }
- while (ddc->segments) {
- gtk_object_destroy(GTK_OBJECT(ddc->segments->data));
- ddc->segments = g_slist_remove(ddc->segments, ddc->segments->data);
- }
-
- if (ddc->currentcurve) ddc->currentcurve = ddc->currentcurve->unref();
- if (ddc->cal1) ddc->cal1 = ddc->cal1->unref();
- if (ddc->cal2) ddc->cal2 = ddc->cal2->unref();
-
- if (ddc->currentshape) {
- gtk_object_destroy(GTK_OBJECT(ddc->currentshape));
- ddc->currentshape = NULL;
- }
-
- if (ddc->_message_context) {
- delete ddc->_message_context;
- }
-
- G_OBJECT_CLASS(parent_class)->dispose(object);
+ G_OBJECT_CLASS(dd_parent_class)->dispose(object);
ddc->hatch_pointer_past.~list();
ddc->hatch_nearest_past.~list();
{
SPDynaDrawContext *ddc = SP_DYNA_DRAW_CONTEXT(ec);
- if (((SPEventContextClass *) parent_class)->setup)
- ((SPEventContextClass *) parent_class)->setup(ec);
+ if (((SPEventContextClass *) dd_parent_class)->setup)
+ ((SPEventContextClass *) dd_parent_class)->setup(ec);
- ddc->accumulated = new SPCurve(32);
- ddc->currentcurve = new SPCurve(4);
+ ddc->accumulated = new SPCurve();
+ ddc->currentcurve = new SPCurve();
- ddc->cal1 = new SPCurve(32);
- ddc->cal2 = new SPCurve(32);
+ ddc->cal1 = new SPCurve();
+ ddc->cal2 = new SPCurve();
ddc->currentshape = sp_canvas_item_new(sp_desktop_sketch(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->currentshape), DDC_RED_RGBA, SP_WIND_RULE_EVENODD);
g_signal_connect(G_OBJECT(ddc->currentshape), "event", G_CALLBACK(sp_desktop_root_handler), ec->desktop);
{
- SPCurve *c = SPCurve::new_from_foreign_bpath(hatch_area_circle);
+ /* TODO: this can be done either with an arcto, and should maybe also be put in a general file (other tools use this as well) */
+ SPCurve *c = new SPCurve();
+ const double C1 = 0.552;
+ c->moveto(-1,0);
+ c->curveto(-1, C1, -C1, 1, 0, 1 );
+ c->curveto(C1, 1, 1, C1, 1, 0 );
+ c->curveto(1, -C1, C1, -1, 0, -1 );
+ c->curveto(-C1, -1, -1, -C1, -1, 0 );
+ c->closepath();
ddc->hatch_area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c);
c->unref();
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->hatch_area), 0x00000000,(SPWindRule)0);
@@ -307,39 +249,15 @@ sp_dyna_draw_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
{
SPDynaDrawContext *ddc = SP_DYNA_DRAW_CONTEXT(ec);
- if (!strcmp(key, "mass")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.2 );
- ddc->mass = CLAMP(dval, -1000.0, 1000.0);
- } else if (!strcmp(key, "wiggle")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : (1 - DRAG_DEFAULT));
- ddc->drag = CLAMP((1 - dval), DRAG_MIN, DRAG_MAX); // drag is inverse to wiggle
- } else if (!strcmp(key, "angle")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.0);
- ddc->angle = CLAMP (dval, -90, 90);
- } else if (!strcmp(key, "width")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.1 );
- ddc->width = CLAMP(dval, -1000.0, 1000.0);
- } else if (!strcmp(key, "thinning")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.1 );
- ddc->vel_thin = CLAMP(dval, -1.0, 1.0);
- } else if (!strcmp(key, "tremor")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.0 );
- ddc->tremor = CLAMP(dval, 0.0, 1.0);
- } else if (!strcmp(key, "flatness")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 1.0 );
- ddc->flatness = CLAMP(dval, 0, 1.0);
- } else if (!strcmp(key, "tracebackground")) {
+ if (!strcmp(key, "tracebackground")) {
ddc->trace_bg = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "usepressure")) {
- ddc->usepressure = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "usetilt")) {
- ddc->usetilt = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "abs_width")) {
- ddc->abs_width = (val && strcmp(val, "0"));
} else if (!strcmp(key, "keep_selected")) {
ddc->keep_selected = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "cap_rounding")) {
- ddc->cap_rounding = ( val ? g_ascii_strtod (val, NULL) : 0.0 );
+ } else {
+ //pass on up to parent class to handle common attributes.
+ if ( dd_parent_class->set ) {
+ dd_parent_class->set(ec, key, val);
+ }
}
//g_print("DDC: %g %g %g %g\n", ddc->mass, ddc->drag, ddc->angle, ddc->width);
pointer = motion_dt * motion_to_curve;
// calculate the nearest point on the guide path
- NR::Maybe<Path::cut_position> position = get_nearest_position_on_Path(dc->hatch_livarot_path, pointer);
+ boost::optional<Path::cut_position> position = get_nearest_position_on_Path(dc->hatch_livarot_path, pointer);
nearest = get_point_on_Path(dc->hatch_livarot_path, position->piece, position->t);
// so _gradually_ let go attraction to prevent jerks
target = (dc->hatch_spacing * speed + hatch_dist * (SPEED_NORMAL - speed))/SPEED_NORMAL;
}
- if (!isNaN(dot) && dot < -0.5) {// flip
+ if (!IS_NAN(dot) && dot < -0.5) {// flip
target = -target;
}
} else {
// Not drawing but spacing set: gray, center snapped, fixed radius
NR::Point c = (nearest + dc->hatch_spacing * hatch_unit_vector) * motion_to_curve.inverse();
- if (!isNaN(c[NR::X]) && !isNaN(c[NR::Y])) {
+ if (!IS_NAN(c[NR::X]) && !IS_NAN(c[NR::Y])) {
NR::Matrix const sm (NR::scale(dc->hatch_spacing, dc->hatch_spacing) * NR::translate(c));
sp_canvas_item_affine_absolute(dc->hatch_area, sm);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0x7f7f7fff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
/* Create object */
fit_and_split(dc, TRUE);
- accumulate_calligraphic(dc);
- set_to_accumulated(dc, event->button.state & GDK_SHIFT_MASK); // performs document_done
+ if (accumulate_calligraphic(dc))
+ set_to_accumulated(dc, event->button.state & GDK_SHIFT_MASK); // performs document_done
+ else
+ g_warning ("Failed to create path: invalid data in dc->cal1 or dc->cal2");
/* reset accumulated curve */
dc->accumulated->reset();
}
if (!ret) {
- if (((SPEventContextClass *) parent_class)->root_handler) {
- ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event);
+ if (((SPEventContextClass *) dd_parent_class)->root_handler) {
+ ret = ((SPEventContextClass *) dd_parent_class)->root_handler(event_context, event);
}
}
SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop;
if (!dc->accumulated->is_empty()) {
- NArtBpath *abp;
- gchar *str;
-
if (!dc->repr) {
/* Create object */
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
item->updateRepr();
}
- abp = nr_artpath_affine(dc->accumulated->first_bpath(), sp_desktop_dt2root_affine(desktop));
- str = sp_svg_write_path(abp);
+ Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2root_affine(desktop);
+ gchar *str = sp_svg_write_path(pathv);
g_assert( str != NULL );
- g_free(abp);
dc->repr->setAttribute("d", str);
g_free(str);
static void
add_cap(SPCurve *curve,
- NR::Point const &pre, NR::Point const &from,
- NR::Point const &to, NR::Point const &post,
+ NR::Point const &from,
+ NR::Point const &to,
double rounding)
{
- NR::Point vel = rounding * NR::rot90( to - from ) / sqrt(2.0);
- double mag = NR::L2(vel);
-
- NR::Point v_in = from - pre;
- double mag_in = NR::L2(v_in);
- if ( mag_in > DYNA_EPSILON ) {
- v_in = mag * v_in / mag_in;
- } else {
- v_in = NR::Point(0, 0);
- }
-
- NR::Point v_out = to - post;
- double mag_out = NR::L2(v_out);
- if ( mag_out > DYNA_EPSILON ) {
- v_out = mag * v_out / mag_out;
- } else {
- v_out = NR::Point(0, 0);
- }
+ if (NR::L2( to - from ) > DYNA_EPSILON) {
+ NR::Point vel = rounding * NR::rot90( to - from ) / sqrt(2.0);
+ double mag = NR::L2(vel);
- if ( NR::L2(v_in) > DYNA_EPSILON || NR::L2(v_out) > DYNA_EPSILON ) {
- curve->curveto(from + v_in, to + v_out, to);
+ NR::Point v = mag * NR::rot90( to - from ) / NR::L2( to - from );
+ curve->curveto(from + v, to + v, to);
}
}
-static void
+static bool
accumulate_calligraphic(SPDynaDrawContext *dc)
{
- if ( !dc->cal1->is_empty() && !dc->cal2->is_empty() ) {
- dc->accumulated->reset(); /* Is this required ?? */
- SPCurve *rev_cal2 = dc->cal2->reverse();
+ if (
+ dc->cal1->is_empty() ||
+ dc->cal2->is_empty() ||
+ (dc->cal1->get_segment_count() <= 0) ||
+ dc->cal1->first_path()->closed()
+ ) {
+ dc->cal1->reset();
+ dc->cal2->reset();
+ return false; // failure
+ }
- g_assert(dc->cal1->end > 1);
- g_assert(rev_cal2->end > 1);
- g_assert(SP_CURVE_SEGMENT(dc->cal1, 0)->code == NR_MOVETO_OPEN);
- g_assert(SP_CURVE_SEGMENT(rev_cal2, 0)->code == NR_MOVETO_OPEN);
- g_assert(SP_CURVE_SEGMENT(dc->cal1, 1)->code == NR_CURVETO);
- g_assert(SP_CURVE_SEGMENT(rev_cal2, 1)->code == NR_CURVETO);
- g_assert(SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->code == NR_CURVETO);
- g_assert(SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->code == NR_CURVETO);
+ SPCurve *rev_cal2 = dc->cal2->create_reverse();
+ if (
+ (rev_cal2->get_segment_count() <= 0) ||
+ rev_cal2->first_path()->closed()
+ ) {
+ rev_cal2->unref();
+ dc->cal1->reset();
+ dc->cal2->reset();
+ return false; // failure
+ }
- dc->accumulated->append(dc->cal1, FALSE);
+ Geom::CubicBezier const * dc_cal1_firstseg = dynamic_cast<Geom::CubicBezier const *>( dc->cal1->first_segment() );
+ Geom::CubicBezier const * rev_cal2_firstseg = dynamic_cast<Geom::CubicBezier const *>( rev_cal2->first_segment() );
+ Geom::CubicBezier const * dc_cal1_lastseg = dynamic_cast<Geom::CubicBezier const *>( dc->cal1->last_segment() );
+ Geom::CubicBezier const * rev_cal2_lastseg = dynamic_cast<Geom::CubicBezier const *>( rev_cal2->last_segment() );
+
+ if (
+ !dc_cal1_firstseg ||
+ !rev_cal2_firstseg ||
+ !dc_cal1_lastseg ||
+ !rev_cal2_lastseg
+ ) {
+ rev_cal2->unref();
+ dc->cal1->reset();
+ dc->cal2->reset();
+ return false; // failure
+ }
- add_cap(dc->accumulated, SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(2), SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(3), SP_CURVE_SEGMENT(rev_cal2, 0)->c(3), SP_CURVE_SEGMENT(rev_cal2, 1)->c(1), dc->cap_rounding);
+ dc->accumulated->reset(); /* Is this required ?? */
+
+ dc->accumulated->append(dc->cal1, false);
+
+ add_cap(dc->accumulated, (*dc_cal1_lastseg)[3], (*rev_cal2_firstseg)[0], dc->cap_rounding);
- dc->accumulated->append(rev_cal2, TRUE);
+ dc->accumulated->append(rev_cal2, true);
- add_cap(dc->accumulated, SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(2), SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(3), SP_CURVE_SEGMENT(dc->cal1, 0)->c(3), SP_CURVE_SEGMENT(dc->cal1, 1)->c(1), dc->cap_rounding);
+ add_cap(dc->accumulated, (*rev_cal2_lastseg)[3], (*dc_cal1_firstseg)[0], dc->cap_rounding);
dc->accumulated->closepath();
dc->cal1->reset();
dc->cal2->reset();
- }
+
+ return true; // success
}
static double square(double const x)
#endif
/* Current calligraphic */
- if ( dc->cal1->end == 0 || dc->cal2->end == 0 ) {
+ if ( dc->cal1->is_empty() || dc->cal2->is_empty() ) {
/* dc->npoints > 0 */
/* g_print("calligraphics(1|2) reset\n"); */
dc->cal1->reset();
dc->currentcurve->reset();
dc->currentcurve->moveto(b1[0]);
for (NR::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) {
- dc->currentcurve->curveto(bp1[1],
- bp1[2], bp1[3]);
+ dc->currentcurve->curveto(bp1[1], bp1[2], bp1[3]);
}
dc->currentcurve->lineto(b2[BEZIER_SIZE*(nb2-1) + 3]);
for (NR::Point *bp2 = b2 + BEZIER_SIZE * ( nb2 - 1 ); bp2 >= b2; bp2 -= BEZIER_SIZE) {
}
// FIXME: dc->segments is always NULL at this point??
if (!dc->segments) { // first segment
- add_cap(dc->currentcurve, b2[1], b2[0], b1[0], b1[1], dc->cap_rounding);
+ add_cap(dc->currentcurve, b2[0], b1[0], dc->cap_rounding);
}
dc->currentcurve->closepath();
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->currentshape), dc->currentcurve);
{
dc->currentcurve->reset();
- dc->currentcurve->moveto(dc->point1[dc->npoints-1]);
+ dc->currentcurve->moveto(dc->point2[dc->npoints-1]);
for (gint i = dc->npoints-2; i >= 0; i--) {
- dc->currentcurve->lineto(dc->point1[i]);
+ dc->currentcurve->lineto(dc->point2[i]);
}
for (gint i = 0; i < dc->npoints; i++) {
- dc->currentcurve->lineto(dc->point2[i]);
+ dc->currentcurve->lineto(dc->point1[i]);
}
+
if (dc->npoints >= 2) {
- add_cap(dc->currentcurve, dc->point2[dc->npoints-2], dc->point2[dc->npoints-1], dc->point1[dc->npoints-1], dc->point1[dc->npoints-2], dc->cap_rounding);
+ add_cap(dc->currentcurve, dc->point1[dc->npoints-1], dc->point2[dc->npoints-1], dc->cap_rounding);
}
dc->currentcurve->closepath();