Use new 2D axes functions

jheinen · Jul 11, 2024 · 4a275f0 · 4a275f0
1 parent 8ab461e
commit 4a275f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/examples/snoop.jl b/examples/snoop.jl
@@ -150,7 +150,10 @@ if !haskey(ENV, "GRDISPLAY")
     surface(x, y, z, 5)
     contour(x, y, h, z, 0)
     polymarker(xd, yd)
-    GR.axes(0.25, 0.25, -2, -2, 2, 2, 0.01)
+
+    x_axis = axis('X', tick=0.25, org=-2, major_count=2, tick_size=0.01)
+    y_axis = axis('Y', tick=0.25, org=-2, major_count=2, tick_size=0.01)
+    drawaxes(x_axis, y_axis, GR.AXES_SIMPLE_AXES|GR.AXES_TWIN_AXES)
 
     updatews()
 end
diff --git a/src/jlgr.jl b/src/jlgr.jl
@@ -592,17 +592,21 @@ function draw_axes(kind, pass=1, plt=plt[])
         GR.setcharheight(charheight)
         if kind === :heatmap || kind === :nonuniformheatmap || kind === :shade
             ticksize = -ticksize
-        else
-            drawgrid && GR.grid(xtick, ytick, 0, 0, majorx, majory)
         end
         if haskey(plt.kvs, :xticklabels) || haskey(plt.kvs, :yticklabels)
+            drawgrid && GR.grid(xtick, ytick, 0, 0, majorx, majory)
             fx = get(plt.kvs, :xticklabels, identity) |> ticklabel_fun
             fy = get(plt.kvs, :yticklabels, identity) |> ticklabel_fun
             GR.axeslbl(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize, fx, fy)
         else
-            GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize)
+            x_axis = GR.axis('X', tick=xtick, org=xorg[1], major_count=majorx, tick_size=ticksize)
+            y_axis = GR.axis('Y', tick=ytick, org=yorg[1], major_count=majory, tick_size=ticksize)
+            options = GR.AXES_SIMPLE_AXES|GR.AXES_TWIN_AXES
+            if drawgrid
+                options |= GR.AXES_WITH_GRID
+            end
+            GR.drawaxes(x_axis, y_axis, options)
         end
-        GR.axes(xtick, ytick, xorg[2], yorg[2], -majorx, -majory, -ticksize)
     end
 
     if haskey(plt.kvs, :title)
@@ -811,10 +815,12 @@ function colorbar(off=0, colors=256, plt=plt[])
     GR.setcharheight(charheight)
     if plt.kvs[:scale] & GR.OPTION_Z_LOG == 0
         ztick = auto_tick(zmin, zmax)
-        GR.axes(0, ztick, 1, zmin, 0, 1, 0.005)
+        y_axis = GR.axis('Y', position=1, tick=ztick, org=zmin, major_count=1, tick_size=0.005)
+        GR.drawaxis('Y', y_axis)
     else
         GR.setscale(GR.OPTION_Y_LOG)
-        GR.axes(0, 2, 1, zmin, 0, 1, 0.005)
+        y_axis = GR.axis('Y', position=1, tick=2, org=zmin, major_count=1, tick_size=0.005)
+        GR.drawaxis('Y', y_axis)
     end
     GR.restorestate()
 end