![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0795ddbdb240c606e9ee80cd429a639ffe8037aa..789e5ea346878159e2cb150c191d41ce33fbdf0b 100644 (file)
#include <signal.h>
#include <errno.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/hvlinesegment.h>
+#include "helper/geom-curves.h"
-#include "libnr/nr-matrix.h"
-#include "libnr/nr-matrix-ops.h"
-#include "libnr/nr-matrix-scale-ops.h"
-#include "libnr/nr-matrix-translate-ops.h"
-#include "libnr/nr-scale-translate-ops.h"
-#include "libnr/nr-translate-scale-ops.h"
-#include <libnr/nr-matrix-fns.h>
-
-
-#include "libnr/n-art-bpath.h"
#include "sp-item.h"
-
#include "style.h"
#include "latex-pstricks.h"
os << "\\begin{pspicture}(" << sp_document_width(doc) << "," << sp_document_height(doc) << ")\n";
}
- m_tr_stack.push( NR::scale(1, -1) * NR::translate(0, sp_document_height(doc)));
+ m_tr_stack.push( Geom::Scale(1, -1) * Geom::Translate(0, sp_document_height(doc)));
return fprintf(_stream, "%s", os.str().c_str());
}
}
unsigned int
-PrintLatex::bind(Inkscape::Extension::Print *mod, NR::Matrix const *transform, float opacity)
+PrintLatex::bind(Inkscape::Extension::Print *mod, Geom::Matrix const *transform, float opacity)
{
- NR::Matrix tr = *transform;
+ Geom::Matrix tr = *transform;
if(m_tr_stack.size()){
- NR::Matrix tr_top = m_tr_stack.top();
+ Geom::Matrix tr_top = m_tr_stack.top();
m_tr_stack.push(tr * tr_top);
}else
m_tr_stack.push(tr);
unsigned int
PrintLatex::fill(Inkscape::Extension::Print *mod,
- NRBPath const *bpath, NR::Matrix const *transform, SPStyle const *style,
- NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
+ Geom::PathVector const &pathv, Geom::Matrix const *transform, SPStyle const *style,
+ NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
{
if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
os << "\\pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]\n{\n";
- print_bpath(os, bpath->path, transform);
+ print_pathvector(os, pathv, transform);
os << "}\n}\n";
}
unsigned int
-PrintLatex::stroke (Inkscape::Extension::Print *mod, const NRBPath *bpath, const NR::Matrix *transform, const SPStyle *style,
+PrintLatex::stroke (Inkscape::Extension::Print *mod, Geom::PathVector const &pathv, const Geom::Matrix *transform, const SPStyle *style,
const NRRect *pbox, const NRRect *dbox, const NRRect *bbox)
{
if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
@@ -236,8 +230,8 @@ PrintLatex::stroke (Inkscape::Extension::Print *mod, const NRBPath *bpath, const
if (style->stroke.isColor()) {
Inkscape::SVGOStringStream os;
float rgb[3];
- NR::Matrix tr_stack = m_tr_stack.top();
- double const scale = expansion(tr_stack);
+ Geom::Matrix tr_stack = m_tr_stack.top();
+ double const scale = tr_stack.descrim();
os.setf(std::ios::fixed);
sp_color_get_rgb_floatv(&style->stroke.value.color, rgb);
@@ -260,7 +254,7 @@ PrintLatex::stroke (Inkscape::Extension::Print *mod, const NRBPath *bpath, const
os <<"]\n{\n";
- print_bpath(os, bpath->path, transform);
+ print_pathvector(os, pathv, transform);
os << "}\n}\n";
@@ -270,61 +264,57 @@ PrintLatex::stroke (Inkscape::Extension::Print *mod, const NRBPath *bpath, const
return 0;
}
+// FIXME: why is 'transform' argument not used?
void
-PrintLatex::print_bpath(SVGOStringStream &os, const NArtBpath *bp, const NR::Matrix *transform)
+PrintLatex::print_pathvector(SVGOStringStream &os, Geom::PathVector const &pathv_in, const Geom::Matrix * /*transform*/)
{
- unsigned int closed;
- NR::Matrix tf=*transform;
- NR::Matrix tf_stack=m_tr_stack.top();
+ if (pathv_in.empty())
+ return;
+
+// Geom::Matrix tf=*transform; // why was this here?
+ Geom::Matrix tf_stack=m_tr_stack.top(); // and why is transform argument not used?
+ Geom::PathVector pathv = pathv_in * tf_stack; // generates new path, which is a bit slow, but this doesn't have to be performance optimized
os << "\\newpath\n";
- closed = FALSE;
- while (bp->code != NR_END) {
- using NR::X;
- using NR::Y;
-
-// NR::Point const p1(bp->c(1) * tf);
-// NR::Point const p2(bp->c(2) * tf);
-// NR::Point const p3(bp->c(3) * tf);
-
- NR::Point const p1(bp->c(1) * tf_stack);
- NR::Point const p2(bp->c(2) * tf_stack);
- NR::Point const p3(bp->c(3) * tf_stack);
-
- double const x1 = p1[X], y1 = p1[Y];
- double const x2 = p2[X], y2 = p2[Y];
- double const x3 = p3[X], y3 = p3[Y];
-
- switch (bp->code) {
- case NR_MOVETO:
- if (closed) {
- os << "\\closepath\n";
- }
- closed = TRUE;
- os << "\\moveto(" << x3 << "," << y3 << ")\n";
- break;
- case NR_MOVETO_OPEN:
- if (closed) {
- os << "\\closepath\n";
- }
- closed = FALSE;
- os << "\\moveto(" << x3 << "," << y3 << ")\n";
- break;
- case NR_LINETO:
- os << "\\lineto(" << x3 << "," << y3 << ")\n";
- break;
- case NR_CURVETO:
- os << "\\curveto(" << x1 << "," << y1 << ")("
- << x2 << "," << y2 << ")("
- << x3 << "," << y3 << ")\n";
- break;
- default:
- break;
+
+ for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) {
+
+ os << "\\moveto(" << it->initialPoint()[Geom::X] << "," << it->initialPoint()[Geom::Y] << ")\n";
+
+ for(Geom::Path::const_iterator cit = it->begin(); cit != it->end_open(); ++cit) {
+ print_2geomcurve(os, *cit);
}
- bp += 1;
+
+ if (it->closed()) {
+ os << "\\closepath\n";
+ }
+
}
- if (closed) {
- os << "\\closepath\n";
+}
+
+void
+PrintLatex::print_2geomcurve(SVGOStringStream &os, Geom::Curve const & c )
+{
+ using Geom::X;
+ using Geom::Y;
+
+ if( is_straight_curve(c) )
+ {
+ os << "\\lineto(" << c.finalPoint()[X] << "," << c.finalPoint()[Y] << ")\n";
+ }
+ else if(Geom::CubicBezier const *cubic_bezier = dynamic_cast<Geom::CubicBezier const*>(&c)) {
+ std::vector<Geom::Point> points = cubic_bezier->points();
+ os << "\\curveto(" << points[1][X] << "," << points[1][Y] << ")("
+ << points[2][X] << "," << points[2][Y] << ")("
+ << points[3][X] << "," << points[3][Y] << ")\n";
+ }
+ else {
+ //this case handles sbasis as well as all other curve types
+ Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1);
+
+ for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) {
+ print_2geomcurve(os, *iter);
+ }
}
}