Expand the colorbar syntax to =(xlabel=..., triangles=...) (#1877)

* Expand the colorbar syntax to =(xlabel=..., triangles=...)

* Fix test

* Another test fix attempt.

Author: joa-quim

src/finish_PS_nested.jl

@@ -70,19 +70,9 @@ function add_opt_module(d::Dict)::Vector{String}
 			r = add_opt_module_barr2(symb)
 		elseif (symb == :colorbar && (isa(val, StrSymb)))
 			# Accepts Top/TopTri[High|Low], Bottom/BottomTri, Left/LeftTri, Right/RightTri or triangles (caseless)
-			val_str::String = lowercase(string(val))
 			opt_RJ = !IamModern[] ? CTRL.pocket_R[1] * " -J" : ""
-			anc = "RM";		tris = ""		# Default anchor Right Middle and no triangles
-			if (contains(val_str, "tri") && !isempty(CURRENT_CPT[]))	# Sets CPT.bfn to match colormap end colors
-				CURRENT_CPT[].bfn[1,:] .= CURRENT_CPT[].colormap[1,:]
-				CURRENT_CPT[].bfn[2,:] .= CURRENT_CPT[].colormap[end,:]
-				tris = contains(val_str, "high") ? "+ef" : contains(val_str, "low") ? "+eb" : "+e"
-			end
-			if (!startswith(val_str, "tri"))			# Means that not just triangles were requested
-				t::Char = val_str[1]					# Accept "Top, Bot, Left" but default to Right
-				anc = (t == 't') ? "TC" : (t == 'b' ? "BC" : (t == 'l' ? "LM" : "RM"))
-			end
-			r = "psscale $opt_RJ -Baf -C -DJ"  * anc * tris
+			anc_tris = colorbar_triangles(val)
+			r = "psscale $opt_RJ -Baf -C -DJ"  * anc_tris
 		elseif (symb == :clip)
 			if (isa(val, String) || isa(val, Symbol))	# Accept also "land", "water" or "ocean" or DCW country codes(s) or a hard -E string
 				_str::String = string(val)					# Shoot the Any
@@ -108,6 +98,23 @@ function add_opt_module(d::Dict)::Vector{String}
 	return out
 end
 
+# ---------------------------------------------------------------------------------------------------
+function colorbar_triangles(val::StrSymb)::String
+	# Accepts Top/TopTri[High|Low], Bottom/BottomTri, Left/LeftTri, Right/RightTri or triangles (caseless)
+	val_str::String = lowercase(string(val))
+	anc = "RM";		tris = ""		# Default anchor Right Middle and no triangles
+	if (contains(val_str, "tri") && !isempty(CURRENT_CPT[]))	# Sets CPT.bfn to match colormap end colors
+		CURRENT_CPT[].bfn[1,:] .= CURRENT_CPT[].colormap[1,:]
+		CURRENT_CPT[].bfn[2,:] .= CURRENT_CPT[].colormap[end,:]
+		tris = contains(val_str, "high") ? "+ef" : contains(val_str, "low") ? "+eb" : "+e"
+	end
+	if (!startswith(val_str, "tri"))			# Means that not just triangles were requested
+		t::Char = val_str[1]					# Accept "Top, Bot, Left" but default to Right
+		anc = (t == 't') ? "TC" : (t == 'b' ? "BC" : (t == 'l' ? "LM" : "RM"))
+	end
+	return anc * tris
+end
+
 # Add to split code from above in these 2 function barriers to avoid all finish_PS_nested() invalidations
 function add_opt_module_barr2(symb::Symbol)::Union{String, Vector{String}}
 	r::Union{String, Vector{String}} = ""

src/psscale.jl

@@ -74,6 +74,11 @@ function colorbar_parser(arg1::Union{Nothing, GMTcpt}=nothing; first=true, kwarg
 	(!isempty(opt_D)) && (!contains(opt_D, "DJ") && !contains(opt_D, "Dj") && !contains(opt_D, "Dg")) && (cmd = replace(cmd, "-R " => ""))
 	cmd *= opt_D
 	cmd, arg1, = add_opt_cpt(d, cmd, CPTaliases, 'C', 0, arg1)
+	if (opt_D === "" && ((val = hlp_desnany_str(d, [:triangles])) !== ""))	# User asked for triangles but did not set pos
+		(val == "true") && (val = "tri")			# Means just triangles
+		anc_tris = colorbar_triangles(val)			# Returns anchor+triangles string
+		cmd *= " -DJ" * anc_tris
+	end
 	if (!isa(arg1, GMTcpt) && !occursin("-C", cmd))	# If given no CPT, try to see if we have a current one stored in global
 		if (!isempty(CURRENT_CPT[]))
 			cmd *= " -C";	arg1 = CURRENT_CPT[]
@@ -82,7 +87,7 @@ function colorbar_parser(arg1::Union{Nothing, GMTcpt}=nothing; first=true, kwarg
 
 	cmd = add_opt(d, cmd, "L", [:L :equal :equal_size], (range="i", gap=""))	# Aditive
 	(opt_B != "" && !contains(cmd, " -L")) && (cmd *= opt_B)					# If no -B & no -L, add default -B
-	isempty(opt_D) && (cmd *= " -DJMR")			#  So that we can call it with just a CPT
+	(isempty(opt_D) && !contains(cmd, " -D")) && (cmd *= " -DJMR")				#  So that we can call it with just a CPT
 
 	cmd = gmt_proggy * cmd
 	r = check_dbg_print_cmd(d, cmd)

test/test_cube.jl

@@ -42,7 +42,7 @@ xyzw2cube("test_cube_ascii_rowlevmaj.dat")[:,:,2] == [20.0  20.0  20.0; 20.0  20
 xyzw2cube("test_cube_ascii_collevmaj.dat")[:,:,2] == [20.0  20.0  20.0; 20.0  20.0  20.0]
 xyzw2cube(gmtread("test_cube_ascii_rowmaj.dat"))[:,:,1] == [10.0  10.0  10.0; 10.0  10.0  10.0]
 
-cubeplot(cube, title="T annual", colorbar=("xlabel=bbb","ylabel=yy"))
+cubeplot(cube, title="T annual", colorbar=("xlabel=bbb", "ylabel=yy"))
 cubeplot(cube, inset=(3,3))
 cubeplot(cube, top="@earth_relief_05m", coast=true, inset=(3,3))
 cubeplot(cube, top="@earth_relief_05m", topshade=true)

test/test_views.jl

@@ -23,7 +23,7 @@ grdimage("@earth_relief_01d_g", clim=[-4000 4000], Vd=dbg2)
 grdimage("lixo.grd", coast=true, colorbar=true, logo=true, Vd=dbg2)
 G = gmt("grdmath -Rg -fg -I5 X");
 gmtwrite("lixo.grd", G)
-grdimage("lixo.grd", proj=:Winkel, colorbar=true, coast=true)
+grdimage("lixo.grd", proj=:Winkel, colorbar=(xlabel="test", triangles=true), logo=true, coast=true)
 @test startswith(grdimage("@earth_relief", region=(-74,-59,5,15), proj=:guess,  Vd=2), "grdimage @earth_relief  -R-74/-59/5/15")
 
 G2 = mat2grid(rand(181,361), x=-180:180, y=-90:90);