![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index bcf5e92a01ac2004dcfd7d5d275623390a86625d..5a1e2abebcd7f2975f1581895a67391c636cb596 100644 (file)
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
#define __CURVE_C__
/** \file
- * Routines for SPCurve and for NArtBpath arrays in general.
+ * Routines for SPCurve and for its Geom::PathVector
*/
/*
- * Author:
+ * Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
+ * Johan Engelen
*
* Copyright (C) 2000 Lauris Kaplinski
* Copyright (C) 2000-2001 Ximian, Inc.
* Copyright (C) 2002 Lauris Kaplinski
+ * Copyright (C) 2008 Johan Engelen
*
* Released under GNU GPL
*/
+#include "display/curve.h"
-#include <glib/gmem.h>
-#include <display/curve.h>
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-point-matrix-ops.h>
-#include <libnr/nr-translate-ops.h>
-
-#define SP_CURVE_LENSTEP 32
-
-static bool sp_bpath_good(NArtBpath const bpath[]);
-static NArtBpath *sp_bpath_clean(NArtBpath const bpath[]);
-static NArtBpath const *sp_bpath_check_subpath(NArtBpath const bpath[]);
-static unsigned sp_bpath_length(NArtBpath const bpath[]);
-static bool sp_bpath_closed(NArtBpath const bpath[]);
+#include <glib/gmessages.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-geometric.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/point.h>
/* Constructors */
/**
- * The returned curve's state is as if sp_curve_reset has just been called on it.
+ * The returned curve's state is as if SPCurve::reset has just been called on it.
*/
-SPCurve *
-sp_curve_new()
+SPCurve::SPCurve()
+ : _refcount(1),
+ _pathv()
{
- return sp_curve_new_sized(SP_CURVE_LENSTEP);
+ _pathv.clear();
}
-/**
- * Like sp_curve_new, but overriding the default initial capacity.
- *
- * The returned curve's state is as if sp_curve_reset has just been called on it.
- *
- * \param length Initial number of NArtBpath elements allocated for bpath (including NR_END
- * element).
- */
-SPCurve *
-sp_curve_new_sized(gint length)
+SPCurve::SPCurve(Geom::PathVector const& pathv)
+ : _refcount(1),
+ _pathv(pathv)
{
- g_return_val_if_fail(length > 0, NULL);
-
- SPCurve *curve = g_new(SPCurve, 1);
-
- curve->refcount = 1;
- curve->_bpath = g_new(NArtBpath, length);
- curve->_bpath->code = NR_END;
- curve->end = 0;
- curve->length = length;
- curve->substart = 0;
- curve->hascpt = false;
- curve->posSet = false;
- curve->moving = false;
- curve->closed = false;
-
- return curve;
}
-/**
- * Convert NArtBpath object to SPCurve object.
- *
- * \return new SPCurve, or NULL if the curve was not created for some reason.
- */
SPCurve *
-sp_curve_new_from_bpath(NArtBpath *bpath)
+SPCurve::new_from_rect(Geom::Rect const &rect)
{
- g_return_val_if_fail(bpath != NULL, NULL);
+ SPCurve *c = new SPCurve();
+
+ Geom::Point p = rect.corner(0);
+ c->moveto(p);
+
+ for (int i=3; i>=0; i--) {
+ c->lineto(rect.corner(i));
+ }
+ c->closepath_current();
- SPCurve *curve = sp_curve_new_from_foreign_bpath(bpath);
- g_free(bpath);
- return curve;
+ return c;
}
-/**
- * Convert const NArtBpath array to SPCurve.
- *
- * \return new SPCurve, or NULL if the curve was not created for some reason.
- */
-SPCurve *sp_curve_new_from_foreign_bpath(NArtBpath const bpath[])
+SPCurve::~SPCurve()
{
- g_return_val_if_fail(bpath != NULL, NULL);
+}
- NArtBpath *new_bpath;
- if (!sp_bpath_good(bpath)) {
- new_bpath = sp_bpath_clean(bpath);
- g_return_val_if_fail(new_bpath != NULL, NULL);
- } else {
- unsigned const len = sp_bpath_length(bpath);
- new_bpath = g_new(NArtBpath, len);
- memcpy(new_bpath, bpath, len * sizeof(NArtBpath));
- }
+/* Methods */
- SPCurve *curve = g_new(SPCurve, 1);
-
- curve->refcount = 1;
- curve->_bpath = new_bpath;
- curve->length = sp_bpath_length(new_bpath);
- curve->end = curve->length - 1;
- gint i = curve->end;
- for (; i > 0; i--)
- if ((curve->_bpath[i].code == NR_MOVETO) ||
- (curve->_bpath[i].code == NR_MOVETO_OPEN))
- break;
- curve->substart = i;
- curve->hascpt = false;
- curve->posSet = false;
- curve->moving = false;
- curve->closed = sp_bpath_closed(new_bpath);
-
- return curve;
+void
+SPCurve::set_pathvector(Geom::PathVector const & new_pathv)
+{
+ _pathv = new_pathv;
}
-SPCurve *sp_curve_new_from_rect(NR::Maybe<NR::Rect> const &rect)
+Geom::PathVector const &
+SPCurve::get_pathvector() const
{
- g_return_val_if_fail(rect, NULL);
-
- SPCurve *c = sp_curve_new();
+ return _pathv;
+}
- NR::Point p = rect->corner(0);
- sp_curve_moveto(c, p);
+/*
+ * Returns the number of segments of all paths summed
+ * This count includes the closing line segment of a closed path.
+ */
+guint
+SPCurve::get_segment_count() const
+{
+ guint nr = 0;
+ for(Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); ++it) {
+ nr += (*it).size();
- for (int i=3; i>=0; i--) {
- sp_curve_lineto(c, rect->corner(i));
+ if (it->closed()) nr += 1;
}
- sp_curve_closepath_current(c);
-
- return c;
+ return nr;
}
/**
- * Increase refcount of curve.
+ * Increase _refcount of curve.
*
* \todo should this be shared with other refcounting code?
*/
SPCurve *
-sp_curve_ref(SPCurve *curve)
+SPCurve::ref()
{
- g_return_val_if_fail(curve != NULL, NULL);
-
- curve->refcount += 1;
+ _refcount += 1;
- return curve;
+ return this;
}
/**
* \todo should this be shared with other refcounting code?
*/
SPCurve *
-sp_curve_unref(SPCurve *curve)
+SPCurve::unref()
{
- g_return_val_if_fail(curve != NULL, NULL);
+ _refcount -= 1;
- curve->refcount -= 1;
-
- if (curve->refcount < 1) {
- if (curve->_bpath) {
- g_free(curve->_bpath);
- }
- g_free(curve);
+ if (_refcount < 1) {
+ delete this;
}
return NULL;
}
/**
- * Add space for more paths in curve.
- */
-static void
-sp_curve_ensure_space(SPCurve *curve, gint space)
-{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(space > 0);
-
- if (curve->end + space < curve->length)
- return;
-
- if (space < SP_CURVE_LENSTEP)
- space = SP_CURVE_LENSTEP;
-
- curve->_bpath = g_renew(NArtBpath, curve->_bpath, curve->length + space);
-
- curve->length += space;
-}
-
-/**
- * Create new curve from its own bpath array.
+ * Create new curve from this curve's pathvector array.
*/
SPCurve *
-sp_curve_copy(SPCurve *curve)
+SPCurve::copy() const
{
- g_return_val_if_fail(curve != NULL, NULL);
-
- return sp_curve_new_from_foreign_bpath(curve->_bpath);
+ return new SPCurve(_pathv);
}
/**
* Return new curve that is the concatenation of all curves in list.
*/
SPCurve *
-sp_curve_concat(GSList const *list)
+SPCurve::concat(GSList const *list)
{
- g_return_val_if_fail(list != NULL, NULL);
-
- gint length = 0;
+ SPCurve *new_curve = new SPCurve();
for (GSList const *l = list; l != NULL; l = l->next) {
SPCurve *c = (SPCurve *) l->data;
- length += c->end;
+ new_curve->_pathv.insert( new_curve->_pathv.end(), c->get_pathvector().begin(), c->get_pathvector().end() );
}
- SPCurve *new_curve = sp_curve_new_sized(length + 1);
-
- NArtBpath *bp = new_curve->_bpath;
-
- for (GSList const *l = list; l != NULL; l = l->next) {
- SPCurve *c = (SPCurve *) l->data;
- memcpy(bp, c->_bpath, c->end * sizeof(NArtBpath));
- bp += c->end;
- }
-
- bp->code = NR_END;
-
- new_curve->end = length;
- gint i;
- for (i = new_curve->end; i > 0; i--) {
- if ((new_curve->_bpath[i].code == NR_MOVETO) ||
- (new_curve->_bpath[i].code == NR_MOVETO_OPEN) )
- break;
- }
-
- new_curve->substart = i;
-
return new_curve;
}
/**
* Returns a list of new curves corresponding to the subpaths in \a curve.
+ * 2geomified
*/
GSList *
-sp_curve_split(SPCurve const *curve)
+SPCurve::split() const
{
- g_return_val_if_fail(curve != NULL, NULL);
-
- gint p = 0;
GSList *l = NULL;
- while (p < curve->end) {
- gint i = 1;
- while ((curve->_bpath[p + i].code == NR_LINETO) ||
- (curve->_bpath[p + i].code == NR_CURVETO))
- i++;
- SPCurve *new_curve = sp_curve_new_sized(i + 1);
- memcpy(new_curve->_bpath, curve->_bpath + p, i * sizeof(NArtBpath));
- new_curve->end = i;
- new_curve->_bpath[i].code = NR_END;
- new_curve->substart = 0;
- new_curve->closed = (new_curve->_bpath->code == NR_MOVETO);
- new_curve->hascpt = (new_curve->_bpath->code == NR_MOVETO_OPEN);
- l = g_slist_prepend(l, new_curve);
- p += i;
+ for (Geom::PathVector::const_iterator path_it = _pathv.begin(); path_it != _pathv.end(); ++path_it) {
+ Geom::PathVector newpathv;
+ newpathv.push_back(*path_it);
+ SPCurve * newcurve = new SPCurve(newpathv);
+ l = g_slist_prepend(l, newcurve);
}
return l;
}
-/**
- * Transform all paths in curve, template helper.
- */
-template<class M>
-static void
-tmpl_curve_transform(SPCurve *const curve, M const &m)
-{
- g_return_if_fail(curve != NULL);
-
- for (gint i = 0; i < curve->end; i++) {
- NArtBpath *p = curve->_bpath + i;
- switch (p->code) {
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- case NR_LINETO: {
- p->setC(3, p->c(3) * m);
- break;
- }
- case NR_CURVETO:
- for (unsigned i = 1; i <= 3; ++i) {
- p->setC(i, p->c(i) * m);
- }
- break;
- default:
- g_warning("Illegal pathcode %d", p->code);
- break;
- }
- }
-}
-
/**
* Transform all paths in curve using matrix.
*/
void
-sp_curve_transform(SPCurve *const curve, NR::Matrix const &m)
+SPCurve::transform(Geom::Matrix const &m)
{
- tmpl_curve_transform<NR::Matrix>(curve, m);
+ _pathv *= m;
}
/**
- * Transform all paths in curve using NR::translate.
+ * Set curve to empty curve.
+ * In more detail: this clears the internal pathvector from all its paths.
*/
void
-sp_curve_transform(SPCurve *const curve, NR::translate const &m)
+SPCurve::reset()
{
- tmpl_curve_transform<NR::translate>(curve, m);
+ _pathv.clear();
}
-
-/* Methods */
+/** Several consecutive movetos are ALLOWED
+ * Ref: http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes
+ * (first subitem of the item about zero-length path segments) */
/**
- * Set curve to empty curve.
+ * Calls SPCurve::moveto() with point made of given coordinates.
*/
void
-sp_curve_reset(SPCurve *curve)
+SPCurve::moveto(gdouble x, gdouble y)
{
- g_return_if_fail(curve != NULL);
-
- curve->_bpath->code = NR_END;
- curve->end = 0;
- curve->substart = 0;
- curve->hascpt = false;
- curve->posSet = false;
- curve->moving = false;
- curve->closed = false;
+ moveto(Geom::Point(x, y));
}
-
-/* Several consecutive movetos are ALLOWED */
-
/**
- * Calls sp_curve_moveto() with point made of given coordinates.
+ * Perform a moveto to a point, thus starting a new subpath.
+ * Point p must be finite.
*/
void
-sp_curve_moveto(SPCurve *curve, gdouble x, gdouble y)
+SPCurve::moveto(Geom::Point const &p)
{
- sp_curve_moveto(curve, NR::Point(x, y));
+ _pathv.push_back( Geom::Path() ); // for some reason Geom::Path(p) does not work...
+ _pathv.back().start(p);
}
/**
- * Perform a moveto to a point, thus starting a new subpath.
+ * Adds a line to the current subpath.
+ * Point p must be finite.
*/
void
-sp_curve_moveto(SPCurve *curve, NR::Point const &p)
+SPCurve::lineto(Geom::Point const &p)
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(!curve->moving);
-
- curve->substart = curve->end;
- curve->hascpt = true;
- curve->posSet = true;
- curve->movePos = p;
+ if (_pathv.empty()) g_message("SPCurve::lineto - path is empty!");
+ else _pathv.back().appendNew<Geom::LineSegment>( p );
}
-
/**
- * Calls sp_curve_lineto() with a point's coordinates.
+ * Calls SPCurve::lineto( Geom::Point(x,y) )
*/
void
-sp_curve_lineto(SPCurve *curve, NR::Point const &p)
+SPCurve::lineto(gdouble x, gdouble y)
{
- sp_curve_lineto(curve, p[NR::X], p[NR::Y]);
+ lineto(Geom::Point(x,y));
}
/**
- * Adds a line to the current subpath.
+ * Adds a quadratic bezier segment to the current subpath.
+ * All points must be finite.
*/
void
-sp_curve_lineto(SPCurve *curve, gdouble x, gdouble y)
+SPCurve::quadto(Geom::Point const &p1, Geom::Point const &p2)
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve->hascpt);
-
- if (curve->moving) {
- /* fix endpoint */
- g_return_if_fail(!curve->posSet);
- g_return_if_fail(curve->end > 1);
- NArtBpath *bp = curve->_bpath + curve->end - 1;
- g_return_if_fail(bp->code == NR_LINETO);
- bp->x3 = x;
- bp->y3 = y;
- curve->moving = false;
- return;
- }
-
- if (curve->posSet) {
- /* start a new segment */
- sp_curve_ensure_space(curve, 2);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_MOVETO_OPEN;
- bp->setC(3, curve->movePos);
- bp++;
- bp->code = NR_LINETO;
- bp->x3 = x;
- bp->y3 = y;
- bp++;
- bp->code = NR_END;
- curve->end += 2;
- curve->posSet = false;
- curve->closed = false;
- return;
- }
-
- /* add line */
-
- g_return_if_fail(curve->end > 1);
- sp_curve_ensure_space(curve, 1);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_LINETO;
- bp->x3 = x;
- bp->y3 = y;
- bp++;
- bp->code = NR_END;
- curve->end++;
+ if (_pathv.empty()) g_message("SPCurve::quadto - path is empty!");
+ else _pathv.back().appendNew<Geom::QuadraticBezier>( p1, p2);
}
-
-/// Unused
+/**
+ * Calls SPCurve::quadto( Geom::Point(x1,y1), Geom::Point(x2,y2) )
+ * All coordinates must be finite.
+ */
void
-sp_curve_lineto_moving(SPCurve *curve, gdouble x, gdouble y)
+SPCurve::quadto(gdouble x1, gdouble y1, gdouble x2, gdouble y2)
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve->hascpt);
-
- if (curve->moving) {
- /* change endpoint */
- g_return_if_fail(!curve->posSet);
- g_return_if_fail(curve->end > 1);
- NArtBpath *bp = curve->_bpath + curve->end - 1;
- g_return_if_fail(bp->code == NR_LINETO);
- bp->x3 = x;
- bp->y3 = y;
- return;
- }
-
- if (curve->posSet) {
- /* start a new segment */
- sp_curve_ensure_space(curve, 2);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_MOVETO_OPEN;
- bp->setC(3, curve->movePos);
- bp++;
- bp->code = NR_LINETO;
- bp->x3 = x;
- bp->y3 = y;
- bp++;
- bp->code = NR_END;
- curve->end += 2;
- curve->posSet = false;
- curve->moving = true;
- curve->closed = false;
- return;
- }
-
- /* add line */
-
- g_return_if_fail(curve->end > 1);
- sp_curve_ensure_space(curve, 1);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_LINETO;
- bp->x3 = x;
- bp->y3 = y;
- bp++;
- bp->code = NR_END;
- curve->end++;
- curve->moving = true;
+ quadto( Geom::Point(x1,y1), Geom::Point(x2,y2) );
}
/**
- * Calls sp_curve_curveto() with coordinates of three points.
+ * Adds a bezier segment to the current subpath.
+ * All points must be finite.
*/
void
-sp_curve_curveto(SPCurve *curve, NR::Point const &p0, NR::Point const &p1, NR::Point const &p2)
+SPCurve::curveto(Geom::Point const &p0, Geom::Point const &p1, Geom::Point const &p2)
{
- using NR::X;
- using NR::Y;
- sp_curve_curveto(curve,
- p0[X], p0[Y],
- p1[X], p1[Y],
- p2[X], p2[Y]);
+ if (_pathv.empty()) g_message("SPCurve::curveto - path is empty!");
+ else _pathv.back().appendNew<Geom::CubicBezier>( p0, p1, p2 );
}
-
/**
- * Adds a bezier segment to the current subpath.
+ * Calls SPCurve::curveto( Geom::Point(x0,y0), Geom::Point(x1,y1), Geom::Point(x2,y2) )
+ * All coordinates must be finite.
*/
void
-sp_curve_curveto(SPCurve *curve, gdouble x0, gdouble y0, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+SPCurve::curveto(gdouble x0, gdouble y0, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve->hascpt);
- g_return_if_fail(!curve->moving);
-
- if (curve->posSet) {
- /* start a new segment */
- sp_curve_ensure_space(curve, 2);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_MOVETO_OPEN;
- bp->setC(3, curve->movePos);
- bp++;
- bp->code = NR_CURVETO;
- bp->x1 = x0;
- bp->y1 = y0;
- bp->x2 = x1;
- bp->y2 = y1;
- bp->x3 = x2;
- bp->y3 = y2;
- bp++;
- bp->code = NR_END;
- curve->end += 2;
- curve->posSet = false;
- curve->closed = false;
- return;
- }
-
- /* add curve */
-
- g_return_if_fail(curve->end > 1);
- sp_curve_ensure_space(curve, 1);
- NArtBpath *bp = curve->_bpath + curve->end;
- bp->code = NR_CURVETO;
- bp->x1 = x0;
- bp->y1 = y0;
- bp->x2 = x1;
- bp->y2 = y1;
- bp->x3 = x2;
- bp->y3 = y2;
- bp++;
- bp->code = NR_END;
- curve->end++;
+ curveto( Geom::Point(x0,y0), Geom::Point(x1,y1), Geom::Point(x2,y2) );
}
/**
* Close current subpath by possibly adding a line between start and end.
*/
void
-sp_curve_closepath(SPCurve *curve)
+SPCurve::closepath()
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve->hascpt);
- g_return_if_fail(!curve->posSet);
- g_return_if_fail(!curve->moving);
- g_return_if_fail(!curve->closed);
- /* We need at least moveto, curveto, end. */
- g_return_if_fail(curve->end - curve->substart > 1);
-
- {
- NArtBpath *bs = curve->_bpath + curve->substart;
- NArtBpath *be = curve->_bpath + curve->end - 1;
-
- if (bs->c(3) != be->c(3)) {
- sp_curve_lineto(curve, bs->c(3));
- bs = curve->_bpath + curve->substart;
- }
-
- bs->code = NR_MOVETO;
- }
- curve->closed = true;
-
- for (NArtBpath const *bp = curve->_bpath; bp->code != NR_END; bp++) {
- /** \todo
- * effic: Maintain a count of NR_MOVETO_OPEN's (e.g. instead of
- * the closed boolean).
- */
- if (bp->code == NR_MOVETO_OPEN) {
- curve->closed = false;
- break;
- }
- }
-
- curve->hascpt = false;
+ _pathv.back().close(true);
}
-/** Like sp_curve_closepath() but sets the end point of the current
- command to the subpath start point instead of adding a new lineto.
+/** Like SPCurve::closepath() but sets the end point of the last subpath
+ to the subpath start point instead of adding a new lineto.
Used for freehand drawing when the user draws back to the start point.
**/
void
-sp_curve_closepath_current(SPCurve *curve)
+SPCurve::closepath_current()
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve->hascpt);
- g_return_if_fail(!curve->posSet);
- g_return_if_fail(!curve->closed);
- /* We need at least moveto, curveto, end. */
- g_return_if_fail(curve->end - curve->substart > 1);
-
- {
- NArtBpath *bs = curve->_bpath + curve->substart;
- NArtBpath *be = curve->_bpath + curve->end - 1;
-
- be->x3 = bs->x3;
- be->y3 = bs->y3;
-
- bs->code = NR_MOVETO;
- }
- curve->closed = true;
-
- for (NArtBpath const *bp = curve->_bpath; bp->code != NR_END; bp++) {
- /** \todo
- * effic: Maintain a count of NR_MOVETO_OPEN's (e.g. instead of
- * the closed boolean).
- */
- if (bp->code == NR_MOVETO_OPEN) {
- curve->closed = false;
- break;
- }
- }
-
- curve->hascpt = false;
- curve->moving = false;
+ _pathv.back().setFinal(_pathv.back().initialPoint());
+ _pathv.back().close(true);
}
/**
- * True if no paths are in curve.
+ * True if no paths are in curve. If it only contains a path with only a moveto, the path is considered NON-empty
*/
bool
-sp_curve_empty(SPCurve *curve)
+SPCurve::is_empty() const
{
- g_return_val_if_fail(curve != NULL, TRUE);
-
- return (curve->_bpath->code == NR_END);
+ return _pathv.empty();
}
/**
- * Return last subpath or NULL.
+ * True iff all subpaths are closed.
+ * Returns false if the curve is empty.
*/
-NArtBpath *
-sp_curve_last_bpath(SPCurve const *curve)
+bool
+SPCurve::is_closed() const
{
- g_return_val_if_fail(curve != NULL, NULL);
-
- if (curve->end == 0) {
- return NULL;
+ if (is_empty()) {
+ return false;
+ } else {
+ bool closed = true;
+ for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); it++) {
+ if ( ! it->closed() ) {
+ closed = false;
+ break;
+ }
+ }
+ return closed;
}
-
- return curve->_bpath + curve->end - 1;
}
/**
- * Return first subpath or NULL.
+ * Return last pathsegment (possibly the closing path segment) of the last path in PathVector or NULL.
+ * If the last path is empty (contains only a moveto), the function returns NULL
*/
-NArtBpath *
-sp_curve_first_bpath(SPCurve const *curve)
+Geom::Curve const *
+SPCurve::last_segment() const
{
- g_return_val_if_fail(curve != NULL, NULL);
-
- if (curve->end == 0) {
+ if (is_empty()) {
+ return NULL;
+ }
+ if (_pathv.back().empty()) {
return NULL;
}
- return curve->_bpath;
-}
-
-/**
- * Return first point of first subpath or (0,0).
- */
-NR::Point
-sp_curve_first_point(SPCurve const *const curve)
-{
- NArtBpath *const bpath = sp_curve_first_bpath(curve);
- g_return_val_if_fail(bpath != NULL, NR::Point(0, 0));
- return bpath->c(3);
+ return &_pathv.back().back_default();
}
/**
- * Return the second point of first subpath or curve->movePos if curve too short.
+ * Return last path in PathVector or NULL.
*/
-NR::Point
-sp_curve_second_point(SPCurve const *const curve)
+Geom::Path const *
+SPCurve::last_path() const
{
- g_return_val_if_fail(curve != NULL, NR::Point(0, 0));
-
- if (curve->end < 1) {
- return curve->movePos;
+ if (is_empty()) {
+ return NULL;
}
- NArtBpath *bpath = NULL;
- if (curve->end < 2) {
- bpath = curve->_bpath;
- } else {
- bpath = curve->_bpath + 1;
- }
- g_return_val_if_fail(bpath != NULL, NR::Point(0, 0));
- return bpath->c(3);
+ return &_pathv.back();
}
/**
- * Return the second-last point of last subpath or curve->movePos if curve too short.
+ * Return first pathsegment in PathVector or NULL.
+ * equal in functionality to SPCurve::first_bpath()
*/
-NR::Point
-sp_curve_penultimate_point(SPCurve const *const curve)
+Geom::Curve const *
+SPCurve::first_segment() const
{
- g_return_val_if_fail(curve != NULL, NR::Point(0, 0));
-
- if (curve->end < 2) {
- return curve->movePos;
+ if (is_empty()) {
+ return NULL;
+ }
+ if (_pathv.front().empty()) {
+ return NULL;
}
- NArtBpath *const bpath = curve->_bpath + curve->end - 2;
- g_return_val_if_fail(bpath != NULL, NR::Point(0, 0));
- return bpath->c(3);
+ return &_pathv.front().front();
}
/**
- * Return last point of last subpath or (0,0).
+ * Return first path in PathVector or NULL.
*/
-NR::Point
-sp_curve_last_point(SPCurve const *const curve)
+Geom::Path const *
+SPCurve::first_path() const
{
- NArtBpath *const bpath = sp_curve_last_bpath(curve);
- g_return_val_if_fail(bpath != NULL, NR::Point(0, 0));
- return bpath->c(3);
-}
+ if (is_empty()) {
+ return NULL;
+ }
-inline static bool
-is_moveto(NRPathcode const c)
-{
- return c == NR_MOVETO || c == NR_MOVETO_OPEN;
+ return &_pathv.front();
}
/**
- * Returns \a curve but drawn in the opposite direction.
- * Should result in the same shape, but
- * with all its markers drawn facing the other direction.
- **/
-SPCurve *
-sp_curve_reverse(SPCurve const *curve)
+ * Return first point of first subpath or nothing when the path is empty.
+ */
+boost::optional<Geom::Point>
+SPCurve::first_point() const
{
- /* We need at least moveto, curveto, end. */
- g_return_val_if_fail(curve->end - curve->substart > 1, NULL);
-
- NArtBpath const *be = curve->_bpath + curve->end - 1;
-
- g_assert(is_moveto(curve->_bpath[curve->substart].code));
- g_assert(is_moveto(curve->_bpath[0].code));
- g_assert((be+1)->code == NR_END);
-
- SPCurve *new_curve = sp_curve_new_sized(curve->length);
- sp_curve_moveto(new_curve, be->c(3));
-
- for (NArtBpath const *bp = be; ; --bp) {
- switch (bp->code) {
- case NR_MOVETO:
- g_assert(new_curve->_bpath[new_curve->substart].code == NR_MOVETO_OPEN);
- new_curve->_bpath[new_curve->substart].code = NR_MOVETO;
- /* FALL-THROUGH */
- case NR_MOVETO_OPEN:
- if (bp == curve->_bpath) {
- return new_curve;
- }
- sp_curve_moveto(new_curve, (bp-1)->c(3));
- break;
-
- case NR_LINETO:
- sp_curve_lineto(new_curve, (bp-1)->c(3));
- break;
-
- case NR_CURVETO:
- sp_curve_curveto(new_curve, bp->c(2), bp->c(1), (bp-1)->c(3));
- break;
+ boost::optional<Geom::Point> retval;
- default:
- g_assert_not_reached();
- }
+ if (!is_empty()) {
+ retval = _pathv.front().initialPoint();
}
+
+ return retval;
}
/**
- * Append \a curve2 to \a curve.
+ * Return the second point of first subpath or _movePos if curve too short.
+ * If the pathvector is empty, this returns nothing. If the first path is only a moveto, this method
+ * returns the first point of the second path, if it exists. If there is no 2nd path, it returns the
+ * first point of the first path.
*/
-void
-sp_curve_append(SPCurve *curve,
- SPCurve const *curve2,
- bool use_lineto)
+boost::optional<Geom::Point>
+SPCurve::second_point() const
{
- g_return_if_fail(curve != NULL);
- g_return_if_fail(curve2 != NULL);
-
- if (curve2->end < 1)
- return;
-
- NArtBpath const *bs = curve2->_bpath;
-
- bool closed = curve->closed;
-
- for (NArtBpath const *bp = bs; bp->code != NR_END; bp++) {
- switch (bp->code) {
- case NR_MOVETO_OPEN:
- if (use_lineto && curve->hascpt) {
- sp_curve_lineto(curve, bp->x3, bp->y3);
- use_lineto = FALSE;
- } else {
- if (closed) sp_curve_closepath(curve);
- sp_curve_moveto(curve, bp->x3, bp->y3);
- }
- closed = false;
- break;
-
- case NR_MOVETO:
- if (use_lineto && curve->hascpt) {
- sp_curve_lineto(curve, bp->x3, bp->y3);
- use_lineto = FALSE;
- } else {
- if (closed) sp_curve_closepath(curve);
- sp_curve_moveto(curve, bp->x3, bp->y3);
- }
- closed = true;
- break;
-
- case NR_LINETO:
- sp_curve_lineto(curve, bp->x3, bp->y3);
- break;
-
- case NR_CURVETO:
- sp_curve_curveto(curve, bp->x1, bp->y1, bp->x2, bp->y2, bp->x3, bp->y3);
- break;
-
- case NR_END:
- g_assert_not_reached();
+ boost::optional<Geom::Point> retval;
+ if (!is_empty()) {
+ if (_pathv.front().empty()) {
+ // first path is only a moveto
+ // check if there is second path
+ if (_pathv.size() > 1) {
+ retval = _pathv[1].initialPoint();
+ } else {
+ retval = _pathv[0].initialPoint();
+ }
+ } else {
+ retval = _pathv.front()[0].finalPoint();
}
}
- if (closed) {
- sp_curve_closepath(curve);
- }
+ return retval;
}
/**
- * Append \a c1 to \a c0 with possible fusing of close endpoints.
+ * Return the second-last point of last subpath or first point when that last subpath has only a moveto.
*/
-SPCurve *
-sp_curve_append_continuous(SPCurve *c0, SPCurve const *c1, gdouble tolerance)
+boost::optional<Geom::Point>
+SPCurve::penultimate_point() const
{
- g_return_val_if_fail(c0 != NULL, NULL);
- g_return_val_if_fail(c1 != NULL, NULL);
- g_return_val_if_fail(!c0->closed, NULL);
- g_return_val_if_fail(!c1->closed, NULL);
-
- if (c1->end < 1) {
- return c0;
- }
-
- NArtBpath *be = sp_curve_last_bpath(c0);
- if (be) {
- NArtBpath const *bs = sp_curve_first_bpath(c1);
- if ( bs
- && ( fabs( bs->x3 - be->x3 ) <= tolerance )
- && ( fabs( bs->y3 - be->y3 ) <= tolerance ) )
- {
- /** \todo
- * fixme: Strictly we mess in case of multisegment mixed
- * open/close curves
- */
- bool closed = false;
- for (bs = bs + 1; bs->code != NR_END; bs++) {
- switch (bs->code) {
- case NR_MOVETO_OPEN:
- if (closed) sp_curve_closepath(c0);
- sp_curve_moveto(c0, bs->x3, bs->y3);
- closed = false;
- break;
- case NR_MOVETO:
- if (closed) sp_curve_closepath(c0);
- sp_curve_moveto(c0, bs->x3, bs->y3);
- closed = true;
- break;
- case NR_LINETO:
- sp_curve_lineto(c0, bs->x3, bs->y3);
- break;
- case NR_CURVETO:
- sp_curve_curveto(c0, bs->x1, bs->y1, bs->x2, bs->y2, bs->x3, bs->y3);
- break;
- case NR_END:
- g_assert_not_reached();
- }
- }
+ boost::optional<Geom::Point> retval;
+ if (!is_empty()) {
+ Geom::Path const &lastpath = _pathv.back();
+ if (!lastpath.empty()) {
+ Geom::Curve const &back = lastpath.back_default();
+ retval = back.initialPoint();
} else {
- sp_curve_append(c0, c1, TRUE);
+ retval = lastpath.initialPoint();
}
- } else {
- sp_curve_append(c0, c1, TRUE);
}
- return c0;
+ return retval;
}
/**
- * Remove last segment of curve.
+ * Return last point of last subpath or nothing when the curve is empty.
+ * If the last path is only a moveto, then return that point.
*/
-void
-sp_curve_backspace(SPCurve *curve)
+boost::optional<Geom::Point>
+SPCurve::last_point() const
{
- g_return_if_fail(curve != NULL);
-
- if (curve->end > 0) {
- curve->end -= 1;
- if (curve->end > 0) {
- NArtBpath *bp = curve->_bpath + curve->end - 1;
- if ((bp->code == NR_MOVETO) ||
- (bp->code == NR_MOVETO_OPEN) )
- {
- curve->hascpt = true;
- curve->posSet = true;
- curve->closed = false;
- curve->movePos = bp->c(3);
- curve->end -= 1;
- }
- }
- curve->_bpath[curve->end].code = NR_END;
+ boost::optional<Geom::Point> retval;
+
+ if (!is_empty()) {
+ retval = _pathv.back().finalPoint();
}
-}
-/* Private methods */
+ return retval;
+}
/**
- * True if all subpaths in bpath array pass consistency check.
- */
-static bool sp_bpath_good(NArtBpath const bpath[])
+ * Returns a *new* \a curve but drawn in the opposite direction.
+ * Should result in the same shape, but
+ * with all its markers drawn facing the other direction.
+ * Reverses the order of subpaths as well
+ **/
+SPCurve *
+SPCurve::create_reverse() const
{
- g_return_val_if_fail(bpath != NULL, FALSE);
+ SPCurve *new_curve = new SPCurve(Geom::reverse_paths_and_order(_pathv));
- NArtBpath const *bp = bpath;
- while (bp->code != NR_END) {
- bp = sp_bpath_check_subpath(bp);
- if (bp == NULL)
- return false;
- }
-
- return true;
+ return new_curve;
}
/**
- * Return copy of a bpath array, discarding any inconsistencies.
+ * Append \a curve2 to \a this.
+ * If \a use_lineto is false, simply add all paths in \a curve2 to \a this;
+ * if \a use_lineto is true, combine \a this's last path and \a curve2's first path and add the rest of the paths in \a curve2 to \a this.
*/
-static NArtBpath *sp_bpath_clean(NArtBpath const bpath[])
+void
+SPCurve::append(SPCurve const *curve2,
+ bool use_lineto)
{
- NArtBpath *new_bpath = g_new(NArtBpath, sp_bpath_length(bpath));
-
- NArtBpath const *bp = bpath;
- NArtBpath *np = new_bpath;
+ if (curve2->is_empty())
+ return;
- while (bp->code != NR_END) {
- if (sp_bpath_check_subpath(bp)) {
- *np++ = *bp++;
- while ((bp->code == NR_LINETO) ||
- (bp->code == NR_CURVETO))
- *np++ = *bp++;
+ if (use_lineto) {
+ Geom::PathVector::const_iterator it = curve2->_pathv.begin();
+ if ( ! _pathv.empty() ) {
+ Geom::Path & lastpath = _pathv.back();
+ lastpath.appendNew<Geom::LineSegment>( (*it).initialPoint() );
+ lastpath.append( (*it) );
} else {
- bp++;
- while ((bp->code == NR_LINETO) ||
- (bp->code == NR_CURVETO))
- bp++;
+ _pathv.push_back( (*it) );
}
- }
- if (np == new_bpath) {
- g_free(new_bpath);
- return NULL;
+ for (it++; it != curve2->_pathv.end(); it++) {
+ _pathv.push_back( (*it) );
+ }
+ } else {
+ for (Geom::PathVector::const_iterator it = curve2->_pathv.begin(); it != curve2->_pathv.end(); it++) {
+ _pathv.push_back( (*it) );
+ }
}
-
- np->code = NR_END;
- np += 1;
-
- new_bpath = g_renew(NArtBpath, new_bpath, np - new_bpath);
-
- return new_bpath;
}
/**
- * Perform consistency check of bpath array.
- * \return Address of NR_END node or NULL.
+ * Append \a c1 to \a this with possible fusing of close endpoints. If the end of this curve and the start of c1 are within tolerance distance,
+ * then the startpoint of c1 is moved to the end of this curve and the first subpath of c1 is appended to the last subpath of this curve.
+ * When one of the curves (this curve or the argument curve) is closed, the returned value is NULL; otherwise the returned value is this curve.
+ * When one of the curves is empty, this curves path becomes the non-empty path.
*/
-static NArtBpath const *sp_bpath_check_subpath(NArtBpath const bpath[])
+SPCurve *
+SPCurve::append_continuous(SPCurve const *c1, gdouble tolerance)
{
- g_return_val_if_fail(bpath != NULL, NULL);
+ using Geom::X;
+ using Geom::Y;
- bool closed;
- if (bpath->code == NR_MOVETO) {
- closed = true;
- } else if (bpath->code == NR_MOVETO_OPEN) {
- closed = false;
- } else {
+ g_return_val_if_fail(c1 != NULL, NULL);
+ if ( this->is_closed() || c1->is_closed() ) {
return NULL;
}
- gint len = 0;
- gint i;
- /** \todo
- * effic: consider checking for END/MOVE/MOVETO inside switch block
- */
- for (i = 1; (bpath[i].code != NR_END) && (bpath[i].code != NR_MOVETO) && (bpath[i].code != NR_MOVETO_OPEN); i++) {
- switch (bpath[i].code) {
- case NR_LINETO:
- case NR_CURVETO:
- len++;
- break;
- default:
- return NULL;
- }
+ if (c1->is_empty()) {
+ return this;
+ }
+
+ if (this->is_empty()) {
+ _pathv = c1->_pathv;
+ return this;
}
- if (closed) {
- if (len < 1)
- return NULL;
+ if ( (fabs((*this->last_point())[X] - (*c1->first_point())[X]) <= tolerance)
+ && (fabs((*this->last_point())[Y] - (*c1->first_point())[Y]) <= tolerance) )
+ {
+ // c1's first subpath can be appended to this curve's last subpath
+ Geom::PathVector::const_iterator path_it = c1->_pathv.begin();
+ Geom::Path & lastpath = _pathv.back();
+
+ Geom::Path newfirstpath(*path_it);
+ newfirstpath.setInitial(lastpath.finalPoint());
+ lastpath.append( newfirstpath );
+
+ for (path_it++; path_it != c1->_pathv.end(); path_it++) {
+ _pathv.push_back( (*path_it) );
+ }
- if ((bpath->x3 != bpath[i-1].x3) || (bpath->y3 != bpath[i-1].y3))
- return NULL;
} else {
- if (len < 1)
- return NULL;
+ append(c1, true);
}
- return bpath + i;
+ return this;
}
/**
- * Returns index of first NR_END bpath in array.
+ * Remove last segment of curve.
+ * (Only used once in /src/pen-context.cpp)
*/
-static unsigned sp_bpath_length(NArtBpath const bpath[])
+void
+SPCurve::backspace()
{
- g_return_val_if_fail(bpath != NULL, FALSE);
+ if ( is_empty() )
+ return;
- unsigned ret = 0;
- while ( bpath[ret].code != NR_END ) {
- ++ret;
+ if ( !_pathv.back().empty() ) {
+ _pathv.back().erase_last();
+ _pathv.back().close(false);
}
- ++ret;
-
- return ret;
}
/**
- * \brief
- *
- * \todo
- * fixme: this is bogus -- it doesn't check for nr_moveto, which will indicate
- * a closing of the subpath it's nonsense to talk about a path as a whole
- * being closed, although maybe someone would want that for some other reason?
- * Oh, also, if the bpath just ends, then it's *open*. I hope nobody is using
- * this code for anything.
+ * TODO: add comments about what this method does and what assumptions are made and requirements are put on SPCurve
+ (2:08:18 AM) Johan: basically, i convert the path to pw<d2>
+(2:08:27 AM) Johan: then i calculate an offset path
+(2:08:29 AM) Johan: to move the knots
+(2:08:36 AM) Johan: then i add it
+(2:08:40 AM) Johan: then convert back to path
+If I remember correctly, this moves the firstpoint to new_p0, and the lastpoint to new_p1, and moves all nodes in between according to their arclength (interpolates the movement amount)
*/
-static bool sp_bpath_closed(NArtBpath const bpath[])
+void
+SPCurve::stretch_endpoints(Geom::Point const &new_p0, Geom::Point const &new_p1)
{
- g_return_val_if_fail(bpath != NULL, FALSE);
-
- for (NArtBpath const *bp = bpath; bp->code != NR_END; bp++) {
- if (bp->code == NR_MOVETO_OPEN) {
- return false;
- }
+ if (is_empty()) {
+ return;
}
- return true;
+ Geom::Point const offset0( new_p0 - *first_point() );
+ Geom::Point const offset1( new_p1 - *last_point() );
+
+ Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = _pathv.front().toPwSb();
+ Geom::Piecewise<Geom::SBasis> arclength = Geom::arcLengthSb(pwd2);
+ if ( arclength.lastValue() <= 0 ) {
+ g_error("SPCurve::stretch_endpoints - arclength <= 0");
+ throw;
+ }
+ arclength *= 1./arclength.lastValue();
+ Geom::Point const A( offset0 );
+ Geom::Point const B( offset1 );
+ Geom::Piecewise<Geom::SBasis> offsetx = (arclength*-1.+1)*A[0] + arclength*B[0];
+ Geom::Piecewise<Geom::SBasis> offsety = (arclength*-1.+1)*A[1] + arclength*B[1];
+ Geom::Piecewise<Geom::D2<Geom::SBasis> > offsetpath = Geom::sectionize( Geom::D2<Geom::Piecewise<Geom::SBasis> >(offsetx, offsety) );
+ pwd2 += offsetpath;
+ _pathv = Geom::path_from_piecewise( pwd2, 0.001 );
}
/**
- * Returns length of bezier segment.
+ * sets start of first path to new_p0, and end of first path to new_p1
*/
-static double
-bezier_len(NR::Point const &c0,
- NR::Point const &c1,
- NR::Point const &c2,
- NR::Point const &c3,
- double const threshold)
+void
+SPCurve::move_endpoints(Geom::Point const &new_p0, Geom::Point const &new_p1)
{
- /** \todo
- * The SVG spec claims that a closed form exists, but for the moment I'll
- * use a stupid algorithm.
- */
- double const lbound = L2( c3 - c0 );
- double const ubound = L2( c1 - c0 ) + L2( c2 - c1 ) + L2( c3 - c2 );
- double ret;
- if ( ubound - lbound <= threshold ) {
- ret = .5 * ( lbound + ubound );
- } else {
- NR::Point const a1( .5 * ( c0 + c1 ) );
- NR::Point const b2( .5 * ( c2 + c3 ) );
- NR::Point const c12( .5 * ( c1 + c2 ) );
- NR::Point const a2( .5 * ( a1 + c12 ) );
- NR::Point const b1( .5 * ( c12 + b2 ) );
- NR::Point const midpoint( .5 * ( a2 + b1 ) );
- double const rec_threshold = .625 * threshold;
- ret = bezier_len(c0, a1, a2, midpoint, rec_threshold) + bezier_len(midpoint, b1, b2, c3, rec_threshold);
- if (!(lbound - 1e-2 <= ret && ret <= ubound + 1e-2)) {
- using NR::X; using NR::Y;
- g_warning("ret=%f outside of expected bounds [%f, %f] for {(%.0f %.0f) (%.0f %.0f) (%.0f %.0f) (%.0f %.0f)}",
- ret, lbound, ubound, c0[X], c0[Y], c1[X], c1[Y], c2[X], c2[Y], c3[X], c3[Y]);
- }
+ if (is_empty()) {
+ return;
}
- return ret;
+ _pathv.front().setInitial(new_p0);
+ _pathv.front().setFinal(new_p1);
}
/**
- * Returns total length of curve, excluding length of closepath segments.
+ * returns the number of nodes in a path, used for statusbar text when selecting an spcurve.
+ * Sum of nodes in all the paths. When a path is closed, and its closing line segment is of zero-length,
+ * this function will not count the closing knot double (so basically ignores the closing line segment when it has zero length)
*/
-static double
-sp_curve_distance_including_space(SPCurve const *const curve, double seg2len[])
+guint
+SPCurve::nodes_in_path() const
{
- g_return_val_if_fail(curve != NULL, 0.);
+ guint nr = 0;
+ for(Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); ++it) {
+ nr += (*it).size();
- double ret = 0.0;
-
- if ( curve->_bpath->code == NR_END ) {
- return ret;
- }
+ nr++; // count last node (this works also for closed paths because although they don't have a 'last node', they do have an extra segment
- NR::Point prev(curve->_bpath->c(3));
- for (gint i = 1; i < curve->end; ++i) {
- NArtBpath &p = curve->_bpath[i];
- double seg_len = 0;
- switch (p.code) {
- case NR_MOVETO_OPEN:
- case NR_MOVETO:
- case NR_LINETO:
- seg_len = L2(p.c(3) - prev);
- break;
-
- case NR_CURVETO:
- seg_len = bezier_len(prev, p.c(1), p.c(2), p.c(3), 1.);
- break;
-
- case NR_END:
- return ret;
+ if (it->closed()) {
+ Geom::Curve const &c = it->back_closed();
+ if (are_near(c.initialPoint(), c.finalPoint())) {
+ nr--; // do not count closing knot double for zero-length closing line segments
+ }
}
- seg2len[i - 1] = seg_len;
- ret += seg_len;
- prev = p.c(3);
}
- g_assert(!(ret < 0));
- return ret;
+
+ return nr;
}
/**
- * Like sp_curve_distance_including_space(), but ensures that the
- * result >= 1e-18: uses 1 per segment if necessary.
+ * Adds p to the last point (and last handle if present) of the last path
*/
-static double
-sp_curve_nonzero_distance_including_space(SPCurve const *const curve, double seg2len[])
-{
- double const real_dist(sp_curve_distance_including_space(curve, seg2len));
- if (real_dist >= 1e-18) {
- return real_dist;
- } else {
- unsigned const nSegs = SP_CURVE_LENGTH(curve) - 1;
- for (unsigned i = 0; i < nSegs; ++i) {
- seg2len[i] = 1.;
- }
- return (double) nSegs;
- }
-}
-
void
-sp_curve_stretch_endpoints(SPCurve *curve, NR::Point const &new_p0, NR::Point const &new_p1)
+SPCurve::last_point_additive_move(Geom::Point const & p)
{
- if (sp_curve_empty(curve)) {
+ if (is_empty()) {
return;
}
- g_assert(unsigned(SP_CURVE_LENGTH(curve)) + 1 == sp_bpath_length(curve->_bpath));
- unsigned const nSegs = SP_CURVE_LENGTH(curve) - 1;
- g_assert(nSegs != 0);
- double *const seg2len = new double[nSegs];
- double const tot_len = sp_curve_nonzero_distance_including_space(curve, seg2len);
- NR::Point const offset0( new_p0 - sp_curve_first_point(curve) );
- NR::Point const offset1( new_p1 - sp_curve_last_point(curve) );
- curve->_bpath->setC(3, new_p0);
- double begin_dist = 0.;
- for (unsigned si = 0; si < nSegs; ++si) {
- double const end_dist = begin_dist + seg2len[si];
- NArtBpath &p = curve->_bpath[1 + si];
- switch (p.code) {
- case NR_LINETO:
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- p.setC(3, p.c(3) + NR::Lerp(end_dist / tot_len, offset0, offset1));
- break;
-
- case NR_CURVETO:
- for (unsigned ci = 1; ci <= 3; ++ci) {
- p.setC(ci, p.c(ci) + Lerp((begin_dist + ci * seg2len[si] / 3.) / tot_len, offset0, offset1));
- }
- break;
-
- default:
- g_assert_not_reached();
- }
- begin_dist = end_dist;
- }
- g_assert(L1(curve->_bpath[nSegs].c(3) - new_p1) < 1.);
- /* Explicit set for better numerical properties. */
- curve->_bpath[nSegs].setC(3, new_p1);
- delete [] seg2len;
-}
+ _pathv.back().setFinal( _pathv.back().finalPoint() + p );
-void
-sp_curve_move_endpoints(SPCurve *curve, NR::Point const &new_p0,
- NR::Point const &new_p1)
-{
- if (sp_curve_empty(curve)) {
- return;
+ // Move handle as well when the last segment is a cubic bezier segment:
+ // TODO: what to do for quadratic beziers?
+ if ( Geom::CubicBezier const *lastcube = dynamic_cast<Geom::CubicBezier const *>(&_pathv.back().back()) ) {
+ Geom::CubicBezier newcube( *lastcube );
+ newcube.setPoint(2, newcube[2] + p);
+ _pathv.back().replace( --_pathv.back().end(), newcube );
}
- unsigned const nSegs = SP_CURVE_LENGTH(curve) - 1;
- g_assert(nSegs != 0);
-
- curve->_bpath->setC(3, new_p0);
- curve->_bpath[nSegs].setC(3, new_p1);
}
-
/*
Local Variables:
mode:c++