Skip to content

Shelter colorbar to multiple recompilations. #1905

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 11, 2026
Merged

Shelter colorbar to multiple recompilations. #1905

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/plot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ Parameters
"""
function plot(arg1; first=true, kw...)
d = KW(kw)
_plot(arg1, first, d)
_plot(arg1, first==1, d)
end
function _plot(arg1, first, d)
function _plot(arg1, first::Bool, d::Dict{Symbol, Any})
# First check if arg1 is a GMTds of a linear fit and if yes, call the plotlinefit() fun
if (isa(arg1, GDtype) && is_in_dict(d, [:linefit :regress]; del=false) !== nothing)
att = isa(arg1, GMTdataset) ? arg1.attrib : arg1[1].attrib
Expand Down
12 changes: 6 additions & 6 deletions src/psscale.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ Plots gray scales or color scales on maps.
To see the full documentation type: ``@? colorbar``
"""
function colorbar(arg1::Union{Nothing, GMTcpt}=nothing; first=true, kwargs...)
dbg_cmd, d, cmd, arg1, K, O = colorbar_parser(arg1; first=first, kwargs...)
d, K, O = init_module(first==1, kwargs...) # Also checks if the user wants ONLY the HELP mode
dbg_cmd, d, cmd, arg1 = colorbar_parser(arg1, O, d)
(dbg_cmd !== nothing) && return dbg_cmd
r = prep_and_call_finish_PS_module(d, cmd, "", K, O, true, arg1)
(!isa(r,String)) && gmt("destroy") # Probably because of the rasters in cpt
end

function colorbar_parser(arg1::Union{Nothing, GMTcpt}=nothing; first=true, kwargs...)
function colorbar_parser(arg1::Union{Nothing, GMTcpt}, O::Bool, d::Dict{Symbol, Any})
gmt_proggy = (IamModern[]) ? "colorbar " : "psscale "
d, K, O = init_module(first, kwargs...) # Also checks if the user wants ONLY the HELP mode

parse_paper(d) # See if user asked to temporarily pass into paper mode coordinates

isBnone = (get(d, :B, nothing) == :none)
cmd = parse_BJR(d, "", "", O, "")[1]
contains(cmd, "Bpx+l") && (cmd = replace(cmd, "Bpx+" => "Bpxaf+")) # Because a simple -Bx would make annots at every color transition
opt_B = (!contains(cmd, " -B") && !IamModern[] && !isBnone) ? DEF_FIG_AXES[] : ""
opt_B = (!contains(cmd, " -B") && !isBnone) ? DEF_FIG_AXES[] : ""
cmd = parse_JZ(d, cmd; O=O, is3D=(CTRL.pocket_J[3] != ""))[1] # We can't use parse_J(d)[1]
cmd = parse_common_opts(d, cmd, [:F :UVXY :params :margin :c :p :t]; first=first)[1]
cmd = parse_common_opts(d, cmd, [:F :UVXY :params :margin :c :p :t]; first=!O)[1]
cmd = parse_these_opts(cmd, d, [[:G :truncate], [:I :shade], [:M :monochrome], [:N :dpi],
[:Q :log], [:S :appearance :nolines], [:W :scale], [:Z :zfile]])
opt_D = parse_type_anchor(d, "", [:D :pos :position],
Expand All @@ -91,7 +91,7 @@ function colorbar_parser(arg1::Union{Nothing, GMTcpt}=nothing; first=true, kwarg

cmd = gmt_proggy * cmd
r = check_dbg_print_cmd(d, cmd)
return r, d, cmd, arg1, K, O
return r, d, cmd, arg1
end

# ---------------------------------------------------------------------------------------------------
Expand Down
Loading