![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/display/curve.h b/src/display/curve.h
index 5cd8bb12cadd1b04ca241308b3d890340e049b07..79a385b09f2a9e5eee526e8e6a269b10077d90b8 100644 (file)
--- a/src/display/curve.h
+++ b/src/display/curve.h
#define SEEN_DISPLAY_CURVE_H
/** \file
- * Wrapper around an array of NArtBpath objects.
+ * Wrapper around a Geom::PathVector objects.
*
* Author:
* Lauris Kaplinski <lauris@kaplinski.com>
#include <glib/gtypes.h>
#include <glib/gslist.h>
-#include "libnr/nr-forward.h"
-#include "libnr/nr-rect.h"
+#include <2geom/forward.h>
-#define SP_CURVE_LENSTEP 32
+#include <boost/optional.hpp>
-/// Wrapper around NArtBpath.
class SPCurve {
public:
/* Constructors */
- SPCurve(guint length = SP_CURVE_LENSTEP);
- static SPCurve * new_from_bpath(NArtBpath *bpath);
- static SPCurve * new_from_foreign_bpath(NArtBpath const *bpath);
- static SPCurve * new_from_rect(NR::Maybe<NR::Rect> const &rect);
+ explicit SPCurve();
+ explicit SPCurve(Geom::PathVector const& pathv);
+ static SPCurve * new_from_rect(Geom::Rect const &rect);
virtual ~SPCurve();
- void set_bpath(NArtBpath * new_bpath);
- NArtBpath const * get_bpath() const;
-
- /// 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;
+ void set_pathvector(Geom::PathVector const & new_pathv);
+ Geom::PathVector const & get_pathvector() const;
SPCurve * ref();
SPCurve * unref();
SPCurve * copy() const;
- GSList * split() const;
- void transform(NR::Matrix const &);
- void transform(NR::translate const &);
- void stretch_endpoints(NR::Point const &, NR::Point const &);
- void move_endpoints(NR::Point const &, NR::Point const &);
+ guint get_segment_count() const;
+ guint nodes_in_path() const;
+
+ bool is_empty() const;
+ bool is_closed() const;
+ Geom::Curve const * last_segment() const;
+ Geom::Path const * last_path() const;
+ Geom::Curve const * first_segment() const;
+ Geom::Path const * first_path() const;
+ boost::optional<Geom::Point> first_point() const;
+ boost::optional<Geom::Point> last_point() const;
+ boost::optional<Geom::Point> second_point() const;
+ boost::optional<Geom::Point> penultimate_point() const;
void reset();
- void moveto(NR::Point const &p);
+ void moveto(Geom::Point const &p);
void moveto(gdouble x, gdouble y);
- void lineto(NR::Point const &p);
+ void lineto(Geom::Point const &p);
void lineto(gdouble x, gdouble y);
- void lineto_moving(gdouble x, gdouble y);
- void curveto(NR::Point const &p0, NR::Point const &p1, NR::Point const &p2);
+ void quadto(Geom::Point const &p1, Geom::Point const &p2);
+ void quadto(gdouble x1, gdouble y1, gdouble x2, gdouble y2);
+ void curveto(Geom::Point const &p0, Geom::Point const &p1, Geom::Point const &p2);
void curveto(gdouble x0, gdouble y0, gdouble x1, gdouble y1, gdouble x2, gdouble y2);
void closepath();
void closepath_current();
+ void backspace();
- SPCurve * append_continuous(SPCurve const *c1, gdouble tolerance);
-
- bool is_empty() const;
- bool is_closed() const;
- NArtBpath * last_bpath() const;
- NArtBpath * first_bpath() const;
- NR::Point first_point() const;
- NR::Point last_point() const;
- NR::Point second_point() const;
- NR::Point penultimate_point() const;
+ void transform(Geom::Matrix const &m);
+ void stretch_endpoints(Geom::Point const &, Geom::Point const &);
+ void move_endpoints(Geom::Point const &, Geom::Point const &);
+ void last_point_additive_move(Geom::Point const & p);
void append(SPCurve const *curve2, bool use_lineto);
+ SPCurve * append_continuous(SPCurve const *c1, gdouble tolerance);
SPCurve * create_reverse() const;
- void backspace();
+ GSList * split() const;
static SPCurve * concat(GSList const *list);
- void ensure_space(guint space);
-
protected:
gint _refcount;
- NArtBpath *_bpath;
+ Geom::PathVector _pathv;
private:
// Don't implement these:
SPCurve(const SPCurve&);
SPCurve& operator=(const SPCurve&);
-
- 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<class M> friend void tmpl_curve_transform(SPCurve *const curve, M const &m);
};
-#define SP_CURVE_LENGTH(c) (((SPCurve const *)(c))->_end)
-#define SP_CURVE_BPATH(c) ((c)->get_bpath())
-#define SP_CURVE_SEGMENT(c,i) ((c)->get_bpath() + (i))
-
#endif /* !SEEN_DISPLAY_CURVE_H */
/*
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :