From c5fe90d135a7685387d0fb88b8e2913338b5a06d Mon Sep 17 00:00:00 2001
From: Daniel Schwabeneder <daschw@disroot.org>
Date: Fri, 13 Dec 2019 11:10:45 +0100
Subject: [PATCH] move zaxis to the left

---
 src/axes.jl        | 28 ++++++++++++++--------------
 src/backends/gr.jl | 12 ++++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/axes.jl b/src/axes.jl
index 82bf5bdf..baebcaac 100644
--- a/src/axes.jl
+++ b/src/axes.jl
@@ -931,12 +931,12 @@ function axis_drawing_info_3d(sp::Subplot)
         x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
             0.0, 0.0
         else
-            xor(zaxis[:mirror], xaxis[:flip]) ? (xmin, xmax) : (xmax, xmin)
+            xor(zaxis[:mirror], xaxis[:flip]) ? (xmax, xmin) : (xmin, xmax)
         end
         y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
             0.0, 0.0
         else
-            xor(zaxis[:mirror], yaxis[:flip]) ? (ymin, ymax) : (ymax, ymin)
+            xor(zaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
         end
         if zaxis[:showaxis]
             if sp[:framestyle] != :grid
@@ -953,48 +953,48 @@ function axis_drawing_info_3d(sp::Subplot)
             f = scalefunc(xaxis[:scale])
             invf = invscalefunc(xaxis[:scale])
             tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(xmax) - f(xmin)))
+                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
                 (-t, t)
             else
                 ticks_in = zaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(x1) + 0.012 * (f(x2) - f(x1)) * ticks_in)
-                (x1, t)
+                t = invf(f(y1) + 0.012 * (f(y2) - f(y1)) * ticks_in)
+                (y1, t)
             end
 
             for ztick in zticks[1]
                 if zaxis[:showaxis]
-                    push!(ztick_segs, (tick_start, y1, ztick), (tick_stop, y1, ztick)) # left tick
+                    push!(ztick_segs, (x1, tick_start, ztick), (x1, tick_stop, ztick)) # left tick
                 end
                 if zaxis[:grid]
                     if sp[:framestyle] in (:origin, :zerolines)
                         push!(zgrid_segs, (xmin, 0.0, ztick), (xmax, 0.0, ztick))
                         push!(ygrid_segs, (0.0, ymin, ztick), (0.0, ymax, ztick))
                     else
-                        push!(ygrid_segs, (x1, y1, ztick), (x2, y1, ztick))
-                        push!(ygrid_segs, (x2, y1, ztick), (x2, y2, ztick))
+                        push!(ygrid_segs, (x1, y1, ztick), (x1, y2, ztick))
+                        push!(ygrid_segs, (x1, y2, ztick), (x2, y2, ztick))
                     end
                 end
             end
 
             if !(zaxis[:minorticks] in (:none, nothing, false)) || zaxis[:minorgrid]
                 tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(xmax) - f(xmin)))
+                    t = invf(f(0) + 0.006 * (f(ymax) - f(ymin)))
                     (-t, t)
                 else
-                    t = invf(f(x1) + 0.006 * (f(x2) - f(x1)) * ticks_in)
-                    (x1, t)
+                    t = invf(f(y1) + 0.006 * (f(y2) - f(y1)) * ticks_in)
+                    (y1, t)
                 end
                 for ztick in zminorticks
                     if zaxis[:showaxis]
-                        push!(ztick_segs, (tick_start, y1, ztick), (tick_stop, y1, ztick)) # left tick
+                        push!(ztick_segs, (x1, tick_start, ztick), (x1, tick_stop, ztick)) # left tick
                     end
                     if zaxis[:minorgrid]
                         if sp[:framestyle] in (:origin, :zerolines)
                             push!(zminorgrid_segs, (xmin, 0.0, ztick), (xmax, 0.0, ztick))
                             push!(zminorgrid_segs, (0.0, ymin, ztick), (0.0, ymax, ztick))
                         else
-                            push!(zminorgrid_segs, (x1, y1, ztick), (x2, y1, ztick))
-                            push!(zminorgrid_segs, (x2, y1, ztick), (x2, y2, ztick))
+                            push!(zminorgrid_segs, (x1, y1, ztick), (x1, y2, ztick))
+                            push!(zminorgrid_segs, (x1, y2, ztick), (x2, y2, ztick))
                         end
                     end
                 end
diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index 10974f4a..956e2260 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -1188,23 +1188,23 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             # z labels
             gr_set_font(
                 tickfont(zaxis),
-                halign = (zaxis[:mirror] ? :right : :left),
+                halign = (zaxis[:mirror] ? :left : :right),
                 valign = (:top, :vcenter, :bottom)[sign(zaxis[:rotation]) + 2],
                 rotation = zaxis[:rotation]
             )
             xt = if sp[:framestyle] == :origin
                 0
             elseif xor(zaxis[:mirror], xaxis[:flip])
-                xmin
-            else
                 xmax
+            else
+                xmin
             end
             yt = if sp[:framestyle] == :origin
                 0
             elseif xor(zaxis[:mirror], yaxis[:flip])
-                ymin
-            else
                 ymax
+            else
+                ymin
             end
             for (cv, dv) in zip(zticks...)
                 xi, yi, zi = GR.wc3towc(xt, yt, cv)
@@ -1218,7 +1218,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                         dv = convert_sci_unicode(dv)
                     end
                 end
-                gr_text(xi + (zaxis[:mirror] ? -1 : 1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
+                gr_text(xi + (zaxis[:mirror] ? 1 : -1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
             end
         end
         #