svg rotated usershapes

diff --git a/lib/common/svggen.c b/lib/common/svggen.c
index 34c475a14bccbe9d8e6eb9e9c655e8041d65ccc1..671a220ace2ad4592adec6f3fa1b29610edfda2e 100644 (file)
--- a/lib/common/svggen.c
+++ b/lib/common/svggen.c
@@ -112,11 +112,11 @@ static int N_pages;
 static int onetime = TRUE;
 static int isLatin1;
 
-static double Dpi;
-static double CompScale;
+static pointf CompScale;
 static double FontScale;
 static int Rot;
 
+static point Margin;
 static point Viewport;
 static pointf GraphFocus;
 static double Zoom;
@@ -205,11 +205,11 @@ static point svgpt(point p)
     point rv;
 
     if (Rot == 0) {
-        rv.x = (p.x - GraphFocus.x) * CompScale + Viewport.x / 2.;
-        rv.y = -(p.y - GraphFocus.y) * CompScale + Viewport.y / 2.;
+        rv.x = (p.x - GraphFocus.x) * CompScale.x + Viewport.x / 2. + Margin.x;
+        rv.y = -(p.y - GraphFocus.y) * CompScale.y + Viewport.y / 2. + Margin.y;
     } else {
-        rv.x = -(p.y - GraphFocus.y) * CompScale + Viewport.x / 2.;
-        rv.y = -(p.x - GraphFocus.x) * CompScale + Viewport.y / 2.;
+        rv.x = -(p.y - GraphFocus.y) * CompScale.x + Viewport.x / 2. + Margin.x;
+        rv.y = -(p.x - GraphFocus.x) * CompScale.y + Viewport.y / 2. + Margin.y;
     }
     return rv;
 }
@@ -475,18 +475,17 @@ svg_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
 
 static void svg_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
-    Dpi = GD_drawing(g)->dpi;
-    if (Dpi < 1.0)
-        Dpi = POINTS_PER_INCH;
-
     Viewport.x = gvc->job->width;
     Viewport.y = gvc->job->height;
+    Margin.x = ROUND(gvc->job->margin.x * gvc->job->dpi.x / POINTS_PER_INCH);
+    Margin.y = ROUND(gvc->job->margin.y * gvc->job->dpi.y / POINTS_PER_INCH);
 
     Zoom = gvc->job->zoom;
     GraphFocus = gvc->job->focus;
 
-    CompScale = Zoom * Dpi / POINTS_PER_INCH;
-    FontScale = CompScale * 0.72;
+    CompScale.x = Zoom * gvc->job->dpi.x / POINTS_PER_INCH;
+    CompScale.y = Zoom * gvc->job->dpi.y / POINTS_PER_INCH;
+    FontScale = CompScale.y * 0.72;
 
     if (onetime) {
        init_svg();
@@ -498,15 +497,15 @@ static void svg_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
     svg_printf(" Pages: %d -->\n", N_pages);
     if (ROUND(gvc->job->dpi.x) == POINTS_PER_INCH && ROUND(gvc->job->dpi.y) == POINTS_PER_INCH) {
        svg_printf("<svg width=\"%dpt\" height=\"%dpt\"\n",
-               Viewport.x, Viewport.y);
+               Viewport.x + Margin.x * 2, Viewport.y + Margin.y * 2);
     }
     else {
        svg_printf("<svg width=\"%dpx\" height=\"%dpx\"\n",
-               ROUND(gvc->job->dpi.x * Viewport.x / POINTS_PER_INCH),
-               ROUND(gvc->job->dpi.y * Viewport.y / POINTS_PER_INCH));
+               ROUND(gvc->job->dpi.x * (Viewport.x + Margin.x * 2) / POINTS_PER_INCH),
+               ROUND(gvc->job->dpi.y * (Viewport.y + Margin.y * 2) / POINTS_PER_INCH));
     }
     /* establish absolute units in points */
-    svg_printf(" viewBox = \"%d %d %d %d\"\n", 0, 0, Viewport.x, Viewport.y);
+    svg_printf(" viewBox = \"%d %d %d %d\"\n", Margin.x, Margin.y, Viewport.x, Viewport.y);
     /* namespace of svg */
     svg_fputs(" xmlns=\"http://www.w3.org/2000/svg\"");
     /* namespace of xlink */
@@ -830,8 +829,8 @@ static void svg_ellipse(point p, int rx, int ry, int filled)
        rx = ry;
        ry = t;
     }
-    mp.x = CompScale * rx;
-    mp.y = CompScale * ry;
+    mp.x = CompScale.x * rx;
+    mp.y = CompScale.y * ry;
     svg_printf(" rx=\"%d\" ry=\"%d\"/>\n", mp.x, mp.y);
 }
 
@@ -892,12 +891,7 @@ static void svg_polyline(point * A, int n)
 
 static void svg_usershape(usershape_t *us, boxf b, point *A, int n, bool filled)
 {
-    int i;
-    point p;
-    point sz;
     char *imagefile;
-    int minx, miny;
-    int maxx, maxy;
 
     if (cstk[SP].pen == P_NONE) {
        /* its invisible, don't draw */
@@ -912,42 +906,19 @@ static void svg_usershape(usershape_t *us, boxf b, point *A, int n, bool filled)
        return;
     }
 
-    svg_fputs("<clipPath id=\"mypath");
-    svg_name_fputs(us->name);
-    svg_name_fputs(Curnode->name);
-    svg_fputs("\">\n<polygon points=\"");
-    maxx = minx = svgpt(A[0]).x;
-    maxy = miny = svgpt(A[0]).y;
-    for (i = 0; i < n; i++) {
-       p = svgpt(A[i]);
-
-       if (p.x < minx)
-           minx = p.x;
-       if (p.y < miny)
-           miny = p.y;
-       if (p.x > maxx)
-           maxx = p.x;
-       if (p.y > maxy)
-           maxy = p.y;
-
-       svg_printf("%d,%d ", p.x, p.y);
-    }
-    sz.x = maxx - minx;
-    sz.y = maxy - miny;
-    /* because Adobe SVG is broken (?) */
-    p = svgpt(A[0]);
-    svg_printf("%d,%d ", p.x, p.y);
-    svg_fputs("\"/>\n</clipPath>\n<image xlink:href=\"");
+    svg_fputs("<image xlink:href=\"");
     svg_name_fputs(imagefile);
-    svg_printf ("\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
-       b.UR.x - b.LL.x, b.UR.y - b.LL.y, b.LL.x, b.LL.y);
-    if (Rot)
+    if (Rot) {
+        svg_printf ("\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
+           b.UR.y - b.LL.y, b.UR.x - b.LL.x, b.LL.x, b.UR.y);
        svg_printf (" transform=\"rotate(-%d %g %g)\"",
-           Rot, (b.UR.x + b.LL.x)/2., (b.UR.y + b.LL.y) / 2.);
-    svg_fputs (" clip-path=\"url(#clipPath.");
-    svg_name_fputs(us->name);
-    svg_name_fputs(Curnode->name);
-    svg_fputs(")\"/>\n");
+           Rot, b.LL.x, b.UR.y);
+    }
+    else {
+        svg_printf ("\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
+           b.UR.x - b.LL.x, b.UR.y - b.LL.y, b.LL.x, b.LL.y);
+    }
+    svg_fputs("/>\n");
 }
 
 codegen_t SVG_CodeGen = {

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 70b53cf044b1940d5f1b9017dd350459880d347f..761a76fafe6f061171aebe4bcfcab55feec6f11e 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -994,9 +994,10 @@ void gvrender_usershape(GVJ_t * job, char *name, pointf * a, int n, bool filled)
 {
     gvrender_engine_t *gvre = job->render.engine;
     usershape_t *us;
-    double pw, ph, tw, th;  /* poly width, height,  target width, height */
+    double iw, ih, pw, ph, tw, th;  
     double scalex, scaley;  /* scale factors */
     boxf b;                /* target box */
+    pointf tmp;
     int i;
 
     if (! (us = gvusershape_find(name)))
@@ -1014,18 +1015,28 @@ void gvrender_usershape(GVJ_t * job, char *name, pointf * a, int n, bool filled)
     for (i = 1; i < n; i++) {
        EXPANDBP(b, AF[i]);
     }
+
+    if (job->rotation) {
+       iw = (double)us->h;
+       ih = (double)us->w;
+    }
+    else {
+       ih = (double)us->h;
+       iw = (double)us->w;
+    }
+
     pw = b.UR.x - b.LL.x;
     ph = b.UR.y - b.LL.y;
-    scalex = pw / (double) (us->w);
-    scaley = ph / (double) (us->h);
+    scalex = pw / iw;
+    scaley = ph / ih;
 
     /* keep aspect ratio fixed by just using the smaller scale */
     if (scalex < scaley) {
-       tw = us->w * scalex;
-       th = us->h * scalex;
+       tw = iw * scalex;
+       th = ih * scalex;
     } else {
-       tw = us->w * scaley;
-       th = us->h * scaley;
+       tw = iw * scaley;
+       th = ih * scaley;
     }
     /* if image is smaller than target area then center it */
     if (tw < pw) {

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index 676b97e76e71372ed43472b776533708e2532323..8c0704068c6d0b4ef9a8ff2a4835b6c9d7d2de9e 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -491,29 +491,19 @@ svggen_usershape(GVJ_t * job, usershape_t *us, boxf b, int filled)
         return;
     }
 
-    svggen_fputs(job, "<clipPath id=\"clipPath.");
+    svggen_fputs(job, "<image xlink:href=\"");
     svggen_fputs(job, us->name);
-    svggen_fputs(job, ".");
-    svggen_fputs(job, job->common->node_name);
-    svggen_fputs(job, "\">\n<polygon points=\"");
-    svggen_printf(job, "%g,%g ", b.LL.x, b.LL.y);
-    svggen_printf(job, "%g,%g ", b.LL.x, b.UR.y);
-    svggen_printf(job, "%g,%g ", b.UR.x, b.UR.y);
-    svggen_printf(job, "%g,%g ", b.UR.x, b.LL.y);
-    /* because Adobe SVG is broken (?) */
-    svggen_printf(job, "%g,%g ", b.LL.x, b.LL.y);
-    svggen_fputs(job, "\"/>\n</clipPath>\n<image xlink:href=\"");
-    svggen_fputs(job, us->name);
-    svggen_printf (job, "\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
-         b.UR.x - b.LL.x, b.UR.y - b.LL.y, b.LL.x, b.LL.y);
-    if (job->rotation)
+    if (job->rotation) {
+        svggen_printf (job, "\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
+                b.UR.y - b.LL.y, b.UR.x - b.LL.x, b.LL.x, b.UR.y);
        svggen_printf (job, " transform=\"rotate(-%d %g %g)\"",
-               job->rotation, (b.UR.x + b.LL.x)/2., (b.UR.y + b.LL.y) / 2.);
-    svggen_fputs (job, " clip-path=\"url(#clipPath.");
-    svggen_fputs(job, us->name);
-    svggen_fputs(job, ".");
-    svggen_fputs(job, job->common->node_name);
-    svggen_fputs(job, ")\"/>\n");
+               job->rotation, b.LL.x, b.UR.y);
+    }
+    else {
+        svggen_printf (job, "\" width=\"%gpx\" height=\"%fpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
+                b.UR.x - b.LL.x, b.UR.y - b.LL.y, b.LL.x, b.LL.y);
+    }
+    svggen_fputs(job, "/>\n");
 }
 
 /* color names from http://www.w3.org/TR/SVG/types.html */