From abf8ca2dc7bbc25c843a433c58570d546f8ba34e Mon Sep 17 00:00:00 2001
From: Josef Heinen <j.heinen@fz-juelich.de>
Date: Tue, 30 May 2017 10:25:45 +0200
Subject: [PATCH] gr: fixed several bugs

- use correct image orientation
- added missing marker keywords
- improved alignment of axes labels
- corrected scaling of polar coordinates
- slightly shrink pie chart viewport
---
 src/backends/gr.jl | 8 +++++---
 src/utils.jl       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index d2e34390..9958e0a5 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -76,6 +76,8 @@ const gr_markertype = KW(
     :diamond => -13,
     :utriangle => -3,
     :dtriangle => -5,
+    :ltriangle => -18,
+    :rtriangle => -17,
     :pentagon => -21,
     :hexagon => -22,
     :heptagon => -23,
@@ -678,7 +680,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                 # use xor ($) to get the right y coords
                 xi, yi = GR.wctondc(cv, (flip $ mirror) ? ymax : ymin)
                 # @show cv dv ymin xi yi flip mirror (flip $ mirror)
-                gr_text(xi, yi + (mirror ? 1 : -1) * 1e-2, string(dv))
+                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3, string(dv))
             end
         end
 
@@ -880,7 +882,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             GR.selntran(0)
             GR.setfillintstyle(GR.INTSTYLE_SOLID)
             xmin, xmax, ymin, ymax = viewport_plotarea
-            ymax -= 0.05 * (xmax - xmin)
+            ymax -= 0.1 * (xmax - xmin)
             xcenter = 0.5 * (xmin + xmax)
             ycenter = 0.5 * (ymin + ymax)
             if xmax - xmin > ymax - ymin
@@ -944,7 +946,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
 
 
         elseif st == :image
-            z = transpose_z(series, series[:z].surf, true)
+            z = transpose_z(series, series[:z].surf, true)'
             w, h = size(z)
             if eltype(z) <: Colors.AbstractGray
                 grey = round(UInt8, float(z) * 255)
diff --git a/src/utils.jl b/src/utils.jl
index da1d1cb6..f5ae3733 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -350,7 +350,7 @@ end
 function convert_to_polar(x, y, r_extrema = calc_r_extrema(x, y))
     rmin, rmax = r_extrema
     phi, r = x, y
-    r = 0.5 * (r - rmin) / (rmax - rmin)
+    r = (r - rmin) / (rmax - rmin)
     n = max(length(phi), length(r))
     x = zeros(n)
     y = zeros(n)