Merge pull request #1978 from GenericMappingTools/colorset

Add a colorset! function to set color is Vec Datasets.

Author: joa-quim

src/GMT.jl

@@ -144,8 +144,8 @@ export
 	segy, segy!, segyz, segyz!, segy2grd, stereonet, stereonet!, add_opt, isgeog, numel, scan_opt, extrema_nan, parse_RIr,
 	close_PS_file, getsize, meshgrid, parse_B, parse_BJR, parse_I,
 	parse_J, parse_R, ressurectGDAL, CPTaliases, isJLL, POSTMAN, PSname, mgd77magref, magref, find_in_dict, find_in_kwargs,
-	mbimport, mbgetdata, mbsvplist, mblevitus, blendimg!, lonlat2xy, xy2lonlat, df2ds, mat2ds, mat2grid, mat2img, slicecube,
-	cubeslice, linspace, logspace, fileparts,
+	mbimport, mbgetdata, mbsvplist, mblevitus, blendimg!, lonlat2xy, xy2lonlat, df2ds, setcolors!, mat2ds, mat2grid, mat2img,
+	slicecube, cubeslice, linspace, logspace, fileparts,
 	tests, fields, flipud, fliplr, flipdim, flipdim!, grdinterpolate, pow, tic, toc, theme, tern2cart, geodetic2enu, cpt4dcw,
 	getregion, getattribs, getattrib, getres, gd2gmt, gmt2gd, gdalread, gdalshade, gdalwrite, gadm, xyzw2cube,
 	coastlinesproj, graticules, orbits, orbits!, plotgrid!, leepacific, worldrectangular, worldrectgrid, togglemask,

src/legend_funs.jl

