Third batch of changes after JETLS advices. (#1969)

Author: joa-quim

src/PrettyTables.jl

@@ -44,7 +44,6 @@ function crop_width_to_fit_string_in_field(str::AbstractString, field_width::Int
 
 	# If the user is asking for the continuation char, we must crop the string to account
 	# for the continuation char.
-	cont_str = ""
 
 	if add_continuation_char
 		cont_str_width = textwidth(continuation_char)
@@ -2579,6 +2578,8 @@ function _text_process_data_cell(ptable::ProcessedTable, cell_data::Any, cell_st
 	lstr = textwidth(cell_str)
 
 	if cell_data isa CustomTextCell
+		@warn "CustomTextCell is not supported in the current version of Custom PrettyTables.jl."
+		#=
 		# To align a custom text cell, we need to compute the alignment and cropping data
 		# and apply it using the API functions.
 		padding = padding_for_string_alignment(cell_str, column_width, alignment; fill = true, printable_string_width = lstr)
@@ -2600,6 +2601,7 @@ function _text_process_data_cell(ptable::ProcessedTable, cell_data::Any, cell_st
 		end
 
 		cell_str = get_printable_cell_line(cell_data, l)::String
+		=#
 	else
 		# Align and crop the string to be printed.
 		cell_str = align_string(cell_str, column_width, alignment; fill = true, printable_string_width = lstr)
@@ -3069,9 +3071,12 @@ end
 
 function _text_parse_cell(@nospecialize(io::IOContext), cell::CustomTextCell; kwargs...)
 	# Call the API function to reset all the fields in the custom text cell.
+	@warn "CustomTextCell is not supported in the current version of Custom PrettyTables.jl."
+	#=
 	reset!(cell)
 	cell_vstr = parse_cell_text(cell; kwargs...)
 	return cell_vstr
+	=#
 end
 
 _text_parse_cell(@nospecialize(io::IOContext), cell::Missing; kwargs...) = ["missing"]
@@ -3100,7 +3105,7 @@ function _text_render_cell(::Val{:print}, @nospecialize(io::IOContext), str::Abs
 	# to the list of characters to be escaped.
 	output_str = Vector{String}(undef, length(vstr))
 
-	@inbounds for i in 1:length(vstr)
+	@inbounds for i in 1:numel(vstr)
 		s = vstr[i]
 		output_str[i] = sprint(escape_string, s, "", sizehint = lastindex(s))
 	end
@@ -3128,7 +3133,7 @@ function _text_render_cell(::Val{:show}, @nospecialize(io::IOContext), v::Abstra
 	vstr = sprint.(show, aux; context = context)
 
 	if !isstring
-		for i in 1:length(vstr)
+		for i in 1:numel(vstr)
 			aux_i   = first(vstr[i], length(vstr[i]) - 1)
 			vstr[i] = last(aux_i, length(aux_i) - 1)
 		end

src/gdal/gdal.jl

@@ -515,6 +515,7 @@ OGR_G_Contains(a1, a2) = acare(ccall((:OGR_G_Contains, libgdal), Cint, (pVoid, p
 OGR_G_ConvexHull(a1) = acare(ccall((:OGR_G_ConvexHull, libgdal), pVoid, (pVoid,), a1))
 OGR_G_ConcaveHull(a1, a2, a3) = acare(ccall((:OGR_G_ConcaveHull, libgdal), pVoid, (pVoid, Cdouble, Bool), a1, a2, a3))
 OGR_G_CreateGeometry(a1) = acare(ccall((:OGR_G_CreateGeometry, libgdal), pVoid, (UInt32,), a1))
+OGR_G_CreateFromWkt(a1, a2, a3) = acare(ccall((:OGR_G_CreateFromWkt, libgdal), Cint, (Ptr{Cstring}, pVoid, pVoid), a1, a2, a3))
 OGR_G_Crosses(a1, a2) = acare(ccall((:OGR_G_Crosses, libgdal), Cint, (pVoid, pVoid), a1, a2))
 OGR_G_DelaunayTriangulation(hThis, tol, edges) = acare(ccall((:OGR_G_DelaunayTriangulation, libgdal), pVoid, (pVoid, Cdouble, Cint), hThis, tol, edges))
 OGR_G_Simplify(hThis, tolerance) = acare(ccall((:OGR_G_Simplify, libgdal), pVoid, (pVoid, Cdouble), hThis, tolerance))

src/gmt_main.jl

@@ -360,7 +360,7 @@ end
 =#
 
 # ---------------------------------------------------------------------------------------------------
-function get_grid(API::Ptr{Nothing}, object, cube::Bool)::GMTgrid
+function get_grid(object, cube::Bool)::GMTgrid
 # Given an incoming GMT grid G, build a Julia type and assign the output components.
 # Note: Incoming GMT grid has standard padding while Julia grid has none.
 
@@ -795,9 +795,9 @@ function GMTJL_Get_Object(API::Ptr{Nothing}, X::GMT_RESOURCE)
 		error("GMT: Error reading virtual file $name from GMT")
 
 	if (X.family == GMT_IS_GRID)         	# A GMT grid; make it the pos'th output item
-		ptr = get_grid(API, X.object, false)
+		ptr = get_grid(X.object, false)
 	elseif (X.family == GMT_IS_CUBE)       	# A GMT cube; make it the pos'th output item
-		ptr = get_grid(API, X.object, true)
+		ptr = get_grid(X.object, true)
 	elseif (X.family == GMT_IS_DATASET)		# A GMT table; make it a matrix and the pos'th output item
 		ptr = get_dataset(X.object)
 	elseif (X.family == GMT_IS_PALETTE)		# A GMT CPT; make it a colormap and the pos'th output item

src/gmtconnect.jl

@@ -5,14 +5,14 @@ To see the documentation, type: ``@? gmtconnect``
 """
 function gmtconnect(cmd0::String="", arg1=nothing, arg2=nothing; kw...)
 	d = init_module(false, kw...)[1]
-	gmtconnect(cmd0, arg1, d)
+	gmtconnect(cmd0, arg1, arg2, d)
 end
-function gmtconnect(cmd0::String, arg1, d::Dict{Symbol, Any})
+function gmtconnect(cmd0::String, arg1, arg2, d::Dict{Symbol, Any})
 
 	cmd, = parse_common_opts(d, "", [:V_params :b :d :e :f :g :h :i :o :yx])
 	cmd  = parse_these_opts(cmd, d, [[:C :closed], [:D :dump], [:L :links :linkfile], [:Q :list :listfile], [:T :tolerance]])
 
-	common_grd(d, cmd0, cmd, "gmtconnect ", arg1)		# Finish build cmd and run it
+	common_grd(d, cmd0, cmd, "gmtconnect ", arg1, arg2)		# Finish build cmd and run it
 end
 
 # ---------------------------------------------------------------------------------------------------

src/grd_operations.jl

@@ -452,8 +452,8 @@ function Base.:permutedims(G1::GMTgrid, inds; nodata=nothing)
 	end
 	mat = permutedims(G1.z, inds)
 	# 3,2,1  3,1,2, 2,1,3  2,3,1  1,3,2
-	if     (inds == [3,2,1])  x, v, x_unit = v, x, G1.z_unit
-	elseif (inds == [3,1,2])  x, y, v, x_unit = v, x, y, G1.z_unit
+	if     (inds == [3,2,1])  x, v = v, x
+	elseif (inds == [3,1,2])  x, y, v = v, x, y
 	end
 	_nodata = G1.nodata
 	if (nodata !== nothing && eltype(G1) <: AbstractFloat && !isnan(nodata))

src/imgmorph/bwdist.jl

@@ -6,7 +6,7 @@ function bwdist(img::AbstractArray{Bool, N}; weights=nothing, nthreads=Threads.n
 	distance_transform(ft, weights)
 end
 function bwdist_idx(img::AbstractArray{Bool, N}; weights=nothing, nthreads=Threads.nthreads()) where {N}
-    ft = feature_transform(img; weights=weights, nthreads=nthreads)
+    feature_transform(img; weights=weights, nthreads=nthreads)
 end
 
 bwdist(mat::AbstractArray{T, N}; weights=nothing, nthreads=Threads.nthreads()) where {T,N} =

src/libgmt.jl

@@ -359,10 +359,10 @@ function GMT_Get_Enum(API::Ptr{Cvoid}, enum_name::String)
 end
 
 function GMT_Get_Version()
-	ver = ccall((:GMT_Get_Version, libgmt), Cfloat, (Ptr{Cvoid}, Ptr{Cuint}, Ptr{Cuint}, Ptr{Cuint}), C_NULL, C_NULL, C_NULL, C_NULL)
+	ccall((:GMT_Get_Version, libgmt), Cfloat, (Ptr{Cvoid}, Ptr{Cuint}, Ptr{Cuint}, Ptr{Cuint}), C_NULL, C_NULL, C_NULL, C_NULL)
 end
 function GMT_Get_Version(major, minor, patch)
-	ver = ccall((:GMT_Get_Version, libgmt), Cfloat, (Ptr{Cvoid}, Ptr{Cuint}, Ptr{Cuint}, Ptr{Cuint}), C_NULL, major, minor, patch)
+	ccall((:GMT_Get_Version, libgmt), Cfloat, (Ptr{Cvoid}, Ptr{Cuint}, Ptr{Cuint}, Ptr{Cuint}), C_NULL, major, minor, patch)
 end
 
 function GMT_Get_Ctrl(API::Ptr{Cvoid})

src/pshistogram.jl

@@ -246,7 +246,7 @@ function histogram_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol,A
 		vlines!([limit_L], pen="0.5p,blue,dashed", decorated=(quoted = true, n_labels = 1, const_label = "$limit_L", font = 9, pen = (0.5, :red)), R=opt_R[4:end], Vd=Vd_)
 		out2 = vlines!([limit_R], pen="0.5p,blue,dashed", decorated=(quoted = true, n_labels = 1, const_label = "$limit_R", font = 9, pen = (0.5, :red)), R=opt_R[4:end], fmt=fmt_, savefig=savefig_, show=show_, Vd=Vd_)
 	end
-	out = (out1 !== nothing && out2 !== nothing) ? [out1;out2] : ((out1 !== nothing) ? out1 : out2)
+	(out1 !== nothing && out2 !== nothing) ? [out1;out2] : ((out1 !== nothing) ? out1 : out2)
 
 end
 

src/pslegend.jl

@@ -137,7 +137,6 @@ function mk_legend(; kwargs...)
 	for n = 1:numel(ky)
 		code = isa(kwargs[n], NamedTuple) ? kwargs[n] : NamedTuple([ky[n]] .=> [kwargs[n]])
 		kw_str = lowercase(string(ky[n]))
-		k = keys(code)
 		if (kw_str == "H" || startswith(kw_str, "header"))		# code = (header=txt, font=?)	H 24p,Times-Roman My Map Legend
 			d = nt2dict(code)
 			f::String = ((val = find_in_dict(d, [:font])[1]) === nothing) ? "-" : font(val)

src/statplots.jl

@@ -658,7 +658,7 @@ end
 
 # ----------------------------------------------------------------------------------------------------------
 # Build violin polygon as a matrix. Uses loops instead of broadcast/vcat/hcat to reduce IR bloat.
-function _violin_polygon(d::Vector{Float64}, xd, x::Float64, split::Int, isVert::Bool)
+function _violin_polygon(d::AbstractVector{Float64}, xd, x::Float64, split::Int, isVert::Bool)
 	n = length(d)
 	if split == 0				# Both sides
 		m = 2n + 1
@@ -754,7 +754,9 @@ function helper1_violin(data::Union{Vector{Vector{T}}, AbstractMatrix{T}}, x::Ve
 		xd, d = Base.invokelatest(view,Dv[k].data,:,1), Base.invokelatest(view,Dv[k].data,:,2)
 		maxd = maximum(d)
 		scale = 1/2N_grp * 0.75 * groupwidth
-		d = [d[i] * scale / maxd for i in eachindex(d)]
+		for i in eachindex(d)
+			d[i] * scale / maxd
+		end  
 		(k == 2 && split != 0 && swing) && (split = (split == 1) ? 2 : 1)	# Not realy sure why we have to do this.
 		Dv[k].data = _violin_polygon(d, xd, _x[k] + off_in_grp, split, isVert)