Merge pull request #1974 from GenericMappingTools/fixes-4-plot-side-by-side

Fixes needed to let two grdimages plot side-by side and no need to set size.

Author: joa-quim

src/GMT.jl

@@ -387,7 +387,8 @@ using .Laszip
 	t = joinpath(tempdir(), "lixo.dat")
 	gmtwrite(t, [0.0 0; 1 1])
 	gmtread(t)
-	gmtread(TESTSDIR * "assets/burro_cenora.jpg")
+	gmtread(tests("burro_cenora.jpg"))
+	basemap(R=:d, proj=:guess)
 	coast(R=:g, proj=:guess, W=(level=1, pen=(2, :green)), savefig=tempname()*".ps")
 	rm(t)
 	D = mat2ds(rand(3, 3), colnames=["Time", "b", "c"])

src/common_options.jl

@@ -482,6 +482,7 @@ function parse_J(d::Dict, cmd::String; default::String="", map::Bool=true, O::Bo
 	# If MAP == false, do not try to append a fig size
 
 	(SHOW_KWARGS[]) && return (print_kwarg_opts([:J :proj :projection], "NamedTuple | String"), "")
+	if (!O)  CTRL.pocket_J[1], CTRL.pocket_J[2], CTRL.pocket_J[3], CTRL.pocket_J[4] = "", "", "", "   "  end	# Start fresh
 
 	opt_J::String = "";		mnemo::Bool = false
 	if ((val = find_in_dict(d, [:J :proj :projection], del)[1]) !== nothing)
@@ -530,17 +531,17 @@ function parse_J(d::Dict, cmd::String; default::String="", map::Bool=true, O::Bo
 	else										# For when a new size is entered in a middle of a script
 		if ((s = helper_append_figsize(d, opt_J, O, del)) != "")
 			if (opt_J == " -J")
-				(CTRL.pocket_J[1] != s) &&		# Composed funs (ex: fill_between) would trigger this warning
+				if (CTRL.pocket_J[1] != s)		# Composed funs (ex: fill_between) would trigger this warning
 					println("SEVERE WARNING: When appending a new fig with a different size you SHOULD set the `projection`. \n\tAdding `projection=:linear` at your own risk.");
-				opt_J *= "X" * s[4:end]::String
+					opt_J *= "X" * s[4:end]::String
+				else
+					opt_J *= (O ? "" : "X") * s[4:end]::String	# When overlaying use current projection, otherwise use linear
+				end
 			else
 				opt_J = s
 			end
 		end
 	end
-	#if (CTRL.proj_linear[1])			# If CTRL.proj_linear[1] == false, trust it
-		#CTRL.proj_linear[1] = (length(opt_J) >= 4 && opt_J[4] != 'X' && opt_J[4] != 'x' && opt_J[4] != 'Q' && opt_J[4] != 'q') ? false : true
-	#end
 
 	(opt_J == " ") && (opt_J = "")		# We use " " when wanting to prevent the default -J
 	fish_size_from_J(opt_J)				# So far we only need this in plot(hexbin)
@@ -606,6 +607,8 @@ end
 
 function helper_append_figsize(d::Dict, opt_J::String, O::Bool, del::Bool=true)::String
 	val_, symb = find_in_dict(d, [:figscale :fig_scale :scale :figsize :fig_size], del)
+	# Use the current figure size in overlay mode when we pass a projection but no size in it.
+	(O && val_ === nothing && CTRL.pocket_J[2] != "" && length(opt_J) > 3 && !endswith(opt_J, CTRL.pocket_J[2])) && (val_ = CTRL.pocket_J[2])
 	(val_ === nothing && is_in_dict(d, [:flipaxes :flip_axes]) === nothing) && return ""
 	val::String = arg2str(val_)
 	if (occursin("scale", arg2str(symb)))		# We have a fig SCALE request
@@ -616,18 +619,18 @@ function helper_append_figsize(d::Dict, opt_J::String, O::Bool, del::Bool=true):
 		if (opt_J == " -JX")
 			val = check_flipaxes(d, val)
 			opt_J::String = isletter(val[1]) ? " -J" * val : " -Jx" * val		# FRAGILE
-		else                          opt_J = append_figsize(d, opt_J, val, true)
+		else                         opt_J = append_figsize(d, opt_J, val, true, false)
 		end
 	else										# A fig SIZE request
 		(haskey(d, :units)) && (val *= d[:units][1]::String)
 		if (occursin("+proj", opt_J)) opt_J *= "+width=" * val
-		else                          opt_J = append_figsize(d, opt_J, val)
+		else                          opt_J = append_figsize(d, opt_J, val, false, O)
 		end
 	end
 	return opt_J
 end
 
-function append_figsize(d::Dict, opt_J::String, width::String="", scale::Bool=false)::String
+function append_figsize(d::Dict, opt_J::String, width::String="", scale::Bool=false, O::Bool=false)::String
 	# Appending either a fig width or fig scale depending on what projection.
 	# Sometimes we need to separate with a '/' others not. If WIDTH == "" we
 	# use the DEF_FIG_SIZE, otherwise use WIDTH that can be a size or a scale.
@@ -668,8 +671,13 @@ function append_figsize(d::Dict, opt_J::String, width::String="", scale::Bool=fa
 			end
 		end
 	end
+
 	width = check_flipaxes(d, width)
-	opt_J *= slash * width * de
+	if (O && (opt_J == " -J") && (CTRL.pocket_J[2] !== ""))
+		opt_J = replace(CTRL.pocket_J[1], CTRL.pocket_J[2] => width)
+	else
+		opt_J *= slash * width * de
+	end
 	CTRL.pocket_J[1], CTRL.pocket_J[2] = opt_J, width		# Save these for eventual (in -B) change if flip dims dir
 	if (scale)  opt_J = opt_J[1:3] * lowercase(opt_J[4]) * opt_J[5:end]  end 		# Turn " -JX" to " -Jx"
 	return opt_J
@@ -770,7 +778,7 @@ end
 
 function build_opt_J(val)::Tuple{String, Bool}
 	out::String = "";		mnemo = false
-	if (isa(val, String) || isa(val, Symbol))
+	if (isa(val, StrSymb))
 		val_s::String = string(val)
 		if (val_s == "guess")
 			out, mnemo = guess_proj(CTRL.limits[7:8], CTRL.limits[9:10]), true
@@ -4169,7 +4177,7 @@ function dbg_print_cmd(d::Dict{Symbol,Any}, cmd::Vector{String})
 		if (Vd >= 2)					# Delete these first before reporting
 			delete!(d, [[:show], [:leg, :legend, :l], [:box_pos], [:leg_pos], [:figname], [:name], [:savefig]])
 			pocket_call[][3] = nothing	# This is mostly for testing purposes, but potentially needed elsewhere.
-			CTRL.limits[1:12] = zeros(12)
+			#CTRL.limits[1:12] = zeros(12)
 			# Some times an automtic CPT has been generated by the Vd'ed cmd but when that happens MUST debug it
 			#CURRENT_CPT[] = GMTcpt()		# Can't do this because it would f. plot(..., colorbar=true)
 		end

test/test_common_opts.jl

@@ -72,6 +72,8 @@
 	@test GMT.parse_J(Dict{Symbol,Any}(:J => (name=:Cyl_,center=(0,45))), "", default="", map=false)[1] == " -JCyl_stere/0/45"
 	@test_throws ErrorException("When projection arguments are in a NamedTuple the projection 'name' keyword is madatory.") GMT.parse_J(Dict{Symbol,Any}(:J => (parallels=[45 65],)), "", default="", map=false)
 	@test_throws ErrorException("When projection is a named tuple you need to specify also 'center' and|or 'parallels'") GMT.parse_J(Dict{Symbol,Any}(:J => (name=:merc,)), "", default="", map=false)
+	basemap(R=:d, proj=:guess, figsize=8);
+	@test basemap!(R=:d, X=10, B=:same, proj=:guess, show=1, Vd=2) == "psbasemap  -Rd -JN0.0/8 -B -X10"
 	r = GMT.parse_params(Dict{Symbol,Any}(:par => (MAP_FRAME_WIDTH=0.2, IO=:lixo, OI="xoli")), "");
 	@test r == " --MAP_FRAME_WIDTH=0.2 --IO=lixo --OI=xoli"
 	@test GMT.parse_params(Dict{Symbol,Any}(:par => (:MAP_FRAME_WIDTH,0.2)), "") == " --MAP_FRAME_WIDTH=0.2"

test/test_mgd77.jl

@@ -1,4 +1,5 @@
 @testset "MAGREF" begin
+	resetGMT();		# Make sure we start with a clean slate
 	@test magref(R=[-180,180,-90,90], I=0.25, onetime=2000, alt=10, F=:H, Vd=dbg2) == "mgd77magref -A+t2000+a10+y -Frh/H"
 	@test magref([0. 0], onetime=2000, alt=10, H=1, Vd=dbg2) == "mgd77magref -A+t2000+a10+y -Fh/0"
 	@test magref([0. 0], alt=10, H=1, CM4core=true, Vd=dbg2) == "mgd77magref -A+a10 -Fh/1"