@@ -621,10 +621,18 @@ function _best_label_pos(D::Vector{<:GMTdataset}, labels::Vector{String}, nc::In
 		nd = hypot(nx_d, ny_d)
 		nx_d /= nd;  ny_d /= nd
 		half_d = min(xmax - xmin, ymax - ymin) * 0.015
-		result[i,1] = clamp(cx_dat - nx_d * half_d, xmin, xmax)
-		result[i,2] = clamp(cy_dat - ny_d * half_d, ymin, ymax)
-		result[i,3] = clamp(cx_dat + nx_d * half_d, xmin, xmax)
-		result[i,4] = clamp(cy_dat + ny_d * half_d, ymin, ymax)
+		s_neg, s_pos = half_d, half_d
+		if nx_d > 0       s_neg = min(s_neg, (cx_dat - xmin) / nx_d);  s_pos = min(s_pos, (xmax - cx_dat) / nx_d)
+		elseif nx_d < 0   s_neg = min(s_neg, (xmax - cx_dat) / -nx_d); s_pos = min(s_pos, (cx_dat - xmin) / -nx_d)
+		end
+		if ny_d > 0       s_neg = min(s_neg, (cy_dat - ymin) / ny_d);  s_pos = min(s_pos, (ymax - cy_dat) / ny_d)
+		elseif ny_d < 0   s_neg = min(s_neg, (ymax - cy_dat) / -ny_d); s_pos = min(s_pos, (cy_dat - ymin) / -ny_d)
+		end
+		s_neg = max(s_neg, 1e-6);  s_pos = max(s_pos, 1e-6)
+		result[i,1] = cx_dat - nx_d * s_neg
+		result[i,2] = cy_dat - ny_d * s_neg
+		result[i,3] = cx_dat + nx_d * s_pos
+		result[i,4] = cy_dat + ny_d * s_pos
 	end
 	return result
 end
@@ -669,30 +677,31 @@ function _label_pos_at_vals(D::Vector{<:GMTdataset}, nc::Int, xvals::Vector{Floa
 
 		!found && error("Value $(target) not found on curve $i")
 
-		# Build short perpendicular segment in data coordinates
-		# Use a small delta based on data range
-		dx = data[end,1] - data[1,1]
-		dy = data[end,2] - data[1,2]
-		scale = max(abs(dx), abs(dy)) * 0.005
+		# Build short perpendicular segment in data coordinates, guaranteed to stay inside the plot region.
+		if CTRL.limits[7] != 0
+			xmin, xmax, ymin, ymax = CTRL.limits[7:10]
+		else
+			xmin, xmax, ymin, ymax = getregion(D)
+		end
+		scale = max(xmax - xmin, ymax - ymin) * 0.005
 		scale = max(scale, 1e-6)
 		nx, ny = -sin(best_ang), cos(best_ang)
-		result[i,1] = best_px - nx * scale
-		result[i,2] = best_py - ny * scale
-		result[i,3] = best_px + nx * scale
-		result[i,4] = best_py + ny * scale
-	end
 
-	# Clamp all insertion points to the plot region so GMT doesn't skip labels outside it
-	if CTRL.limits[7] != 0
-		xmin, xmax, ymin, ymax = CTRL.limits[7:10]
-	else
-		xmin, xmax, ymin, ymax = getregion(D)
-	end
-	for i in 1:nc
-		result[i,1] = clamp(result[i,1], xmin, xmax)
-		result[i,2] = clamp(result[i,2], ymin, ymax)
-		result[i,3] = clamp(result[i,3], xmin, xmax)
-		result[i,4] = clamp(result[i,4], ymin, ymax)
+		# Asymmetric limits: each endpoint limited independently so the segment stays inside
+		# but extends as far as possible in the direction that has room.
+		s_neg, s_pos = scale, scale		# scale for (center - n*s) and (center + n*s)
+		if nx > 0       s_neg = min(s_neg, (best_px - xmin) / nx);  s_pos = min(s_pos, (xmax - best_px) / nx)
+		elseif nx < 0   s_neg = min(s_neg, (xmax - best_px) / -nx); s_pos = min(s_pos, (best_px - xmin) / -nx)
+		end
+		if ny > 0       s_neg = min(s_neg, (best_py - ymin) / ny);  s_pos = min(s_pos, (ymax - best_py) / ny)
+		elseif ny < 0   s_neg = min(s_neg, (ymax - best_py) / -ny); s_pos = min(s_pos, (best_py - ymin) / -ny)
+		end
+		s_neg = max(s_neg, 1e-6);  s_pos = max(s_pos, 1e-6)
+
+		result[i,1] = best_px - nx * s_neg
+		result[i,2] = best_py - ny * s_neg
+		result[i,3] = best_px + nx * s_pos
+		result[i,4] = best_py + ny * s_pos
 	end
 	return result
 end
@@ -881,15 +890,25 @@ end
 function _outside_label_data(D::Vector{<:GMTdataset}, labels::Vector{String}, fontsize::Int)
 	nc = length(D)
 
-	# Get plot region limits from CTRL.pocket_R  e.g. " -R0/10/-1.5/1.5"
-	ymin, ymax = CTRL.limits[9], CTRL.limits[10]
+	# Get plot region limits
+	if CTRL.limits[7] != 0
+		ymin, ymax = CTRL.limits[9], CTRL.limits[10]
+	else
+		_, _, ymin, ymax = getregion(D)
+	end
+	(ymax - ymin) < 1e-10 && (ymin -= 0.5; ymax += 0.5)	# degenerate range fallback
 
-	# x positions: at plot region edge if right axis is drawn, otherwise at each curve's last point
+	# x positions: at the right edge of the plot region so labels start just beyond the axis
+	if CTRL.limits[7] != 0
+		xmax = CTRL.limits[8]
+	else
+		_, xmax, _, _ = getregion(D)
+	end
 	xs = Vector{Float64}(undef, nc)
 	ys = Vector{Float64}(undef, nc)
 	colors = Vector{String}(undef, nc)
 	for k in 1:nc
-		xs[k] = D[k].data[end, 1]
+		xs[k] = xmax
 		ys[k] = D[k].data[end, 2]
 		colors[k] = _extract_W_color(D[k].header)
 	end
@@ -918,12 +937,18 @@ function _outside_label_data(D::Vector{<:GMTdataset}, labels::Vector{String}, fo
 end
 
 # Extract the color component from a -W option in a GMT header string.
-# -W can have forms like: -W0.5,red  -W,blue  -W1p,red,dash  -W0.5,200/100/50
-# The color is the second comma-separated field after -W.
+# -W can have forms like: -W0.5,red  -W,blue  -W1p,red,dash  -W0.5,200/100/50  -W#0072BD  -Wred
+# The color is the second comma-separated field, or the only field if it looks like a color (not a pen width).
 function _extract_W_color(header::AbstractString)::String
 	m = match(r"-W([^, ]*),([^, ]+)", header)
-	m === nothing && return ""
-	return String(m.captures[2])
+	m !== nothing && return String(m.captures[2])
+	# No comma: -W<something> where <something> might be just a color (e.g. -W#0072BD, -Wred)
+	m2 = match(r"-W([^ ]+)", header)
+	m2 === nothing && return ""
+	s = m2.captures[1]
+	# It's a color if it starts with # (hex), contains / (r/g/b), or is not a pure number/pen-width
+	(startswith(s, "#") || contains(s, "/") || match(r"^[\d.]+[cipmn]?$", s) === nothing) && return String(s)
+	return ""
 end
 
 # --------------------------------------------------------------------------------------------------

src/psxy.jl

@@ -231,6 +231,14 @@ function _common_plot_xyz(w::wrapDatasets, caller::String, O::Bool, K::Bool, is3
 			(@warn("Can't plot the connector when 'bar' is already a nested call."); pocket_call[][3] = nothing))
 	end
 
+	if (isa(arg1, Vector{<:GMTdataset}) && (val = find_in_dict(d, [:setcolors :colorset])[1]) !== nothing)
+		if (val === true || val == 1)    setcolors!(arg1)
+		elseif isa(val, Symbol)          setcolors!(arg1; colorset=val)
+		elseif isa(val, Vector{String})  setcolors!(arg1; colorset=val)
+		elseif isa(val, NamedTuple)      setcolors!(arg1; val...)
+		end
+	end
+
 	haskey(d, :labellines) && (arg1 = add_labellines!(arg1, d, _cmd))
 
 	(!IamModern[]) && put_in_legend_bag(d, _cmd, arg1, O, opt_l)

src/utils_types.jl

@@ -251,11 +251,6 @@ function _mat2ds(@nospecialize(mat::Array{<:Real}), txt::Union{String,Vector{Str
 	_fill::Vector{String} = helper_ds_fill(d)
 
 	# ---  Here we deal with line colors and line thickness.
-	#if ((val = find_in_dict(d, [:lt :linethick :linethickness])[1]) !== nothing)
-		#if     (isa(val, AbstractString))  _lt::Vector{Float64} = [size_unit(val)]
-		#elseif (isa(val, Vector{String}))  _lt = size_unit(val)
-		#else                               _lt = isa(val, Real) ? [val] : vec(Float64.(val))
-		#end
 	_lt = hlp_desnany_vfloat(d, [:lt, :linethick, :linethickness])
 	if (!isempty(_lt))
 		_lts::Vector{String} = Vector{String}(undef, n_ds)
@@ -265,7 +260,6 @@ function _mat2ds(@nospecialize(mat::Array{<:Real}), txt::Union{String,Vector{Str
 		end
 	else
 		theW = (color_cycle || get(d, :ls, nothing) !== nothing || get(d, :linestyle, nothing) !== nothing || get(d, :pen, nothing) !== nothing) ? " -W" : ""
-		#theW = (color_cycle || haskey(d, :ls) || haskey(d, :linestyle) || haskey(d, :pen)) ? " -W" : ""
 		_lts = fill(theW, n_ds)		# If no pen setting no need to set -W
 	end
 
@@ -714,7 +708,59 @@ const matlab_cycle_colors = ["#0072BD", "#D95319", "#EDB120", "#7E2F8E", "#77AC3
 const alphabet_colors = ["#2BCE48", "#4C005C", "#005C31", "#5EF1F2", "#8F7C00", "#9DCC00", "#0075DC", "#94FFB5", "#740AFF", "#993F00", "#00998F", "#003380", "#191919", "#426600", "#808080", "#990000", "#C20088", "#E0FF66", "#F0A3FF", "#FF0010", "#FF5005", "#FFA8BB", "#FFA405", "#FFCC99", "#FFE100", "#FFFF80"]
 # https://sashamaps.net/docs/resources/20-colors/
 const simple_distinct = ["#e6194b", "#3cb44b", "#ffe119", "#4363d8", "#f58231", "#911eb4", "#46f0f0", "#f032e6", "#bcf60c", "#fabebe", "#008080", "#e6beff", "#9a6324", "#fffac8", "#800000", "#aaffc3", "#808000", "#ffd8b1", "#000075", "#808080"]
- 
+
+# ---------------------------------------------------------------------------------------------------
+"""
+    setcolors!(D::Vector{<:GMTdataset}; colorset=:auto, fill=false) -> D
+
+Assign cycling line colors (`-W`) and optionally fill colors (`-G`) to a vector of datasets.
+
+### Args
+- `D`: Vector of GMTdataset to modify in-place.
+
+### Kwargs
+- `colorset`: Color palette to use. One of `:auto` (default: `:matlab` for ≤7 curves, `:distinct` otherwise),
+  `:matlab`, `:distinct`, or `:alphabet`. Can also be a `Vector{String}` of custom colors.
+- `fill`: If `true`, also add `-G<color>` fill to each header.
+
+If a `-W` option already exists in the header, the color is inserted or replaced while preserving
+pen width and style. If no `-W` exists, one is added with the color only.
+"""
+function setcolors!(D::Vector{<:GMTdataset}; colorset::Union{Symbol,Vector{String}}=:auto, fill::Bool=false)
+	nc = length(D)
+	if isa(colorset, Vector{String})
+		colors = colorset
+	else
+		colors = (colorset == :matlab)   ? matlab_cycle_colors :
+		         (colorset == :distinct) ? simple_distinct :
+		         (colorset == :alphabet) ? alphabet_colors :
+		         (nc <= 7) ? matlab_cycle_colors : simple_distinct		# :auto
+	end
+	n_colors = length(colors)
+
+	for k in 1:nc
+		c = colors[mod1(k, n_colors)]
+		hdr = D[k].header::String
+		m = match(r"-W([^ ]*)", hdr)
+		if (m !== nothing)				# Parse existing -W: could be "-W1.5" or "-W1.5,red" or "-W1.5,red,dash" or "-W,blue"
+			parts = split(m.captures[1], ',')
+			if (length(parts) == 1)					# No color yet, e.g. "-W1.5" → "-W1.5,<color>"
+				new_W = "-W" * parts[1] * "," * c
+			elseif (length(parts) == 2)				# Has color, e.g. "-W1.5,red" → "-W1.5,<color>"
+				new_W = "-W" * parts[1] * "," * c
+			else									# Has color+style, e.g. "-W1.5,red,dash" → "-W1.5,<color>,dash"
+				new_W = "-W" * parts[1] * "," * c * "," * join(parts[3:end], ",")
+			end
+			hdr = replace(hdr, m.match => new_W)
+		else
+			hdr = hdr * " -W" * c
+		end
+		fill && (hdr = replace(hdr, r" -G[^ ]+" => "") * " -G" * c)
+		D[k].header = hdr
+	end
+	return D
+end
+
 # ---------------------------------------------------------------------------------------------------
 """
     FV = fv2fv(F, V; proj="", proj4="", wkt="", epsg=0) -> GMTfv

test/runtests.jl

@@ -94,6 +94,8 @@ using InteractiveUtils
 	include("test_GRDs.jl")
 	println("		Entering: test_views.jl")
 	include("test_views.jl")
+	println("		Entering: test_labellines.jl")
+	include("test_labellines.jl")
 	println("		Entering: test_PSs.jl")
 	include("test_PSs.jl")
 	include("test_modern.jl")