From: johanengelen Date: Wed, 16 Jul 2008 21:27:55 +0000 (+0000) Subject: remove all old nartbpath code from SPCurve!!! (in other words, lib2geomification... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac566a07dccb893f08bb6f5666d2a471778e7317;p=inkscape.git remove all old nartbpath code from SPCurve!!! (in other words, lib2geomification of SPCurve complete) --- diff --git a/src/common-context.h b/src/common-context.h index 1f3963608..22fa796ee 100644 --- a/src/common-context.h +++ b/src/common-context.h @@ -22,6 +22,7 @@ #include "event-context.h" #include "display/curve.h" #include "display/display-forward.h" +#include #define SP_TYPE_COMMON_CONTEXT (sp_common_context_get_type()) #define SP_COMMON_CONTEXT(o) (GTK_CHECK_CAST((o), SP_TYPE_COMMON_CONTEXT, SPCommonContext)) diff --git a/src/display/curve.cpp b/src/display/curve.cpp index 768b44c10..b48c941ba 100644 --- a/src/display/curve.cpp +++ b/src/display/curve.cpp @@ -1,7 +1,7 @@ #define __CURVE_C__ /** \file - * Routines for SPCurve and for NArtBpath arrays / Geom::PathVector in general. + * Routines for SPCurve and for its Geom::PathVector */ /* @@ -20,13 +20,9 @@ #include "display/curve.h" #include -#include #include "libnr/nr-point.h" #include "libnr/nr-rect.h" -#include #include -#include -#include #include #include #include @@ -36,9 +32,6 @@ #include "svg/svg.h" #include <2geom/point.h> -static unsigned sp_bpath_length(NArtBpath const bpath[]); -static bool sp_bpath_closed(NArtBpath const bpath[]); - /* Constructors */ /** @@ -49,100 +42,22 @@ static bool sp_bpath_closed(NArtBpath const bpath[]); */ SPCurve::SPCurve(guint length) : _refcount(1), - _bpath(NULL), - _pathv(), - _end(0), - _length(length), - _substart(0), - _hascpt(false), - _posSet(false), - _moving(false), - _closed(false) + _pathv() { if (length <= 0) { g_error("SPCurve::SPCurve called with invalid length parameter"); throw; } - _bpath = g_new(NArtBpath, length); - _bpath->code = NR_END; - _pathv.clear(); } SPCurve::SPCurve(Geom::PathVector const& pathv) : _refcount(1), - _bpath(NULL), - _pathv(pathv), - _end(0), - _length(0), - _substart(0), - _hascpt(false), - _posSet(false), - _moving(false), - _closed(false) + _pathv(pathv) { - // temporary code to convert to _bpath as well: - _bpath = BPath_from_2GeomPath(_pathv); - unsigned const len = sp_bpath_length(_bpath); - _length = len; - _end = _length - 1; - gint i = _end; - for (; i > 0; i--) - if ((_bpath[i].code == NR_MOVETO) || - (_bpath[i].code == NR_MOVETO_OPEN)) - break; - _substart = i; - _closed = sp_bpath_closed(_bpath); } -// * 2GEOMproof -SPCurve * -SPCurve::new_from_foreign_bpath(NArtBpath const *bpath) -{ - g_return_val_if_fail(bpath != NULL, NULL); - - NArtBpath *new_bpath; - unsigned const len = sp_bpath_length(bpath); - new_bpath = g_new(NArtBpath, len); - memcpy(new_bpath, bpath, len * sizeof(NArtBpath)); - - SPCurve *curve = new SPCurve(); - - curve->_bpath = new_bpath; - curve->_length = len; - 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->_closed = sp_bpath_closed(new_bpath); - - curve->_pathv = BPath_to_2GeomPath(curve->_bpath); - - return curve; -} - -/** - * Convert NArtBpath object to SPCurve object. - * - * \return new SPCurve, or NULL if the curve was not created for some reason. - * 2GEOMproof - */ -SPCurve * -SPCurve::new_from_bpath(NArtBpath *bpath) -{ - g_return_val_if_fail(bpath != NULL, NULL); - - SPCurve *curve = SPCurve::new_from_foreign_bpath(bpath); - g_free(bpath); - - return curve; -} - -// * 2GEOMproof SPCurve * SPCurve::new_from_rect(Geom::Rect const &rect) { @@ -159,13 +74,8 @@ SPCurve::new_from_rect(Geom::Rect const &rect) return c; } -// * 2GEOMproof SPCurve::~SPCurve() { - if (_bpath) { - g_free(_bpath); - _bpath = NULL; - } } /* Methods */ @@ -174,56 +84,14 @@ void SPCurve::set_pathvector(Geom::PathVector const & new_pathv) { _pathv = new_pathv; - - _hascpt = false; - _posSet = false; - _moving = false; - - // temporary code to convert to _bpath as well: - if (_bpath) { - g_free(_bpath); - _bpath = NULL; - } - _bpath = BPath_from_2GeomPath(_pathv); - unsigned const len = sp_bpath_length(_bpath); - _length = len; - _end = _length - 1; - gint i = _end; - for (; i > 0; i--) - if ((_bpath[i].code == NR_MOVETO) || - (_bpath[i].code == NR_MOVETO_OPEN)) - break; - _substart = i; - _closed = sp_bpath_closed(_bpath); } -/** - * Get pointer to bpath data. Don't keep this reference too long, because the path might change by another function. - */ -NArtBpath const * -SPCurve::get_bpath() const -{ - return _bpath; -}; - Geom::PathVector const & SPCurve::get_pathvector() const { return _pathv; } -/** - *Returns index in bpath[] of NR_END element. - * remove for 2geom - */ -guint -SPCurve::get_length() const -{ -// g_message("SPCurve::get_length must be removed"); - - return _end; -} - /* * Returns the number of segments of all paths summed * This count includes the closing line segment of a closed path. @@ -271,72 +139,21 @@ SPCurve::unref() } /** - * Add space for more paths in curve. - * This function has no meaning for 2geom representation, other than maybe for optimization issues (enlargening the vector for what is to come) - * 2GEOMproof - */ -void -SPCurve::ensure_space(guint space) -{ - g_return_if_fail(this != NULL); - g_return_if_fail(space > 0); - - if (_end + space < _length) - return; - - if (space < SP_CURVE_LENSTEP) - space = SP_CURVE_LENSTEP; - - _bpath = g_renew(NArtBpath, _bpath, _length + space); - - _length += space; -} - -/** - * Create new curve from its own bpath array. - * 2GEOMproof + * Create new curve from this curve's pathvector array. */ SPCurve * SPCurve::copy() const { - return SPCurve::new_from_foreign_bpath(_bpath); + return new SPCurve(_pathv); } /** * Return new curve that is the concatenation of all curves in list. - * 2GEOMified */ SPCurve * SPCurve::concat(GSList const *list) { - gint length = 0; - - for (GSList const *l = list; l != NULL; l = l->next) { - SPCurve *c = (SPCurve *) l->data; - length += c->_end; - } - - SPCurve *new_curve = new SPCurve(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; + SPCurve *new_curve = new SPCurve(); for (GSList const *l = list; l != NULL; l = l->next) { SPCurve *c = (SPCurve *) l->data; @@ -353,61 +170,18 @@ SPCurve::concat(GSList const *list) GSList * SPCurve::split() const { - guint p = 0; GSList *l = NULL; - gint pathnr = 0; - while (p < _end) { - gint i = 1; - while ((_bpath[p + i].code == NR_LINETO) || - (_bpath[p + i].code == NR_CURVETO)) - i++; - SPCurve *new_curve = new SPCurve(i + 1); - memcpy(new_curve->_bpath, _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); - new_curve->_pathv = Geom::PathVector(1, _pathv[pathnr]); - l = g_slist_prepend(l, new_curve); - p += i; - pathnr++; + 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 -static void -tmpl_curve_transform(SPCurve * curve, M const &m) -{ - g_return_if_fail(curve != NULL); - - for (guint 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; - } - } -} - void SPCurve::transform(NR::Matrix const &m) @@ -422,26 +196,15 @@ SPCurve::transform(NR::Matrix const &m) void SPCurve::transform(Geom::Matrix const &m) { - tmpl_curve_transform(this, from_2geom(m)); - _pathv = _pathv * m; } /** * Set curve to empty curve. - * 2GEOMified */ void SPCurve::reset() { - _bpath->code = NR_END; - _end = 0; - _substart = 0; - _hascpt = false; - _posSet = false; - _moving = false; - _closed = false; - _pathv.clear(); } @@ -467,17 +230,10 @@ SPCurve::moveto(Geom::Point const &p) } /** * Perform a moveto to a point, thus starting a new subpath. - * 2GEOMified */ void SPCurve::moveto(NR::Point const &p) { - g_return_if_fail(!_moving); - - _substart = _end; - _hascpt = true; - _posSet = true; - _movePos = p; _pathv.push_back( Geom::Path() ); // for some reason Geom::Path(p) does not work... _pathv.back().start(to_2geom(p)); } @@ -500,61 +256,12 @@ SPCurve::lineto(NR::Point const &p) } /** * Adds a line to the current subpath. - * 2GEOMified */ void SPCurve::lineto(gdouble x, gdouble y) { - g_return_if_fail(_hascpt); - - if (_moving) { - /* fix endpoint */ - g_return_if_fail(!_posSet); - g_return_if_fail(_end > 1); - NArtBpath *bp = _bpath + _end - 1; - g_return_if_fail(bp->code == NR_LINETO); - bp->x3 = x; - bp->y3 = y; - _moving = false; - - Geom::Path::iterator it = _pathv.back().end(); - if ( Geom::LineSegment const *last_line_segment = dynamic_cast( &(*it) )) { - Geom::LineSegment new_seg( *last_line_segment ); - new_seg.setFinal( Geom::Point(x,y) ); - _pathv.back().replace(it, new_seg); - } - } else if (_posSet) { - /* start a new segment */ - ensure_space(2); - NArtBpath *bp = _bpath + _end; - bp->code = NR_MOVETO_OPEN; - bp->setC(3, _movePos); - bp++; - bp->code = NR_LINETO; - bp->x3 = x; - bp->y3 = y; - bp++; - bp->code = NR_END; - _end += 2; - _posSet = false; - _closed = false; - - _pathv.back().appendNew( Geom::Point(x,y) ); - return; - } else { - /* add line */ - - g_return_if_fail(_end > 1); - ensure_space(1); - NArtBpath *bp = _bpath + _end; - bp->code = NR_LINETO; - bp->x3 = x; - bp->y3 = y; - bp++; - bp->code = NR_END; - _end++; - _pathv.back().appendNew( Geom::Point(x,y) ); - } + if (_pathv.empty()) g_message("leeg"); + else _pathv.back().appendNew( Geom::Point(x,y) ); } /** @@ -588,161 +295,29 @@ SPCurve::curveto(NR::Point const &p0, NR::Point const &p1, NR::Point const &p2) void SPCurve::curveto(gdouble x0, gdouble y0, gdouble x1, gdouble y1, gdouble x2, gdouble y2) { - g_return_if_fail(_hascpt); - g_return_if_fail(!_moving); - - if (_posSet) { - /* start a new segment */ - ensure_space(2); - NArtBpath *bp = _bpath + _end; - bp->code = NR_MOVETO_OPEN; - bp->setC(3, _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; - _end += 2; - _posSet = false; - _closed = false; - _pathv.back().appendNew( Geom::Point(x0,y0), Geom::Point(x1,y1), Geom::Point(x2,y2) ); - } else { - /* add curve */ - - g_return_if_fail(_end > 1); - ensure_space(1); - NArtBpath *bp = _bpath + _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; - _end++; - if (_pathv.empty()) g_message("leeg"); - else _pathv.back().appendNew( Geom::Point(x0,y0), Geom::Point(x1,y1), Geom::Point(x2,y2) ); - } + if (_pathv.empty()) g_message("leeg"); + else _pathv.back().appendNew( Geom::Point(x0,y0), Geom::Point(x1,y1), Geom::Point(x2,y2) ); } /** * Close current subpath by possibly adding a line between start and end. - * 2GEOMified */ void SPCurve::closepath() { - g_return_if_fail(_hascpt); - g_return_if_fail(!_posSet); - g_return_if_fail(!_moving); - g_return_if_fail(!_closed); - /* We need at least moveto, curveto, end. */ - g_return_if_fail(_end - _substart > 1); - - { - NArtBpath *bs = _bpath + _substart; - NArtBpath *be = _bpath + _end - 1; - - if (bs->c(3) != be->c(3)) { - lineto(bs->c(3)); - bs = _bpath + _substart; - } - - bs->code = NR_MOVETO; - } - // Inkscape always manually adds the closing line segment to SPCurve with a lineto. - // This lineto is removed in the writing function for NArtBpath, - // so when path is closed and the last segment is a lineto, the closing line segment must really be removed first! - // TODO: fix behavior in Inkscape! - if ( /*Geom::LineSegment const *line_segment = */ dynamic_cast(&_pathv.back().back())) { - _pathv.back().erase_last(); - } _pathv.back().close(true); - _closed = true; - - for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); it++) { - if ( ! it->closed() ) { - _closed = false; - break; - } - } - - for (NArtBpath const *bp = _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) { - _closed = false; - break; - } - } - - _hascpt = false; } -/** Like SPCurve::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. - - 2GEOMified **/ void SPCurve::closepath_current() { - g_return_if_fail(_hascpt); - g_return_if_fail(!_posSet); - g_return_if_fail(!_closed); - /* We need at least moveto, curveto, end. */ - g_return_if_fail(_end - _substart > 1); - - { - NArtBpath *bs = _bpath + _substart; - NArtBpath *be = _bpath + _end - 1; - - be->x3 = bs->x3; - be->y3 = bs->y3; - - bs->code = NR_MOVETO; - } - // Inkscape always manually adds the closing line segment to SPCurve with a lineto. - // This lineto is removed in the writing function for NArtBpath, - // so when path is closed and the last segment is a lineto, the closing line segment must really be removed first! - // TODO: fix behavior in Inkscape! - if ( /*Geom::LineSegment const *line_segment = */ dynamic_cast(&_pathv.back().back())) { - _pathv.back().erase_last(); - } + _pathv.back().setFinal(_pathv.back().initialPoint()); _pathv.back().close(true); - _closed = true; - - for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); it++) { - if ( ! it->closed() ) { - _closed = false; - break; - } - } - - for (NArtBpath const *bp = _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) { - _closed = false; - break; - } - } - - _hascpt = false; - _moving = false; } /** @@ -751,39 +326,28 @@ SPCurve::closepath_current() bool SPCurve::is_empty() const { - bool empty = _pathv.empty(); - - return empty; + return _pathv.empty(); } /** * True iff all subpaths are closed. + * Returns false if the curve is empty. */ bool SPCurve::is_closed() const { - bool closed = true; - for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); it++) { - if ( ! it->closed() ) { - closed = false; - break; + 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 closed; -} - -/** - * Return last subpath or NULL. - */ -NArtBpath const * -SPCurve::last_bpath() const -{ - if (_end == 0) { - return NULL; - } - - return _bpath + _end - 1; } /** @@ -886,19 +450,11 @@ SPCurve::second_point() const } /** - * Return the second-last point of last subpath or _movePos if curve too short. + * TODO: fix comment: Return the second-last point of last subpath or _movePos if curve too short. */ NR::Point SPCurve::penultimate_point() const { - if (_end < 2) { - return _movePos; - } - - NArtBpath *const bpath = _bpath + _end - 2; - g_return_val_if_fail(bpath != NULL, NR::Point(0, 0)); - - Geom::Curve const& back = _pathv.back().back_default(); Geom::Point p = back.initialPoint(); return from_2geom(p); @@ -917,126 +473,32 @@ SPCurve::last_point() const return from_2geom( _pathv.back().finalPoint() ); } -inline static bool -is_moveto(NRPathcode const c) -{ - return c == NR_MOVETO || c == NR_MOVETO_OPEN; -} - /** * 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 - * 2GEOMified **/ SPCurve * SPCurve::create_reverse() const { - /* We need at least moveto, curveto, end. */ - g_return_val_if_fail(_end - _substart > 1, NULL); - - NArtBpath const *be = _bpath + _end - 1; - - g_assert(is_moveto(_bpath[_substart].code)); - g_assert(is_moveto(_bpath[0].code)); - g_assert((be+1)->code == NR_END); - - SPCurve *new_curve = new SPCurve(_length); - new_curve->moveto(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 == _bpath) { - return new_curve; - } - new_curve->moveto((bp-1)->c(3)); - break; - - case NR_LINETO: - new_curve->lineto((bp-1)->c(3)); - break; - - case NR_CURVETO: - new_curve->curveto(bp->c(2), bp->c(1), (bp-1)->c(3)); - break; + SPCurve *new_curve = new SPCurve(Geom::reverse_paths_and_order(_pathv)); - default: - g_assert_not_reached(); - } - } - - new_curve->_pathv = Geom::reverse_paths_and_order(_pathv); + return new_curve; } /** * 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. - * 2GEOMified */ void SPCurve::append(SPCurve const *curve2, bool use_lineto) { - g_return_if_fail(curve2 != NULL); - if (curve2->is_empty()) return; - if (curve2->_end < 1) - return; - - NArtBpath const *bs = curve2->_bpath; - - bool closed = this->_closed; - - for (NArtBpath const *bp = bs; bp->code != NR_END; bp++) { - switch (bp->code) { - case NR_MOVETO_OPEN: - if (use_lineto && _hascpt) { - lineto(bp->x3, bp->y3); - use_lineto = false; - } else { - if (closed && _hascpt) closepath(); - moveto(bp->x3, bp->y3); - } - closed = false; - break; - - case NR_MOVETO: - if (use_lineto && _hascpt) { - lineto(bp->x3, bp->y3); - use_lineto = FALSE; - } else { - if (closed && _hascpt) closepath(); - moveto(bp->x3, bp->y3); - } - closed = true; - break; - - case NR_LINETO: - lineto(bp->x3, bp->y3); - break; - case NR_CURVETO: - curveto(bp->x1, bp->y1, bp->x2, bp->y2, bp->x3, bp->y3); - break; - - case NR_END: - g_assert_not_reached(); - } - } - - if (closed) { - closepath(); - } - - /* 2GEOM code when code above is removed: if (use_lineto) { Geom::PathVector::const_iterator it = curve2->_pathv.begin(); if ( ! _pathv.empty() ) { @@ -1055,63 +517,51 @@ SPCurve::append(SPCurve const *curve2, _pathv.push_back( (*it) ); } } - */ } /** - * Append \a c1 to \a this with possible fusing of close endpoints. - * 2GEOMproof. Needs to be recoded when NArtBpath is no longer there. Right now, it applies the same changes to bpath and pathv depending on bpath + * 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. */ SPCurve * SPCurve::append_continuous(SPCurve const *c1, gdouble tolerance) { + using Geom::X; + using Geom::Y; + g_return_val_if_fail(c1 != NULL, NULL); - g_return_val_if_fail(!_closed, NULL); - g_return_val_if_fail(!c1->_closed, NULL); + if ( this->is_closed() || c1->is_closed() ) { + return NULL; + } - if (c1->_end < 1) { + if (c1->is_empty()) { return this; } - NArtBpath const *be = last_bpath(); - if (be) { - NArtBpath const *bs = c1->get_bpath(); - 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) closepath(); - moveto(bs->x3, bs->y3); - closed = false; - break; - case NR_MOVETO: - if (closed) closepath(); - moveto(bs->x3, bs->y3); - closed = true; - break; - case NR_LINETO: - lineto(bs->x3, bs->y3); - break; - case NR_CURVETO: - curveto(bs->x1, bs->y1, bs->x2, bs->y2, bs->x3, bs->y3); - break; - case NR_END: - g_assert_not_reached(); - } - } - } else { - append(c1, TRUE); + if (this->is_empty()) { + _pathv = c1->_pathv; + return this; + } + + 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) ); } + } else { - append(c1, TRUE); + append(c1, false); } return this; @@ -1120,7 +570,6 @@ SPCurve::append_continuous(SPCurve const *c1, gdouble tolerance) /** * Remove last segment of curve. * (Only used once in /src/pen-context.cpp) - * 2GEOMified */ void SPCurve::backspace() @@ -1128,168 +577,14 @@ SPCurve::backspace() if ( is_empty() ) return; - if (_end > 0) { - _end -= 1; - if (_end > 0) { - NArtBpath *bp = _bpath + _end - 1; - if ((bp->code == NR_MOVETO) || - (bp->code == NR_MOVETO_OPEN) ) - { - _hascpt = true; - _posSet = true; - _closed = false; - _movePos = bp->c(3); - _end -= 1; - } - } - _bpath[_end].code = NR_END; - } - if ( !_pathv.back().empty() ) { _pathv.back().erase_last(); _pathv.back().close(false); } } -/* Private methods */ - -/** - * Returns index of first NR_END bpath in array. - */ -static unsigned sp_bpath_length(NArtBpath const bpath[]) -{ - g_return_val_if_fail(bpath != NULL, FALSE); - - unsigned ret = 0; - while ( bpath[ret].code != NR_END ) { - ++ret; - } - ++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. - */ -static bool sp_bpath_closed(NArtBpath const bpath[]) -{ - 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; - } - } - - return true; -} - -/** - * Returns length of bezier segment. - */ -static double -bezier_len(NR::Point const &c0, - NR::Point const &c1, - NR::Point const &c2, - NR::Point const &c3, - double const threshold) -{ - /** \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]); - } - } - return ret; -} - -/** - * Returns total length of curve, excluding length of closepath segments. - */ -double -sp_curve_distance_including_space(SPCurve const *const curve, double seg2len[]) -{ - g_return_val_if_fail(curve != NULL, 0.); - - double ret = 0.0; - - if ( curve->_bpath->code == NR_END ) { - return ret; - } - - NR::Point prev(curve->_bpath->c(3)); - for (guint 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; - } - seg2len[i - 1] = seg_len; - ret += seg_len; - prev = p.c(3); - } - g_assert(!(ret < 0)); - return ret; -} - -/** - * Like sp_curve_distance_including_space(), but ensures that the - * result >= 1e-18: uses 1 per segment if necessary. - */ -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; - } -} - /** - * 2GEOMified + * TODO: add comments about what this method does and what assumptions are made and requirements are put on SPCurve */ void SPCurve::stretch_endpoints(NR::Point const &new_p0, NR::Point const &new_p1) @@ -1297,41 +592,9 @@ SPCurve::stretch_endpoints(NR::Point const &new_p0, NR::Point const &new_p1) if (is_empty()) { return; } - g_assert(unsigned(SP_CURVE_LENGTH(this)) + 1 == sp_bpath_length(_bpath)); - unsigned const nSegs = SP_CURVE_LENGTH(this) - 1; - g_assert(nSegs != 0); - double *const seg2len = new double[nSegs]; - double const tot_len = sp_curve_nonzero_distance_including_space(this, seg2len); + NR::Point const offset0( new_p0 - first_point() ); NR::Point const offset1( new_p1 - last_point() ); - _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 = _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(_bpath[nSegs].c(3) - new_p1) < 1.); - /* Explicit set for better numerical properties. */ - _bpath[nSegs].setC(3, new_p1); - delete [] seg2len; Geom::Piecewise > pwd2 = _pathv.front().toPwSb(); Geom::Piecewise arclength = Geom::arcLengthSb(pwd2); @@ -1351,7 +614,6 @@ SPCurve::stretch_endpoints(NR::Point const &new_p0, NR::Point const &new_p1) /** * sets start of first path to new_p0, and end of first path to new_p1 - * 2GEOMified */ void SPCurve::move_endpoints(NR::Point const &new_p0, NR::Point const &new_p1) @@ -1359,30 +621,16 @@ SPCurve::move_endpoints(NR::Point const &new_p0, NR::Point const &new_p1) if (is_empty()) { return; } - unsigned const nSegs = SP_CURVE_LENGTH(this) - 1; - g_assert(nSegs != 0); - - _bpath->setC(3, new_p0); - _bpath[nSegs].setC(3, new_p1); - _pathv.front().setInitial(to_2geom(new_p0)); _pathv.front().setFinal(to_2geom(new_p1)); } /** * returns the number of nodes in a path, used for statusbar text when selecting an spcurve. - * 2GEOMified */ guint SPCurve::nodes_in_path() const { - gint r = _end; - gint i = _length - 1; - if (i > r) i = r; // sometimes after switching from node editor length is wrong, e.g. f6 - draw - f2 - tab - f1, this fixes it - for (; i >= 0; i --) - if (_bpath[i].code == NR_MOVETO) - r --; - guint nr = 0; for(Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); ++it) { nr += (*it).size(); @@ -1390,12 +638,11 @@ SPCurve::nodes_in_path() const 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 } - return r; + return nr; } /** * Adds p to the last point (and last handle if present) of the last path - * 2GEOMified */ void SPCurve::last_point_additive_move(Geom::Point const & p) @@ -1403,17 +650,6 @@ SPCurve::last_point_additive_move(Geom::Point const & p) if (is_empty()) { return; } - if (_end == 0) { - return; - } - NArtBpath * path = _bpath + _end - 1; - - if (path->code == NR_CURVETO) { - path->x2 += p[Geom::X]; - path->y2 += p[Geom::Y]; - } - path->x3 += p[Geom::X]; - path->y3 += p[Geom::Y]; _pathv.back().setFinal( _pathv.back().finalPoint() + p ); diff --git a/src/display/curve.h b/src/display/curve.h index b2b1559af..ce0ae8ba1 100644 --- a/src/display/curve.h +++ b/src/display/curve.h @@ -21,7 +21,6 @@ #include <2geom/forward.h> #include "libnr/nr-forward.h" -#include "libnr/nr-rect.h" #define SP_CURVE_LENSTEP 32 @@ -33,8 +32,6 @@ public: /* Constructors */ explicit SPCurve(guint length = SP_CURVE_LENSTEP); explicit SPCurve(Geom::PathVector const& pathv); - static SPCurve * new_from_bpath(NArtBpath *bpath); - static SPCurve * new_from_foreign_bpath(NArtBpath const *bpath); static SPCurve * new_from_rect(Geom::Rect const &rect); virtual ~SPCurve(); @@ -43,8 +40,8 @@ public: NArtBpath const * get_bpath() const; Geom::PathVector const & get_pathvector() const; - guint get_length() const; guint get_segment_count() const; + guint nodes_in_path() const; SPCurve * ref(); SPCurve * unref(); @@ -76,7 +73,6 @@ public: bool is_empty() const; bool is_closed() const; - NArtBpath const * last_bpath() const; Geom::Curve const * last_segment() const; Geom::Path const * last_path() const; Geom::Curve const * first_segment() const; @@ -85,7 +81,6 @@ public: NR::Point last_point() const; NR::Point second_point() const; NR::Point penultimate_point() const; - guint nodes_in_path() const; void append(SPCurve const *curve2, bool use_lineto); SPCurve * create_reverse() const; @@ -93,63 +88,17 @@ public: static SPCurve * concat(GSList const *list); - void ensure_space(guint space); - protected: gint _refcount; - NArtBpath *_bpath; Geom::PathVector _pathv; - /// Index in bpath[] of NR_END element. - guint _end; - - /// Allocated size (i.e., capacity) of bpath[] array. Not to be confused - /// with the SP_CURVE_LENGTH macro, which returns the logical length of - /// the path (i.e., index of NR_END). - guint _length; - - /// Index in bpath[] of the start (i.e., moveto element) of the last - /// subpath in this path. - guint _substart; - - /// Previous moveto position. - /// \note This is used for coalescing moveto's, whereas if we're to - /// conform to the SVG spec then we mustn't coalesce movetos if we have - /// midpoint markers. Ref: - /// http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes - /// (first subitem of the item about zero-length path segments) - NR::Point _movePos; - - /// True iff current point is defined. Initially false for a new curve; - /// becomes true after moveto; becomes false on closepath. Curveto, - /// lineto etc. require hascpt; hascpt remains true after lineto/curveto. - bool _hascpt : 1; - - /// True iff previous was moveto. - bool _posSet : 1; - - /// True iff bpath end is moving. - bool _moving : 1; - - /// True iff all subpaths are closed. - bool _closed : 1; - private: // Don't implement these: SPCurve(const SPCurve&); SPCurve& operator=(const SPCurve&); - -//friends: - friend double sp_curve_distance_including_space(SPCurve const *const curve, double seg2len[]); - friend double sp_curve_nonzero_distance_including_space(SPCurve const *const curve, double seg2len[]); - template friend void tmpl_curve_transform(SPCurve * curve, M const &m); }; -#define SP_CURVE_LENGTH(c) (((SPCurve const *)(c))->get_length()) -#define SP_CURVE_BPATH(c) (((SPCurve const *)(c))->get_bpath()) - - #endif /* !SEEN_DISPLAY_CURVE_H */ /* diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index c928d43d3..2c4151e8c 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -711,7 +711,7 @@ NArtBpath const* Inkscape::ObjectSnapper::_getBorderBPath() const Geom::Rect const border_rect = Geom::Rect(Geom::Point(0,0), Geom::Point(sp_document_width(_named_view->document),sp_document_height(_named_view->document))); SPCurve const *border_curve = SPCurve::new_from_rect(border_rect); if (border_curve) { - border_bpath = SP_CURVE_BPATH(border_curve); + border_bpath = BPath_from_2GeomPath(border_curve->get_pathvector()); } return border_bpath; diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 4533ad9c6..42fb45109 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include "livarot/Path.h" #include "livarot/Shape.h" @@ -1777,7 +1778,7 @@ bpath_for_curve(SPItem *item, SPCurve *curve, bool doTransformation, bool transf if (curve == NULL) return NULL; - NArtBpath const *bpath = SP_CURVE_BPATH(curve); + NArtBpath *bpath = BPath_from_2GeomPath(curve->get_pathvector()); if (bpath == NULL) { return NULL; } @@ -1793,6 +1794,7 @@ bpath_for_curve(SPItem *item, SPCurve *curve, bool doTransformation, bool transf new_bpath = nr_artpath_affine(bpath, NR::identity()); } + g_free(bpath); return new_bpath; }