From 3f22de50f6292e6a1ce4f5f828ec35b098ab4107 Mon Sep 17 00:00:00 2001
From: PharmCat <13901158+PharmCat@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:05:14 +0300
Subject: [PATCH] Dev (#19)

* plot update (ldict)

* plotting
---
 Project.toml  |  2 +-
 src/plots.jl  | 49 +++++++++++++++++++++++++++++++++++++++----------
 test/tests.jl |  3 +++
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Project.toml b/Project.toml
index 1decdfe..5e80938 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "MetidaNCA"
 uuid = "097c2839-c7bc-4c4b-a5f2-b4167c1b4e7c"
 authors = ["PharmCat <v.s.arnautov@yandex.ru>"]
-version = "0.5.8"
+version = "0.5.9"
 
 
 [deps]
diff --git a/src/plots.jl b/src/plots.jl
index 67d2f0f..e80c5b3 100644
--- a/src/plots.jl
+++ b/src/plots.jl
@@ -115,12 +115,16 @@ end
 end
 
 # Text label from ID
-function plotlabel(d)
+function plotlabel(d, ld = nothing)
     title = ""
     if isnothing(d) return title end
     if length(d) > 0
         for (k, v) in d
-            title *= "$(k) = $(v); "
+            kv = k
+            if !isnothing(ld) && haskey(ld, kv)
+                kv = ld[kv]
+            end
+            title *= "$(kv) = $(v); "
         end
     end
     return title
@@ -200,6 +204,10 @@ function pkplot(subj::AbstractSubject; ls = false, elim = false, xticksn = :auto
             end
             if !(:ylims in k)
                 kwargs[:ylims] = (minimum(obs)*0.5, maximum(obs)*2.)
+            else
+                if kwargs[:ylims][1] <= 0
+                    kwargs[:ylims] = (minimum(obs)/b, kwargs[:ylims][2])
+                end
             end
         end
     else
@@ -284,6 +292,10 @@ function pkplot!(subj; ls = false, elim = false, xticksn = :auto, yticksn = :aut
             end
             if !(:ylims in k)
                 kwargs[:ylims] = (minimum(obs)*0.5, maximum(obs)*2.)
+            else
+                if kwargs[:ylims][1] <= 0
+                    kwargs[:ylims] = (minimum(obs)/b, kwargs[:ylims][2])
+                end
             end
         end
     else
@@ -309,7 +321,7 @@ function pageplot(data, id, ulist; kwargs...)
     kwargs = Dict{Symbol, Any}(kwargs)
     k = keys(kwargs)
     if !(:title in k)
-        kwargs[:title] = plotlabel(id)
+        kwargs[:title] = plotlabel(id, kwargs[:ldict])
     end
 
     fst       = true
@@ -338,7 +350,7 @@ function pageplot(data, id, ulist; kwargs...)
                     if num ∈ labvec
                         kwargs[:label] = nothing
                     else
-                        kwargs[:label] = plotlabel(ulist[num])
+                        kwargs[:label] = plotlabel(ulist[num], kwargs[:ldict])
                         push!(labvec, num)
                     end
                 else
@@ -370,7 +382,8 @@ PK plot for subject set.
 * `typesort` - sort on page by this id key;
 * `pagesort` - different pages by this id key;
 * `filter` - use only subjects if filter ⊆ subject id;
-* `uylims` - same ylims for all dataset.
+* `uylims` - same ylims for all dataset;
+* `ldict` - Dict with labels for replace.
 
 Use `pagesort = MetidaNCA.NoPageSort()` to prevent page plotting.
 """
@@ -379,6 +392,7 @@ function pkplot(data::DataSet{T};
     pagesort::Union{Nothing, Symbol, AbstractVector{Symbol}, NoPageSort} = nothing,
     filter::Union{Nothing, Dict{Symbol}} = nothing,
     uylims::Bool = false,
+    ldict = nothing,
     kwargs...) where T <: AbstractSubject
 
     kwargs = Dict{Symbol, Any}(kwargs)
@@ -408,17 +422,16 @@ function pkplot(data::DataSet{T};
         end
         for subj in data
             if printtitle
-                kwargs[:title] = plotlabel(subj.id)
+                kwargs[:title] = plotlabel(subj.id, ldict)
             end
             if !(:legend in k)
                 kwargs[:legend] = false
             end
-            push!(p, pkplot(subj;  kwargs...))
+            push!(p, pkplot(subj; kwargs...))
         end
         return p
     end
 
-
     if !isnothing(typesort)
         if isa(typesort, Symbol) typesort = [typesort] end
         typelist = uniqueidlist(data, typesort)
@@ -434,13 +447,29 @@ function pkplot(data::DataSet{T};
         p = []
         pagelist = uniqueidlist(data, pagesort)
         for id in pagelist
-            push!(p, pageplot(data, id, typelist; kwargs...))
+            push!(p, pageplot(data, id, typelist; ldict, kwargs...))
         end
         return p
     else
         if !(:title in k) && !isnothing(filter)
             kwargs[:title] = plotlabel(filter)
         end
-        return pageplot(data, nothing, typelist; kwargs...)
+        return pageplot(data, nothing, typelist; ldict, kwargs...)
     end
+end
+
+
+"""
+    pkplot(data::DataSet{T}; kwargs...) where T <: NCAResult
+"""
+function pkplot(data::DataSet{T}; kwargs...) where T <: NCAResult
+    ds = map(x-> x.data, data)
+    pkplot(ds; kwargs...)
+end
+
+"""
+    pkplot(data::NCAResult; kwargs...) 
+"""
+function pkplot(data::NCAResult; kwargs...)
+    pkplot(data.data; kwargs...)
 end
\ No newline at end of file
diff --git a/test/tests.jl b/test/tests.jl
index 44fa67f..de92056 100644
--- a/test/tests.jl
+++ b/test/tests.jl
@@ -84,6 +84,9 @@ include("refdicts.jl")
     @test_nowarn MetidaNCA.plotstyle(40)
     pl = MetidaNCA.pkplot(ds[2])
     pl = MetidaNCA.pkplot!(ds[3]; yscale = :log10)
+    #Plot from NCA result DataSet
+    @test_nowarn MetidaNCA.pkplot(dsncafromds[1]; ylims = (0, 10), yscale = :log10, legend = false)
+    @test_nowarn MetidaNCA.pkplot(dsncafromds; typesort = :Subject, pagesort = :Formulation, elim = true, ls = true, title = "Plots")
     # Unknown typesort
     @test_nowarn pl = MetidaNCA.pkplot(ds; typesort = :unknown)