![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 4e7c855caa692918656455759a5711d758fee474..c56ba7a4c197092d932ae979f8108b648530d833 100644 (file)
#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"
static void clear_current(SPDynaDrawContext *dc);
static void set_to_accumulated(SPDynaDrawContext *dc, bool unionize);
static void add_cap(SPCurve *curve, NR::Point const &from, NR::Point const &to, double rounding);
-static void accumulate_calligraphic(SPDynaDrawContext *dc);
+static bool accumulate_calligraphic(SPDynaDrawContext *dc);
static void fit_and_split(SPDynaDrawContext *ddc, gboolean release);
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);
}
// calculate pointer point in the guide item's coords
- motion_to_curve = from_2geom(sp_item_dt2i_affine(selected) * sp_item_i2doc_affine(selected));
+ motion_to_curve = sp_item_dt2i_affine(selected) * sp_item_i2doc_affine(selected);
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);
/* 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();
item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
item->updateRepr();
}
- Geom::PathVector pathv = dc->accumulated->get_pathvector() * to_2geom(sp_desktop_dt2root_affine(desktop));
+ Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2root_affine(desktop);
gchar *str = sp_svg_write_path(pathv);
g_assert( str != NULL );
dc->repr->setAttribute("d", str);
}
}
-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->create_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->get_segment_count() > 0);
- g_assert(rev_cal2->get_segment_count() > 0);
- g_assert( ! dc->cal1->first_path()->closed() );
- g_assert( ! rev_cal2->first_path()->closed() );
+ 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
+ }
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() );
- g_assert( dc_cal1_firstseg );
- g_assert( rev_cal2_firstseg );
- g_assert( dc_cal1_lastseg );
- g_assert( rev_cal2_lastseg );
+
+ 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
+ }
+
+ dc->accumulated->reset(); /* Is this required ?? */
dc->accumulated->append(dc->cal1, false);
- add_cap(dc->accumulated, (*dc_cal1_lastseg)[3], (*rev_cal2_firstseg)[3], dc->cap_rounding);
+ add_cap(dc->accumulated, (*dc_cal1_lastseg)[3], (*rev_cal2_firstseg)[0], dc->cap_rounding);
dc->accumulated->append(rev_cal2, true);
- add_cap(dc->accumulated, (*rev_cal2_lastseg)[3], (*dc_cal1_firstseg)[3], 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->get_length() == 0 || dc->cal2->get_length() == 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) {