Merge branch 'master' into compathelper/new_version/2024-08-27-01-02-…

…23-731-02574193590

Project.toml

@@ -1,7 +1,7 @@
 name = "PairPlots"
 uuid = "43a3c2be-4208-490b-832a-a21dcd55d7da"
 authors = ["William Thompson <wthompson@uvic.ca>"]
-version = "2.9.1"
+version = "2.9.3"
 
 [deps]
 Contour = "d38c429a-6771-53c6-b99e-75d170b6e991"

src/PairPlots.jl

@@ -314,9 +314,10 @@ function _apply_user_format_string(format)
     end
 end
 
+
 """
-    MarginConfidenceLimits(format_string::AbstractString; kwargs...)
-    MarginConfidenceLimits(formatter::Base.Callable=margin_confidence_default_formatter; kwargs...)
+    MarginConfidenceLimits(format_string::AbstractString, (0.16,0.5,0.84); kwargs...)
+    MarginConfidenceLimits(formatter::Base.Callable=margin_confidence_default_formatter, (0.16,0.5,0.84); kwargs...)
 
 """
 struct MarginConfidenceLimits <: VizTypeDiag
@@ -331,6 +332,23 @@ struct MarginConfidenceLimits <: VizTypeDiag
     end
 end
 
+"""
+    MarginQuantileLines(format_string::AbstractString; kwargs...)
+    MarginQuantileLines(formatter::Base.Callable=margin_confidence_default_formatter; kwargs...)
+
+"""
+struct MarginQuantileLines <: VizTypeDiag
+    formatter::Base.Callable
+    quantiles::NTuple{3,Number}
+    kwargs
+    function MarginQuantileLines(format::AbstractString, quantiles=(0.16, 0.5, 0.84); kwargs...)
+        return new(_apply_user_format_string(format),  quantiles, kwargs)
+    end
+    function MarginQuantileLines(formatter::Base.Callable=margin_confidence_default_formatter, quantiles=(0.16, 0.5, 0.84); kwargs...)
+        return new(formatter, quantiles, kwargs)
+    end
+end
+
 """
     MarginHist(;kwargs...)
     MarginHist(histprep_function; kwargs...)
@@ -588,9 +606,9 @@ function pairplot(
         return pairplot(grid, map(defaults1, datapairs)...; kwargs...)
     elseif len_datapairs_not_truth <= 5
         defaults_upto5((data,vizlayers)::Pair) = SeriesDefaults(data) => vizlayers
-        defaults_upto5(series::Series) = series => multi_series_default_viz3
+        defaults_upto5(series::Series) = series => multi_series_default_viz
         defaults_upto5(truths::Truth) = truths => truths_default_viz
-        defaults_upto5(data::Any) = SeriesDefaults(data) => multi_series_default_viz3
+        defaults_upto5(data::Any) = SeriesDefaults(data) => multi_series_default_viz
         return pairplot(grid, map(defaults_upto5, datapairs)...; kwargs...)
     else # More than 5 series
         defaults_morethan5((data,vizlayers)::Pair) = SeriesDefaults(data) => vizlayers
@@ -1160,6 +1178,29 @@ function diagplot(ax::Makie.Axis, viz::MarginConfidenceLimits, series::AbstractS
     )
 end
 
+
+function diagplot(ax::Makie.Axis, viz::MarginQuantileLines, series::AbstractSeries, colname)
+    cn = columnnames(series)
+    if colname ∉ cn
+        return
+    end
+    dat = ustrip(disallowmissing(vec(getcolumn(series, colname))))
+
+    quantiles = quantile(dat, viz.quantiles)
+    mid = quantiles[2]
+    low = mid - quantiles[1]
+    high = quantiles[3] - mid
+
+    Makie.vlines!(
+        ax,
+        [mid-low, mid, mid+high];
+        linestyle=:dash,
+        depth_shift=-10f0,
+        delete(NamedTuple(series.kwargs), invalid_attrs_lines2)...,
+        delete(NamedTuple(viz.kwargs), invalid_attrs_lines2)...,
+    )
+end
+
 function diagplot(ax::Makie.Axis, viz::MarginLines, series::AbstractSeries, colname)
     cn = columnnames(series)
     if colname ∉ cn

src/defaults.jl

@@ -16,8 +16,7 @@ const single_series_default_viz = (
     ),
     PairPlots.MarginConfidenceLimits()
 )
-# const 
-multi_series_default_viz3 = (
+const multi_series_default_viz = (
     PairPlots.Scatter(filtersigma=2),
     PairPlots.Contour(sigmas=2:2),
     PairPlots.Contourf(alpha=0.6,sigmas=1:1),