From 3f2df3a60e62bf46fa3bf46642399e242e525aa0 Mon Sep 17 00:00:00 2001 From: AlexisRenchon Date: Mon, 9 May 2022 09:10:10 -0500 Subject: [PATCH] GLMakie 0.6 --- Project.toml | 4 ++-- README.md | 2 +- src/functions/viz/DAMMviz.jl | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Project.toml b/Project.toml index f2bd5a2..5fc37a7 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "DAMMmodel" uuid = "7af7f183-cd03-4039-bf6b-67ea3eb1648d" authors = ["Alexandre A. Renchon"] -version = "0.1.15" +version = "0.1.16" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" @@ -17,7 +17,7 @@ UnitfulMoles = "999f2bd7-36bf-5ba7-9bc1-c9473aa75374" [compat] DataFrames = "1.3.2" DocStringExtensions = "0.8.6" -GLMakie = "0.5.2, 0.6" +GLMakie = "0.6" LsqFit = "0.12.1" UnicodeFun = "0.4.1" Unitful = "1.10.1" diff --git a/README.md b/README.md index 71410d3..9c64e63 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://CUPofTEAproject.github.io/DAMMmodel.jl/stable) [![DAMMmodel Downloads](https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/DAMMmodel)](https://pkgs.genieframework.com?packages=DAMMmodel) -![version](https://img.shields.io/badge/version-0.1.15-green) +![version](https://img.shields.io/badge/version-0.1.16-green) diff --git a/src/functions/viz/DAMMviz.jl b/src/functions/viz/DAMMviz.jl index 26aacdd..47546d2 100755 --- a/src/functions/viz/DAMMviz.jl +++ b/src/functions/viz/DAMMviz.jl @@ -28,15 +28,15 @@ function DAMMviz(;width = 2200, height = 1600, fontsize = 30) 0.7:0.1:3.0 # Q10Km ]; # sliders = [Slider(fig, range = sr) for sr in sliderranges]; - texts[1] = Label(fig, text= lift(X->string("Parameters\n", to_latex("\\alpha_{sx}"), " = ", X, to_latex(" (mgC cm^{-3} h^{-1})")), sliders[1].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[2] = Label(fig, text= lift(X->string(to_latex("E_a"), " = ", X, to_latex(" (kJ mol^{-1})")), sliders[2].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[3] = Label(fig, text= lift(X->string(to_latex("kM_{sx}"), " = ", round(X, sigdigits = 2), to_latex(" (gC cm^{-3})")), sliders[3].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[4] = Label(fig, text= lift(X->string(to_latex("kM_{o2}"), " = ", X, to_latex(" (L L^{-1})")), sliders[4].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[5] = Label(fig, text= lift(X->string(to_latex("Porosity"), " = ", X, to_latex(" (m^3 m^{-3})")), sliders[5].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[6] = Label(fig, text= lift(X->string(to_latex("S_x"), " = ", X, to_latex(" (gC cm^{-3})")), sliders[6].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); - texts[7] = Label(fig, text= lift(X->string("Drivers\n", to_latex("T_s"), " = ", X, to_latex(" (°C)")), sliders[7].value), justification = :left, halign = :left, fontsize = fontsize, color = :green, width = Auto(false)); - texts[8] = Label(fig, text= lift(X->string(to_latex("θ"), " = ", round(X, sigdigits = 3), to_latex(" (m^3 m^{-3})")), sliders[8].value), justification = :left, halign = :left, fontsize = fontsize, color = :green, width = Auto(false)); - texts[9] = Label(fig, text= lift(X->string(to_latex("Q_{10} of kM_{sx}"), " = ", X, to_latex(" (-)")), sliders[9].value), justification = :left, halign = :left, fontsize = fontsize, width = Auto(false)); + texts[1] = Label(fig, text= lift(X->string("Parameters\n", to_latex("\\alpha_{sx}"), " = ", X, to_latex(" (mgC cm^{-3} h^{-1})")), sliders[1].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[2] = Label(fig, text= lift(X->string(to_latex("E_a"), " = ", X, to_latex(" (kJ mol^{-1})")), sliders[2].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[3] = Label(fig, text= lift(X->string(to_latex("kM_{sx}"), " = ", round(X, sigdigits = 2), to_latex(" (gC cm^{-3})")), sliders[3].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[4] = Label(fig, text= lift(X->string(to_latex("kM_{o2}"), " = ", X, to_latex(" (L L^{-1})")), sliders[4].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[5] = Label(fig, text= lift(X->string(to_latex("Porosity"), " = ", X, to_latex(" (m^3 m^{-3})")), sliders[5].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[6] = Label(fig, text= lift(X->string(to_latex("S_x"), " = ", X, to_latex(" (gC cm^{-3})")), sliders[6].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); + texts[7] = Label(fig, text= lift(X->string("Drivers\n", to_latex("T_s"), " = ", X, to_latex(" (°C)")), sliders[7].value), justification = :left, halign = :left, textsize = fontsize, color = :green, width = Auto(false)); + texts[8] = Label(fig, text= lift(X->string(to_latex("θ"), " = ", round(X, sigdigits = 3), to_latex(" (m^3 m^{-3})")), sliders[8].value), justification = :left, halign = :left, textsize = fontsize, color = :green, width = Auto(false)); + texts[9] = Label(fig, text= lift(X->string(to_latex("Q_{10} of kM_{sx}"), " = ", X, to_latex(" (-)")), sliders[9].value), justification = :left, halign = :left, textsize = fontsize, width = Auto(false)); αsx = sliders[1].value set_close_to!(sliders[1], 7e8) @@ -77,7 +77,7 @@ function DAMMviz(;width = 2200, height = 1600, fontsize = 30) #vertical_sublayout2 = fig[1, 2] = vgrid!( Iterators.flatten(zip(texts[7:8], sliders[7:8]))..., - Label(fig, text = lift(X -> string("\n", to_latex("R_{s} = "), X, to_latex(" (\\mumol m^{-2} s^{-1})")), Rₛᵣ), color = :red, justification = :left, halign = :left, fontsize = fontsize, width = Auto(false))), halign = :left) #width = 200, height = 1000); + Label(fig, text = lift(X -> string("\n", to_latex("R_{s} = "), X, to_latex(" (\\mumol m^{-2} s^{-1})")), Rₛᵣ), color = :red, justification = :left, halign = :left, textsize = fontsize, width = Auto(false))), halign = :left) #width = 200, height = 1000); s3D = surface!(ax3D, x, y, DAMM_Matrix, colormap = Reverse(:Spectral), transparency = true, alpha = 0.2, shading = false, colorrange = (0, 30))