Workaround the fact that GMT is not able to return a gmtconverted time. (#1862)

Author: joa-quim

src/common_options.jl

@@ -1534,8 +1534,11 @@ function parse_f(d::Dict, cmd::String)
 	cmd, opt_f = parse_helper(cmd, d, [:f :geog :colinfo :coltypes :coltype], " -f")
 	if contains(opt_f, '/')				# Case when -fi and -fo were both set
 		s = split(opt_f, '/')
-		new_f = s[1] * " -f" * s[2]
+		s1 = s[1][1] == 'i' ? s[1] : "i" * s[1]		# Allow setting, or not, the i|o
+		s2 = s[2][1] == 'o' ? s[2] : "o" * s[2]
+		new_f = s1 * " -f" * s2
 		cmd = replace(cmd, opt_f => new_f)
+		opt_f = new_f
 	end
 	return cmd, opt_f
 end

src/gmtconvert.jl

@@ -62,11 +62,31 @@ end
 # ---------------------------------------------------------------------------------------------------
 function gmtconvert_helper(cmd0::String, arg1, d::Dict{Symbol,Any})
 
-	cmd, = parse_common_opts(d, "", [:V_params :write :append :a :b :bo :d :e :f :g :h :i :o :q :s :w :yx])
+	cmd, = parse_common_opts(d, "", [:V_params :append :a :b :bo :d :e :g :h :i :o :q :s :w :yx])
+    cmd, opt_f = parse_f(d, cmd)		# Must have easier acces to opt_f
+
+	# GMT is not able to return a converted time table, so we create a temporary file if time conversions are involved
+	used_tmp_file = false
+	if (contains(opt_f, "-fo") && is_in_dict(d, [:write :savefile :|>]) === nothing)
+		s = split(opt_f)[end]
+		if (contains(s, 'T') || contains(s, 't'))
+			fname = TMPDIR_USR.dir * "/" * "GMTjl_time_" * TMPDIR_USR.username * TMPDIR_USR.pid_suffix * ".txt"
+			d[:write] = fname
+			used_tmp_file = true
+		end
+	end
+
+	cmd = parse_write(d, cmd)
 	cmd  = parse_these_opts(cmd, d, [[:A :hcat], [:C :n_records], [:D :dump], [:E :first_last], [:F :conn_method],
 	                                 [:I :invert :reverse], [:L :list_only], [:N :sort], [:Q :segments], [:S :select_hdr], [:T :suppress :skip], [:W :word2num], [:Z :transpose]])
 
+
 	out = common_grd(d, cmd0, cmd, "gmtconvert ", arg1)		# Finish build cmd and run it
-	(!contains(cmd, " -b") && isa(out, GDtype) && cmd0 != "" && guess_T_from_ext(cmd0) == " -Td") && file_has_time!(cmd0, out)  # Try to guess if time columns
+	if (used_tmp_file)			# Read the conversion results and clean up temporary file.
+		out = gmtread(fname)
+		rm(fname, force=true)
+	else
+		(!contains(cmd, " -b") && isa(out, GDtype) && cmd0 != "" && guess_T_from_ext(cmd0) == " -Td") && file_has_time!(cmd0, out)  # Try to guess if time columns
+	end
 	return out
 end

test/test_B-GMTs.jl

@@ -66,6 +66,13 @@
 	println("	GMTCONVERT")
 	gmtconvert([1.1 2; 3 4], o=0)
 
+	result = sample1d([0 0; 4 1], inc=0.5);
+	D1 = gmtconvert(result, f="i0t/o0T", par=(TIME_EPOCH="1969-07-21T02:56:00", TIME_UNIT=:d));
+	gmtconvert(result, f="i0t/o0T", par=(TIME_EPOCH="1969-07-21T02:56:00", TIME_UNIT=:d), savefile="tmp.txt")
+	D2 = gmtread("tmp.txt");
+	@test all(D1.data .== D2.data)
+	rm("tmp.txt")
+
 	println("	GMTGRAVMAG3D")
 	gmtgravmag3d(M=(shape=:prism, params=(1,1,1,5)), I=1.0, R="-15/15/-15/15", H="10/60/10/-10/40", Vd=dbg2);
 	#D = gravmag3d(region="-15/15/-15/15", I=0.1, mag_params="10/60/10/-10/40", body=(shape=:prism, params="1/1/1/-5/-10/1"), F=[-14 -14; 14 14]);

test/test_misc.jl

@@ -200,7 +200,7 @@
 	GMT.GMT_Get_Default(API, "API_VERSION", "        ");
 	D = gmtconvert([1.0 2 3; 2 3 4], a="2=lolo+gPOINT");	# There's a bug in GMT for this. No data points are printed
 	gmtwrite("lixo.gmt", D)
-	@test gmtconvert([1.0 2 3; 2 3 4], binary_out="3f", write="a.bin", Vd=2) == "gmtconvert  > a.bin -bo3f"
+	@test gmtconvert([1.0 2 3; 2 3 4], binary_out="3f", write="a.bin", Vd=2) == "gmtconvert  -bo3f > a.bin"
 	@test gmtconvert([1.0 2 3; 2 3 4], binary_out="3f", append="a.bin", Vd=2) == "gmtconvert  >> a.bin -bo3f"
 	rm("lixo.gmt")