Fixes in leepacific() and add option to do inner annotations with quoted lines. (#1786)

* Add plotgrid! test

* Do not duplicate cmd when -Sqx...

* Use pointer tricks in gmt_centroid_area() to avoid data copies.

* Fixes in leepacific() and add option to do inner annotations with quoted lines.

Author: joa-quim

src/libgmt.jl

@@ -428,27 +428,37 @@ function gmt_free_mem(API::Ptr{Cvoid}, mem)
 end
 
 function gmt_centroid_area(API::Ptr{Cvoid}, D, geo::Int=0)::Matrix{Float64}
-	if (isa(D, Vector))
+	if (isa(D, Vector))		# 'D' is a vector of GMTdatasets but that type is not yet known here.
 		mat = Matrix{Float64}(undef, length(D), 3)
 		for k in eachindex(D)
-			t = gmt_centroid_area(API::Ptr{Cvoid}, D[k].data[:,1], D[k].data[:,2], geo)
+			ref1, ref2, nr = pointercols(D[k])
+			t = gmt_centroid_area(API, ref1, ref2, geo, nr)
 			mat[k, 1], mat[k, 2], mat[k, 3] = t[1], t[2], t[3]
 		end
 		mat
 	else
-		gmt_centroid_area(API::Ptr{Cvoid}, D.data[:,1], D.data[:,2], geo)
+		ref1, ref2, nr = pointercols(D)
+		gmt_centroid_area(API, ref1, ref2, geo, nr)
 	end
 end
 
-function gmt_centroid_area(API::Ptr{Cvoid}, x::Vector{Float64}, y::Vector{Float64}, geo::Int=0)::Matrix{Float64}
+function gmt_centroid_area(API::Ptr{Cvoid}, x, y, geo::Int=0, n::Int=0)::Matrix{Float64}
 	# geo = 0 for Cartesian, !=0 for geographic
+	@assert isa(x, Vector{Float64}) || isa(x, Ptr{Float64}) || isa(x, Ref{Float64}) "Bad type for x"
+	!isa(x, Vector{Float64}) && (n == 0) && error("Must provide 'n' when x is not a Vector")
+	(n == 0) && (n = length(x))
 	pos = [0.0 0.0 0.0]
 	area = ccall((:gmt_centroid_area, libgmt), Cdouble, (Cstring, Ptr{Cdouble}, Ptr{Cdouble}, UInt64, Int32, Ptr{Cdouble}),
-	             GMT_Get_Ctrl(API), x, y, length(x), geo, pos)
+	             GMT_Get_Ctrl(API), x, y, n, geo, pos)
 	pos[3] = abs(area)
 	return pos
 end
 
+function pointercols(D::AbstractArray{Float64,2}, cols=(1,2))
+	nr = size(D, 1)
+	return Ref(D[:], (cols[1]-1)*nr + 1), Ref(D[:], (cols[2]-cols[1])*nr + 1), nr
+end
+
 #=
 function get_common_R(API::Ptr{Cvoid})
 	R = COMMON_R((false,false,false,false), false, 0, 0, 0, (0., 0., 0., 0., 0., 0.), (0., 0., 0., 0.), (0., 0.), map(UInt8, (string(repeat(" ",256))...,)))

src/psxy.jl

@@ -980,26 +980,26 @@ end
 # ---------------------------------------------------------------------------------------------------
 function build_run_cmd(cmd, opt_B, opt_Gsymb, opt_ML, opt_S, opt_W, opt_Wmarker, opt_UVXY, opt_c)::Vector{String}
 	# Build the executble command vector
-	if (opt_W != "" && opt_S == "") 						# We have a line/polygon request
+	if (opt_W != "" && opt_S == "") 							# We have a line/polygon request
 		_cmd = [cmd * opt_W * opt_UVXY]
 
 	elseif (opt_W == "" && (opt_S != "" || opt_Gsymb != ""))	# We have a symbol request
 		(opt_Wmarker != "" && opt_W == "") && (opt_Gsymb *= " -W" * opt_Wmarker)	# reuse var name
 		(opt_ML != "") && (cmd *= opt_ML)					# If we have a symbol outline pen
 		_cmd = [cmd * opt_S * opt_Gsymb * opt_UVXY]
 
-	elseif (opt_W != "" && opt_S != "")						# We have both line/polygon and a symbol
+	elseif (opt_W != "" && opt_S != "")							# We have both line/polygon and a symbol
 		(occursin(opt_Gsymb, cmd)) && (opt_Gsymb = "")
 		c = lowercase(opt_S[4])
-		if (c == 'v' || c == 'm' || c == 'w' || c == '=')	# Are there more cases where the pen applies to the symbol?
+		if (c == 'v' || c == 'm' || c == 'w' || c == '=' || c == 'q')	# Are there more cases where the pen applies to the symbol?
 			_cmd = [cmd * opt_W * opt_S * opt_Gsymb * opt_UVXY]
 		else
 			(opt_Wmarker != "") && (opt_Wmarker = " -W" * opt_Wmarker)		# Set Symbol edge color
 			cmd1 = cmd * opt_W * opt_UVXY
 			(opt_B != " " && opt_B != "") && (cmd = replace(cmd, opt_B => ""))	# Some themes make opt_B = " "
 			cmd2 = cmd * opt_S * opt_Gsymb * opt_Wmarker	# Don't repeat option -B
 			(opt_c != "")  && (cmd2 = replace(cmd2, opt_c => ""))  				# Not in scond call (subplots)
-			(opt_ML != "") && (cmd2 = cmd2 * opt_ML)				# If we have a symbol outline pen
+			(opt_ML != "") && (cmd2 = cmd2 * opt_ML)			# If we have a symbol outline pen
 			_cmd = [cmd1; cmd2]
 		end