Skip to content

Shelter the read_data funs #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joa-quim merged 1 commit into from
Feb 28, 2026
Merged

Shelter the read_data funs #1943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/common_options.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ function add_opt_fill(@nospecialize(val), cmd::String="", opt::String="")::Stri
end

# ---------------------------------------------------------------------------------------------------
function get_cpt_set_R(d::Dict{Symbol,Any}, cmd0::String, cmd::String, opt_R::String, got_fname::Int, arg1, arg2=nothing, arg3=nothing, prog::String="")
function get_cpt_set_R(d::Dict{Symbol,Any}, cmd0::String, cmd::String, opt_R::String, got_fname::Int, @nospecialize(arg1), @nospecialize(arg2)=nothing, @nospecialize(arg3)=nothing, prog::String="")
# Get CPT either from keyword input of from CURRENT_CPT.
# Also puts -R in cmd when accessing grids from grdimage|view|contour, etc... (due to a GMT bug that doesn't do it)
# Use CMD0 = "" to use this function from within non-grd modules
Expand Down Expand Up @@ -3680,7 +3680,7 @@ function fname_out(d::Dict{Symbol,Any}, del::Bool=false)
end

# ---------------------------------------------------------------------------------------------------
function read_data(d::Dict{Symbol,Any}, fname::String, cmd::String, arg, opt_R::String="", is3D::Bool=false, get_info::Bool=false)
function read_data(d::Dict{Symbol,Any}, fname::String, cmd::String, @nospecialize(arg), opt_R::String="", is3D::Bool=false, get_info::Bool=false)
# Use 'get_info=true' to force reading the file when fname != ""

if (isa(arg, GMTfv) || isa(arg, Vector{GMTfv})) # A quick and dirty way to parse the GMTfv type
Expand Down Expand Up @@ -3747,7 +3747,7 @@ function read_data_barr_1(d, arg_is_nothing::Bool)
return arg
end

function _read_data(d::Dict{Symbol,Any}, cmd::String, arg, opt_R::String="", is3D::Bool=false, get_info::Bool=false,
function _read_data(d::Dict{Symbol,Any}, cmd::String, @nospecialize(arg), opt_R::String="", is3D::Bool=false, get_info::Bool=false,
opt_i::String="", opt_di::String="", opt_yx::String="")#::Tuple{String, Union{Nothing, GDtype}, String, Matrix{Float64}, String}
# In case DATA holds a file name, read that data and put it in ARG
# Also compute a tight -R if this was not provided. This forces reading a the `fname` file if provided.
Expand Down
Loading