![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index f9b65875acf0b11086975c5d97128082f957c567..c7f8e3d4cb93f66207638057385d990ba09282aa 100644 (file)
-/** \file
- * Enhanced Metafile Printing.
+/** @file
+ * @brief Enhanced Metafile printing
*/
-/*
- * Authors:
+/* Authors:
* Ulf Erikson <ulferikson@users.sf.net>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
- * Copyright (C) 2006-2008 Authors
+ * Copyright (C) 2006-2009 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
# include "config.h"
#endif
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-point-matrix-ops.h"
-#include "libnr/nr-rect.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/nr-pixblock.h"
-#include <libnr/n-art-bpath-2geom.h>
-#include "display/canvas-bpath.h"
+//#include <string.h>
+//#include <signal.h>
+//#include <errno.h>
+
+#include <2geom/pathvector.h>
+#include <2geom/rect.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/hvlinesegment.h>
+#include "helper/geom.h"
+#include "helper/geom-curves.h"
+//#include "display/canvas-bpath.h"
#include "sp-item.h"
-#include "glib.h"
-#include "gtk/gtkdialog.h"
-#include "gtk/gtkbox.h"
-#include "gtk/gtkstock.h"
+//#include "glib.h"
+//#include "gtk/gtkdialog.h"
+//#include "gtk/gtkbox.h"
+//#include "gtk/gtkstock.h"
-#include "glibmm/i18n.h"
-#include "enums.h"
-#include "document.h"
+//#include "glibmm/i18n.h"
+//#include "enums.h"
+//#include "document.h"
#include "style.h"
-#include "sp-paint-server.h"
-#include "inkscape_version.h"
+//#include "sp-paint-server.h"
+#include "inkscape-version.h"
+
+//#include "libnrtype/FontFactory.h"
+//#include "libnrtype/font-instance.h"
+//#include "libnrtype/font-style-to-pos.h"
-#include "libnrtype/FontFactory.h"
-#include "libnrtype/font-instance.h"
-#include "libnrtype/font-style-to-pos.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
#include "win32.h"
#include "emf-win32-print.h"
#include "unit-constants.h"
-#include "extension/extension.h"
+//#include "extension/extension.h"
#include "extension/system.h"
#include "extension/print.h"
-#include "io/sys.h"
-
-#include "macros.h"
+//#include "io/sys.h"
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+//#include "macros.h"
namespace Inkscape {
namespace Extension {
hbrush(NULL),
hbrushOld(NULL),
hpen(NULL),
- fill_path(NULL),
stroke_and_fill(false),
fill_only(false),
simple_shape(false)
unsigned int
-PrintEmfWin32::setup (Inkscape::Extension::Print *mod)
+PrintEmfWin32::setup (Inkscape::Extension::Print * /*mod*/)
{
return TRUE;
}
WCHAR *unicode_uri = (WCHAR *) unicode_fn;
// width and height in px
- _width = sp_document_width(doc);
- _height = sp_document_height(doc);
+ _width = doc->getWidth();
+ _height = doc->getHeight();
NRRect d;
bool pageBoundingBox;
d.x1 = _width;
d.y1 = _height;
} else {
- SPItem* doc_item = SP_ITEM(sp_document_root(doc));
- sp_item_invoke_bbox(doc_item, &d, sp_item_i2r_affine(doc_item), TRUE);
+ SPItem* doc_item = SP_ITEM(doc->getRoot());
+ doc_item->invoke_bbox(&d, doc_item->i2d_affine(), TRUE);
}
d.x0 *= IN_PER_PX;
CHAR buff[1024];
ZeroMemory(buff, sizeof(buff));
- snprintf(buff, sizeof(buff)-1, "Inkscape %s (%s)", INKSCAPE_VERSION, __DATE__);
+ snprintf(buff, sizeof(buff)-1, "Inkscape %s (%s)", Inkscape::version_string, __DATE__);
INT len = strlen(buff);
CHAR *p1 = strrchr(ansi_uri, '\\');
CHAR *p2 = strrchr(ansi_uri, '/');
g_free(local_fn);
g_free(unicode_fn);
- m_tr_stack.push( Geom::Scale(1, -1) * Geom::Translate(0, sp_document_height(doc)));
+ m_tr_stack.push( Geom::Scale(1, -1) * Geom::Translate(0, doc->getHeight()));
return 0;
}
unsigned int
-PrintEmfWin32::finish (Inkscape::Extension::Print *mod)
+PrintEmfWin32::finish (Inkscape::Extension::Print * /*mod*/)
{
if (!hdc) return 0;
unsigned int
-PrintEmfWin32::comment (Inkscape::Extension::Print * module,
- const char *comment)
+PrintEmfWin32::comment (Inkscape::Extension::Print * /*module*/,
+ const char * /*comment*/)
{
if (!hdc) return 0;
void
-PrintEmfWin32::create_pen(SPStyle const *style, const Geom::Matrix *transform)
+PrintEmfWin32::create_pen(SPStyle const *style, const Geom::Matrix &transform)
{
if (style) {
float rgb[3];
sp_color_get_rgb_floatv(&style->stroke.value.color, rgb);
- LOGBRUSH lb = {0};
+ LOGBRUSH lb;
+ ZeroMemory(&lb, sizeof(lb));
lb.lbStyle = BS_SOLID;
lb.lbColor = RGB( 255*rgb[0], 255*rgb[1], 255*rgb[2] );
@@ -332,17 +327,14 @@ PrintEmfWin32::create_pen(SPStyle const *style, const Geom::Matrix *transform)
int linejoin = 0;
DWORD n_dash = 0;
DWORD *dash = NULL;
- float oldmiterlimit;
using Geom::X;
using Geom::Y;
- Geom::Matrix tf = *transform;
-
Geom::Point zero(0, 0);
Geom::Point one(1, 1);
- Geom::Point p0(zero * tf);
- Geom::Point p1(one * tf);
+ Geom::Point p0(zero * transform);
+ Geom::Point p1(one * transform);
Geom::Point p(p1 - p0);
double scale = sqrt( (p[X]*p[X]) + (p[Y]*p[Y]) ) / sqrt(2);
@@ -415,12 +407,18 @@ PrintEmfWin32::create_pen(SPStyle const *style, const Geom::Matrix *transform)
hpenOld = (HPEN) SelectObject( hdc, hpen );
if (linejoin == PS_JOIN_MITER) {
+ float oldmiterlimit;
float miterlimit = style->stroke_miterlimit.value;
+
+ miterlimit = miterlimit * 10.0 / 4.0;
if (miterlimit < 1)
- miterlimit = 4.0;
+ miterlimit = 10.0;
+
+ miterlimit = miterlimit * IN_PER_PX * dwDPI;
+
SetMiterLimit(
hdc,
- miterlimit * IN_PER_PX * dwDPI,
+ miterlimit,
&oldmiterlimit );
}
void
PrintEmfWin32::flush_fill()
{
- if (fill_path) {
+ if (!fill_pathv.empty()) {
stroke_and_fill = false;
fill_only = true;
- print_bpath(fill_path, fill_transform);
+ print_pathv(fill_pathv, fill_transform);
fill_only = false;
if (!simple_shape)
FillPath( hdc );
destroy_brush();
- delete[] fill_path;
- fill_path = NULL;
- }
-}
-
-
-NArtBpath *
-PrintEmfWin32::copy_bpath(const NArtBpath *bp)
-{
- NArtBpath *tmp = (NArtBpath *) bp;
- int num = 1;
-
- while (tmp->code != NR_END) {
- num++;
- tmp += 1;
- }
-
- tmp = new NArtBpath[num];
- while (num--) {
- tmp[num] = bp[num];
+ fill_pathv.clear();
}
-
- return tmp;
-}
-
-
-int
-PrintEmfWin32::cmp_bpath(const NArtBpath *bp1, const NArtBpath *bp2)
-{
- if (!bp1 || !bp2) {
- return 1;
- }
-
- while (bp1->code != NR_END && bp2->code != NR_END) {
- if (bp1->code != bp2->code) {
- return 1;
- }
-
- if ( fabs(bp1->x1 - bp2->x1) > 0.00000001 ||
- fabs(bp1->y1 - bp2->y1) > 0.00000001 ||
- fabs(bp1->x2 - bp2->x2) > 0.00000001 ||
- fabs(bp1->y2 - bp2->y2) > 0.00000001 ||
- fabs(bp1->x3 - bp2->x3) > 0.00000001 ||
- fabs(bp1->y3 - bp2->y3) > 0.00000001 )
- {
- return 1;
- }
-
- bp1 += 1;
- bp2 += 1;
- }
-
- return bp1->code != NR_END || bp2->code != NR_END;
}
unsigned int
-PrintEmfWin32::bind(Inkscape::Extension::Print *mod, Geom::Matrix const *transform, float opacity)
+PrintEmfWin32::bind(Inkscape::Extension::Print * /*mod*/, Geom::Matrix const *transform, float /*opacity*/)
{
Geom::Matrix tr = *transform;
@@ -527,16 +474,16 @@ PrintEmfWin32::bind(Inkscape::Extension::Print *mod, Geom::Matrix const *transfo
}
unsigned int
-PrintEmfWin32::release(Inkscape::Extension::Print *mod)
+PrintEmfWin32::release(Inkscape::Extension::Print * /*mod*/)
{
m_tr_stack.pop();
return 1;
}
unsigned int
-PrintEmfWin32::fill(Inkscape::Extension::Print *mod,
- Geom::PathVector const &pathv, Geom::Matrix const *transform, SPStyle const *style,
- NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
+PrintEmfWin32::fill(Inkscape::Extension::Print * /*mod*/,
+ Geom::PathVector const &pathv, Geom::Matrix const * /*transform*/, SPStyle const *style,
+ NRRect const * /*pbox*/, NRRect const * /*dbox*/, NRRect const * /*bbox*/)
{
if (!hdc) return 0;
return 0;
}
- NArtBpath * bpath = BPath_from_2GeomPath(pathv);
- fill_path = copy_bpath( bpath );
- g_free(bpath);
+ fill_pathv.clear();
+ std::copy(pathv.begin(), pathv.end(), std::back_inserter(fill_pathv));
fill_transform = tf;
// postpone fill in case of stroke-and-fill
unsigned int
-PrintEmfWin32::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)
+PrintEmfWin32::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 (!hdc) return 0;
Geom::Matrix tf = m_tr_stack.top();
- NArtBpath * bpath = BPath_from_2GeomPath(pathv);
-
- stroke_and_fill = ( cmp_bpath( bpath, fill_path ) == 0 );
+ stroke_and_fill = ( pathv == fill_pathv );
if (!stroke_and_fill) {
flush_fill(); // flush any pending fills
}
if (style->stroke.isColor()) {
- create_pen(style, &tf);
+ create_pen(style, tf);
} else {
- // create_pen(NULL, &tf);
+ // create_pen(NULL, tf);
return 0;
}
- print_bpath(bpath, tf);
+ print_pathv(pathv, tf);
if (stroke_and_fill) {
if (!simple_shape)
StrokeAndFillPath( hdc );
destroy_brush();
- delete[] fill_path;
- fill_path = NULL;
+ fill_pathv.clear();
} else {
if (!simple_shape)
StrokePath( hdc );
}
- g_free(bpath);
destroy_pen();
return 0;
bool
-PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &transform)
+PrintEmfWin32::print_simple_shape(Geom::PathVector const &pathv, const Geom::Matrix &transform)
{
- NR::Matrix tf = transform;
- const NArtBpath *bp = bpath;
+ Geom::PathVector pv = pathv_to_linear_and_cubic_beziers( pathv * transform );
int nodes = 0;
int moves = 0;
int lines = 0;
int curves = 0;
- while (bp->code != NR_END) {
+ for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
+ {
+ moves++;
nodes++;
- switch (bp->code) {
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- moves++;
- break;
- case NR_LINETO:
+
+ for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
+ {
+ nodes++;
+
+ if ( is_straight_curve(*cit) ) {
lines++;
- break;
- case NR_CURVETO:
+ }
+ else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit)) {
+ cubic = cubic;
curves++;
- break;
+ }
}
- bp += 1;
}
if (!nodes)
@@ -640,39 +583,85 @@ PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &tr
POINT *lpPoints = new POINT[moves + lines + curves*3];
int i = 0;
- bp = bpath;
- while (bp->code != NR_END)
+
+ /**
+ * For all Subpaths in the <path>
+ */
+ for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
{
using Geom::X;
using Geom::Y;
- Geom::Point p1(bp->c(1) * tf);
- Geom::Point p2(bp->c(2) * tf);
- Geom::Point p3(bp->c(3) * tf);
-
- p1[X] = (p1[X] * IN_PER_PX * dwDPI);
- p2[X] = (p2[X] * IN_PER_PX * dwDPI);
- p3[X] = (p3[X] * IN_PER_PX * dwDPI);
- p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
- p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
- p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
-
- LONG const x1 = (LONG) round(p1[X]);
- LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
- LONG const x2 = (LONG) round(p2[X]);
- LONG const y2 = (LONG) round(rc.bottom-p2[Y]);
- LONG const x3 = (LONG) round(p3[X]);
- LONG const y3 = (LONG) round(rc.bottom-p3[Y]);
-
- switch (bp->code) {
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- case NR_LINETO:
- lpPoints[i].x = x3;
- lpPoints[i].y = y3;
+ Geom::Point p0 = pit->initialPoint();
+
+ p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+
+ LONG const x0 = (LONG) round(p0[X]);
+ LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+
+ lpPoints[i].x = x0;
+ lpPoints[i].y = y0;
+ i = i + 1;
+
+ /**
+ * For all segments in the subpath
+ */
+ for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
+ {
+ if ( is_straight_curve(*cit) )
+ {
+ //Geom::Point p0 = cit->initialPoint();
+ Geom::Point p1 = cit->finalPoint();
+
+ //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p1[X] = (p1[X] * IN_PER_PX * dwDPI);
+ //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+ p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+
+ //LONG const x0 = (LONG) round(p0[X]);
+ //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+ LONG const x1 = (LONG) round(p1[X]);
+ LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
+
+ lpPoints[i].x = x1;
+ lpPoints[i].y = y1;
i = i + 1;
- break;
- case NR_CURVETO:
+ }
+ else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit))
+ {
+ std::vector<Geom::Point> points = cubic->points();
+ //Geom::Point p0 = points[0];
+ Geom::Point p1 = points[1];
+ Geom::Point p2 = points[2];
+ Geom::Point p3 = points[3];
+
+ //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p1[X] = (p1[X] * IN_PER_PX * dwDPI);
+ p2[X] = (p2[X] * IN_PER_PX * dwDPI);
+ p3[X] = (p3[X] * IN_PER_PX * dwDPI);
+ //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+ p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+ p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
+ p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
+
+ //LONG const x0 = (LONG) round(p0[X]);
+ //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+ LONG const x1 = (LONG) round(p1[X]);
+ LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
+ LONG const x2 = (LONG) round(p2[X]);
+ LONG const y2 = (LONG) round(rc.bottom-p2[Y]);
+ LONG const x3 = (LONG) round(p3[X]);
+ LONG const y3 = (LONG) round(rc.bottom-p3[Y]);
+
+ POINT pt[3];
+ pt[0].x = x1;
+ pt[0].y = y1;
+ pt[1].x = x2;
+ pt[1].y = y2;
+ pt[2].x = x3;
+ pt[2].y = y3;
+
lpPoints[i].x = x1;
lpPoints[i].y = y1;
lpPoints[i+1].x = x2;
@@ -680,45 +669,39 @@ PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &tr
lpPoints[i+2].x = x3;
lpPoints[i+2].y = y3;
i = i + 3;
- break;
+ }
}
-
- bp += 1;
}
bool done = false;
bool closed = (lpPoints[0].x == lpPoints[i-1].x) && (lpPoints[0].y == lpPoints[i-1].y);
bool polygon = false;
- bool polyline = false;
bool rectangle = false;
bool ellipse = false;
if (moves == 1 && moves+lines == nodes && closed) {
polygon = true;
- if (nodes==5) {
- if (lpPoints[0].x == lpPoints[3].x && lpPoints[1].x == lpPoints[2].x &&
- lpPoints[0].y == lpPoints[1].y && lpPoints[2].y == lpPoints[3].y)
- {
- rectangle = true;
- }
- }
- }
- else if (moves == 1 && moves+lines == nodes) {
- polyline = true;
+// if (nodes==5) { // disable due to LP Bug 407394
+// if (lpPoints[0].x == lpPoints[3].x && lpPoints[1].x == lpPoints[2].x &&
+// lpPoints[0].y == lpPoints[1].y && lpPoints[2].y == lpPoints[3].y)
+// {
+// rectangle = true;
+// }
+// }
}
else if (moves == 1 && nodes == 5 && moves+curves == nodes && closed) {
- if (lpPoints[0].x == lpPoints[1].x && lpPoints[1].x == lpPoints[11].x &&
- lpPoints[5].x == lpPoints[6].x && lpPoints[6].x == lpPoints[7].x &&
- lpPoints[2].x == lpPoints[10].x && lpPoints[3].x == lpPoints[9].x && lpPoints[4].x == lpPoints[8].x &&
- lpPoints[2].y == lpPoints[3].y && lpPoints[3].y == lpPoints[4].y &&
- lpPoints[8].y == lpPoints[9].y && lpPoints[9].y == lpPoints[10].y &&
- lpPoints[5].y == lpPoints[1].y && lpPoints[6].y == lpPoints[0].y && lpPoints[7].y == lpPoints[11].y)
- {
- ellipse = true;
- }
+// if (lpPoints[0].x == lpPoints[1].x && lpPoints[1].x == lpPoints[11].x &&
+// lpPoints[5].x == lpPoints[6].x && lpPoints[6].x == lpPoints[7].x &&
+// lpPoints[2].x == lpPoints[10].x && lpPoints[3].x == lpPoints[9].x && lpPoints[4].x == lpPoints[8].x &&
+// lpPoints[2].y == lpPoints[3].y && lpPoints[3].y == lpPoints[4].y &&
+// lpPoints[8].y == lpPoints[9].y && lpPoints[9].y == lpPoints[10].y &&
+// lpPoints[5].y == lpPoints[1].y && lpPoints[6].y == lpPoints[0].y && lpPoints[7].y == lpPoints[11].y)
+// { // disable due to LP Bug 407394
+// ellipse = true;
+// }
}
- if (polygon || polyline || ellipse) {
+ if (polygon || ellipse) {
HPEN hpenTmp = NULL;
HPEN hpenOld = NULL;
HBRUSH hbrushTmp = NULL;
@@ -741,9 +724,6 @@ PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &tr
else
Polygon( hdc, lpPoints, nodes );
}
- else if (polyline) {
- Polyline( hdc, lpPoints, nodes );
- }
else if (ellipse) {
Ellipse( hdc, lpPoints[6].x, lpPoints[3].y, lpPoints[0].x, lpPoints[9].y);
}
@@ -766,60 +746,83 @@ PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &tr
}
unsigned int
-PrintEmfWin32::print_bpath(NArtBpath const *bp, Geom::Matrix const &transform)
+PrintEmfWin32::print_pathv(Geom::PathVector const &pathv, const Geom::Matrix &transform)
{
- unsigned int closed;
- NR::Matrix tf = transform;
-
- simple_shape = print_simple_shape(bp, transform);
+ simple_shape = print_simple_shape(pathv, transform);
if (simple_shape)
return TRUE;
+
+ Geom::PathVector pv = pathv_to_linear_and_cubic_beziers( pathv * transform );
BeginPath( hdc );
- closed = FALSE;
- while (bp->code != NR_END) {
+
+ /**
+ * For all Subpaths in the <path>
+ */
+ for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
+ {
using Geom::X;
using Geom::Y;
- Geom::Point p1(bp->c(1) * tf);
- Geom::Point p2(bp->c(2) * tf);
- Geom::Point p3(bp->c(3) * tf);
-
- p1[X] = (p1[X] * IN_PER_PX * dwDPI);
- p2[X] = (p2[X] * IN_PER_PX * dwDPI);
- p3[X] = (p3[X] * IN_PER_PX * dwDPI);
- p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
- p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
- p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
-
- LONG const x1 = (LONG) round(p1[X]);
- LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
- LONG const x2 = (LONG) round(p2[X]);
- LONG const y2 = (LONG) round(rc.bottom-p2[Y]);
- LONG const x3 = (LONG) round(p3[X]);
- LONG const y3 = (LONG) round(rc.bottom-p3[Y]);
-
- switch (bp->code) {
- case NR_MOVETO:
- if (closed) {
- CloseFigure( hdc );
- }
- closed = TRUE;
- MoveToEx( hdc, x3, y3, NULL );
- break;
- case NR_MOVETO_OPEN:
- if (closed) {
- CloseFigure( hdc );
- }
- closed = FALSE;
- MoveToEx( hdc, x3, y3, NULL );
- break;
- case NR_LINETO:
- LineTo( hdc, x3, y3 );
- break;
- case NR_CURVETO:
+ Geom::Point p0 = pit->initialPoint();
+
+ p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+
+ LONG const x0 = (LONG) round(p0[X]);
+ LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+
+ MoveToEx( hdc, x0, y0, NULL );
+
+ /**
+ * For all segments in the subpath
+ */
+ for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
+ {
+ if ( is_straight_curve(*cit) )
{
+ //Geom::Point p0 = cit->initialPoint();
+ Geom::Point p1 = cit->finalPoint();
+
+ //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p1[X] = (p1[X] * IN_PER_PX * dwDPI);
+ //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+ p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+
+ //LONG const x0 = (LONG) round(p0[X]);
+ //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+ LONG const x1 = (LONG) round(p1[X]);
+ LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
+
+ LineTo( hdc, x1, y1 );
+ }
+ else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit))
+ {
+ std::vector<Geom::Point> points = cubic->points();
+ //Geom::Point p0 = points[0];
+ Geom::Point p1 = points[1];
+ Geom::Point p2 = points[2];
+ Geom::Point p3 = points[3];
+
+ //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
+ p1[X] = (p1[X] * IN_PER_PX * dwDPI);
+ p2[X] = (p2[X] * IN_PER_PX * dwDPI);
+ p3[X] = (p3[X] * IN_PER_PX * dwDPI);
+ //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+ p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+ p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
+ p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
+
+ //LONG const x0 = (LONG) round(p0[X]);
+ //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
+ LONG const x1 = (LONG) round(p1[X]);
+ LONG const y1 = (LONG) round(rc.bottom-p1[Y]);
+ LONG const x2 = (LONG) round(p2[X]);
+ LONG const y2 = (LONG) round(rc.bottom-p2[Y]);
+ LONG const x3 = (LONG) round(p3[X]);
+ LONG const y3 = (LONG) round(rc.bottom-p3[Y]);
+
POINT pt[3];
pt[0].x = x1;
pt[0].y = y1;
@@ -829,19 +832,21 @@ PrintEmfWin32::print_bpath(NArtBpath const *bp, Geom::Matrix const &transform)
pt[2].y = y3;
PolyBezierTo( hdc, pt, 3 );
- break;
}
- default:
- break;
+ else
+ {
+ g_warning("logical error, because pathv_to_linear_and_cubic_beziers was used");
+ }
+ }
+
+ if (pit->end_default() == pit->end_closed()) {
+ CloseFigure( hdc );
}
- bp += 1;
- }
- if (closed) {
- CloseFigure( hdc );
}
+
EndPath( hdc );
- return closed;
+ return TRUE;
}
}
unsigned int
-PrintEmfWin32::text(Inkscape::Extension::Print *mod, char const *text, Geom::Point p,
- SPStyle const *const style)
+PrintEmfWin32::text(Inkscape::Extension::Print * /*mod*/, char const *text, Geom::Point p,
+ SPStyle const *const style)
{
if (!hdc) return 0;
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :