- move usershape images down a layer in -Tfig so that the node is drawn on top

- add commentary for the strange 1.2 scaling needed to get usershapes the right size.

diff --git a/plugin/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c
index 6e006c400af33b608ace2a876f6cee91ea5f0899..9419d1eb8a11de77334dc7eaa796cdff3e94e7e0 100644 (file)
--- a/plugin/core/gvloadimage_core.c
+++ b/plugin/core/gvloadimage_core.c
@@ -77,7 +77,7 @@ static void core_loadimage_fig(GVJ_t * job, usershape_t *us, boxf bf, bool fille
     int thickness = 0;
     int pen_color = 0;
     int fill_color = -1;
-    int depth = 0;
+    int depth = 1;
     int pen_style = -1;         /* not used */
     int area_fill = 0;
     double style_val = 0.0;

diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c
index 8b9142177b7eb44d76969fa792ba0039a4ca4f01..8e04df4ae4cb92a4d4539de65e84d6a3c1d1b884 100644 (file)
--- a/plugin/core/gvrender_core_fig.c
+++ b/plugin/core/gvrender_core_fig.c
@@ -543,10 +543,12 @@ gvrender_features_t figgen_features = {
     EMIT_COLORS
        | GVRENDER_Y_GOES_DOWN, /* flags */
     DEFAULT_EMBED_MARGIN,      /* default margin - points */
-    {1450.,1450.},             /* default dpi */
+    {1440.,1440.},             /* default dpi */
         /* FIXME - this default dpi is a very strange number!!!
-         * it was picked to make .png usershapes the right size on my screen
-         * also 1200 is hardcoded into the o/p file instead of using job->dpi 
+         * It was picked to make .png usershapes the right size on my screen.
+         * It happens to be 1.2 * 1200, but I can't explain the 1.2.
+         * (I was expecting 1.3333 which is 96/72, but thats too big.)
+         * Also 1200 is hardcoded in figgen_begin_graph() instead of using job->dpi 
           */
     figgen_knowncolors,                /* knowncolors */
     sizeof(figgen_knowncolors) / sizeof(char *), /* sizeof knowncolors */