Add Anaglyph program.

Author: joa-quim

src/GMT.jl

@@ -188,6 +188,7 @@ export
 	Ginnerjoin, Gouterjoin, Gleftjoin, Grightjoin, Gcrossjoin, Gsemijoin, Gantijoin, spatialjoin,
 	groupby, stats,
 
+	anaglyph,
 	lazinfo, lazread, lazwrite, lasread, laswrite,
 	okada,
 	haralick,
@@ -337,6 +338,7 @@ include("xyz2grd.jl")
 include("utils.jl")
 include("utils_project.jl")
 include("choropleth_utils.jl")
+include("extras/anaglyph.jl")
 include("extras/hampel_outliers.jl")
 include("extras/isoutlier.jl")
 include("extras/lowess.jl")

src/common_options.jl

@@ -1321,25 +1321,25 @@ function consolidate_Baxes(opt_B::String)::String
 end
 
 # ---------------------------------------------------------------------------------------------------
-title(; str::AbstractString="",  font=nothing, offset=0) = titles_e_comp(str, font, offset)
-subtitle(; str::AbstractString="", font=nothing, offset=0) = titles_e_comp(str, font, offset, "s")
-xlabel(; str::AbstractString="", font=nothing, offset=0) = titles_e_comp(str, font, offset, "x")
-ylabel(; str::AbstractString="", font=nothing, offset=0) = titles_e_comp(str, font, offset, "y")
-zlabel(; str::AbstractString="", font=nothing, offset=0) = titles_e_comp(str, font, offset, "z")
-function titles_e_comp(str::AbstractString, fnt, offset, tipo::String="")::Tuple{String, String}
-	f::String = (fnt !== nothing) ? font(fnt) : ""
+title(; str::AbstractString="",  font="", offset=0) = titles_e_comp(str, font, offset, "")
+subtitle(; str::AbstractString="", font="", offset=0) = titles_e_comp(str, font, offset, "s")
+xlabel(; str::AbstractString="", font="", offset=0) = titles_e_comp(str, font, offset, "x")
+ylabel(; str::AbstractString="", font="", offset=0) = titles_e_comp(str, font, offset, "y")
+zlabel(; str::AbstractString="", font="", offset=0) = titles_e_comp(str, font, offset, "z")
+function titles_e_comp(str::AbstractString, fnt, offset, tipo::String)::Tuple{String, String}
+	f::String = (fnt !== "") ? font(fnt) : ""
 	o::String = (offset != 0) ? string(offset) : ""
-	(str == "") && return str, ""
-	if (tipo == "")
-		r2 = (f != "") ? " --FONT_TITLE=" * f : ""
-		(o != "") && (r2 *= " --MAP_TITLE_OFFSET=" * o)
+	(str === "") && return str, ""
+	if (tipo === "")
+		r2 = (f !== "") ? " --FONT_TITLE=" * f : ""
+		(o !== "") && (r2 *= " --MAP_TITLE_OFFSET=" * o)
 	elseif (tipo == "s")
-		r2 = (f != "") ? " --FONT_SUBTITLE=" * f : ""
+		r2 = (f !== "") ? " --FONT_SUBTITLE=" * f : ""
 	else
-		r2 = (f != "") ? " --FONT_LABEL=" * f : ""
-		(o != "") && (r2 *= " --MAP_LABEL_OFFSET=" * o)
+		r2 = (f !== "") ? " --FONT_LABEL=" * f : ""
+		(o !== "") && (r2 *= " --MAP_LABEL_OFFSET=" * o)
 	end
-	replace(str_with_blancs(str), ' '=>'\x7f'), r2
+	return replace(str_with_blancs(str), ' ' => '\x7f'), r2
 end
 
 # ---------------------------------------------------------------------------------------------------
