diff --git a/src/common_options.jl b/src/common_options.jl index cce3464b9..6c63edeaf 100644 --- a/src/common_options.jl +++ b/src/common_options.jl @@ -4879,8 +4879,8 @@ function digests_legend_bag(d::Dict, del::Bool=true) end _d = (haskey(dd, :box) && dd[:box] !== nothing) ? dd : haskey(LEGEND_TYPE[1].optsDict, :box) ? LEGEND_TYPE[1].optsDict : Dict{Symbol, Any}() - if ((opt_F::String = add_opt(_d, "", "", [:box], - (clearance="+c", fill=("+g", add_opt_fill), inner="+i", pen=("+p", add_opt_pen), rounded="+r", shade="+s"); del=false)) == "") + opt_F::String = add_opt2(_d, "", "", [:box], (clearance="+c", fill=("+g", add_opt_fill), inner="+i", pen=("+p", add_opt_pen), rounded="+r", shade="+s"); del=false) # FORCES RECOMPILATION + if (opt_F == "") opt_F = "+p0.5+gwhite" else if (opt_F == "none") @@ -4900,6 +4900,10 @@ function digests_legend_bag(d::Dict, del::Bool=true) return nothing end +function add_opt2(d::Dict, cmd::String, opt::String, symbs::VMs, mapa; grow_mat=nothing, del::Bool=true, expand::Bool=false, expand_str::Bool=false)::String + return cmd +end + # --------------------------------------------------------------------------------------------------- function get_legend_font(d::Dict, fs=0; modern::Bool=false)::String # This fun gets the font size to be used in legends, but it serves two masters. On one side we want to keep the diff --git a/src/psxy.jl b/src/psxy.jl index f018385d7..34852bf53 100644 --- a/src/psxy.jl +++ b/src/psxy.jl @@ -32,7 +32,8 @@ function _common_plot_xyz(cmd0::String, arg1, caller::String, O::Bool, K::Bool, cmd, isFV, caller, sub_module, gmt_proggy, opt_A, g_bar_fill, arg1 = parse_plot_callers(d, gmt_proggy, caller, is3D, O, arg1) # --------------------- Check the grid2tri cases -------------------- - cmd, is_gridtri, arg1 = parse_grid2tri_case(d, cmd, caller, is3D, isFV, O, arg1) # FORCES RECOMPILE + #cmd, is_gridtri, arg1 = parse_grid2tri_case(d, cmd, caller, is3D, isFV, O, arg1) # FORCES RECOMPILE + is_gridtri = false isa(arg1, GMTdataset) && (arg1 = with_xyvar(d, arg1)) # See if we have a column request based on column names if ((val = hlp_desnany_int(d, [:decimate])) !== -999) # Asked for a clever data decimation? @@ -76,6 +77,7 @@ function _common_plot_xyz(cmd0::String, arg1, caller::String, O::Bool, K::Bool, axis_equal = is_axis_equal(d) # See if the user asked for an equal aspect ratio cmd, opt_JZ = parse_JZ(d, cmd; O=O, is3D=is3D) cmd, _ = parse_common_opts(d, cmd, [:a :e :f :g :t :w :margin :params]; first=first) # FORCES RECOMPILE +#= cmd, opt_l = parse_l(d, cmd) # Parse this one (legend) aside so we can use it in classic mode cmd, opt_f = parse_f(d, cmd) # Parse this one (-f) aside so we can check against D.attrib cmd = parse_these_opts(cmd, d, [[:D :shift :offset], [:I :intens], [:N :no_clip :noclip], [:T]]) @@ -255,6 +257,7 @@ function _common_plot_xyz(cmd0::String, arg1, caller::String, O::Bool, K::Bool, CTRL.pocket_d[1] = d # Store d that may be not empty with members to use in other modules (opt_B == " -B") && gmt_restart() # For some Fking mysterious reason (see Ex45) return R +=# end # ---------------------------------------------------------------------------------------------------