@@ -4162,7 +4162,7 @@ Finish the PostScript file and convert&display the figure.
 - `figname`: To create a figure in local directory and with a name `figname`. If `figname` has an extension,
    that is used to select the fig format. *e.g.* `figname=fig.pdf` creates a PDF file localy called 'fig.pdf' 
 """
-function showfig(d::Dict, fname_ps::String, fname_ext::String, opt_T::String, K::Bool=false, fname::String="")
+function showfig(d::Dict{Symbol, Any}, fname_ps::String, fname_ext::String, opt_T::String, K::Bool=false, fname::String="")
 	# Take a PS file, convert it with psconvert (unless opt_T == "" meaning file is PS)
 	# and display it in default system viewer
 	# FNAME_EXT holds the extension when not PS

src/extras/anaglyph.jl

@@ -17,7 +17,7 @@ An anaglyph image suitable for viewing with red-cyan glasses.
 
 ### Example
 ```julia
-	I = anaglyph("@earth_relief_01d.grd", region="-13/-5.5/35/44")
+	I = anaglyph("@earth_relief_30s", region="-13/-5.5/35/44")
 ```
 """
 function anaglyph(fname::String, vscale=1, sscale=2; kw...)

src/gdal.jl

@@ -1824,7 +1824,8 @@ end
 		gdalvectortranslate([ds], opts; dest=dest, gdataset=gdataset, save=save)
 	gdalvectortranslate(ds::IDataset, opts::Vector{String}=String[]; dest="/vsimem/tmp", gdataset=false, save="") =
 		gdalvectortranslate([Dataset(ds.ptr)], opts; dest=dest, gdataset=gdataset, save=save)
-	gdalvectortranslate(ds::GMTdataset, opts::Vector{String}=String[]; dest="/vsimem/tmp", gdataset=false, save="") = 				gdalvectortranslate([ds], opts; dest=dest, gdataset=gdataset, save=save)
+	gdalvectortranslate(ds::GMTdataset, opts::Vector{String}=String[]; dest="/vsimem/tmp", gdataset=false, save="") =
+		gdalvectortranslate([ds], opts; dest=dest, gdataset=gdataset, save=save)
 	function gdalvectortranslate(ds::Vector{GMTdataset}, opts::Vector{String}=String[]; dest="/vsimem/tmp", gdataset=false, save="")
 		o = gdalvectortranslate(gmt2gd(ds), opts; dest=dest, gdataset=gdataset, save=save)
 		(!isa(o, GDtype) && dest == "/vsimem/tmp") && deletedatasource(o, "/vsimem/tmp")	# WTF do I need to do this?
@@ -2643,7 +2644,7 @@ end
 
 	export
 		bwareaopen, getband, getdriver, getlayer, getproj, getgeom, getgeotransform, toPROJ4, toWKT, importPROJ4,
-		importWKT, importEPSG, gdalinfo, gdalwarp, gdaldem, gdaltranslate, gdalgrid, gdalvectortranslate, ogr2ogr,
+		importWKT, importEPSG, gdalinfo, gdalwarp, gdaldem, gdaltranslate, gdalgrid, ogr2ogr, gdalvectortranslate,
 		gdalrasterize, gdalbuildvrt, readraster, setgeotransform!, setproj!, destroy, arcellipse, arccircle,
 		delaunay, dither, buffer, centroid, intersection, intersects, polyunion, fromWKT, fillnodata!, fillnodata,
 		concavehull, convexhull, difference, symdifference, distance, geomarea, geodesicarea, pointalongline, polygonize,

src/grdgradient.jl

@@ -51,8 +51,8 @@ end
 # ---------------------------------------------------------------------------------------------------
 function parse_Q_grdgrad(d::Dict, symbs::Array{<:Symbol}, cmd::String)
 	(SHOW_KWARGS[1]) && return print_kwarg_opts(symbs, "String")
-    if ((val = find_in_dict(d, symbs)[1]) !== nothing)
-		val = string(val)[1]
+    if ((val_ = hlp_desnany_str(d, symbs)) !== "")
+		val = val_[1]
 		(val == 's') && (val = 'c')
 		(val == 'c' || val == 'r' || val == 'R') && (cmd *= " -Q" * val)
     end

test/test_imgfuns.jl

@@ -41,4 +41,7 @@
 	I = gmtread(GMT.TESTSDIR * "assets/coins.jpg");
 	binarize(I, band=1);
 	binarize(I, [30, 80]);
+
+	# Anaglyph
+	anaglyph("@earth_relief_10m", region=(-10.5, -5, 35, 44));
 end