diff --git a/Project.toml b/Project.toml index a8fb85c..fcdd62a 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "FLOWNoise" uuid = "d27480ee-285d-533b-ae3d-5018956ae0bc" author = ["Eduardo Alvarez and Tyler Critchfield "] -version = "2.3.2" +version = "2.3.3" [deps] FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" @@ -18,7 +18,6 @@ FLOWMath = "6cb5d3fb-0fe8-4cc2-bd89-9fe0b19a99d3" [compat] julia = "1" -PyPlot = "< 2.11.2" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/FLOWNoise.jl b/src/FLOWNoise.jl index bf89757..1e9173d 100644 --- a/src/FLOWNoise.jl +++ b/src/FLOWNoise.jl @@ -13,11 +13,11 @@ module FLOWNoise # ------------ FLOW CODES ------------------------------------------------------ # GeometricTools https://github.com/byuflowlab/GeometricTools.jl import GeometricTools -gt = GeometricTools +const gt = GeometricTools # FLOWMath https://github.com/byuflowlab/FLOWMath.jl import FLOWMath -math = FLOWMath +const math = FLOWMath # ------------ GENERIC MODULES ------------------------------------------------- @@ -33,20 +33,7 @@ import Statistics: mean import Base: read using Printf -# Plot Format const plt = PyPlot -plt.rc("font", family="Times New Roman") # Text font -plt.rc("mathtext", fontset="stix") # Math font -SMALL_SIZE = 12 -MEDIUM_SIZE = 14 -BIGGER_SIZE = 16 -plt.rc("font", size=SMALL_SIZE) # controls default text sizes -plt.rc("axes", titlesize=SMALL_SIZE) # fontsize of the axes title -plt.rc("axes", labelsize=MEDIUM_SIZE) # fontsize of the x and y labels -plt.rc("xtick", labelsize=SMALL_SIZE) # fontsize of the tick labels -plt.rc("ytick", labelsize=SMALL_SIZE) # fontsize of the tick labels -plt.rc("legend", fontsize=SMALL_SIZE) # legend fontsize -plt.rc("figure", titlesize=BIGGER_SIZE) # fontsize of the figure title # ------------ GLOBAL VARIABLES ------------------------------------------------ const module_path = splitdir(@__FILE__)[1] # Path to this module @@ -61,7 +48,6 @@ for module_name in ["observer", "wopwop", "wav", "processing", include("FLOWNoise_"*module_name*".jl") end - function read(io, T, n) return [read(io, T) for i in 1:n] end diff --git a/src/FLOWNoise_postprocessing.jl b/src/FLOWNoise_postprocessing.jl index a5877bb..bbf09aa 100644 --- a/src/FLOWNoise_postprocessing.jl +++ b/src/FLOWNoise_postprocessing.jl @@ -9,6 +9,19 @@ * License : MIT =############################################################################### +function formatpyplot() + # Fonts + plt.rc("font", family="STIXGeneral") # Text font + plt.rc("mathtext", fontset="stix") # Math font + plt.rc("font", size=12) # controls default text sizes + plt.rc("axes", titlesize=12) # fontsize of the axes title + plt.rc("axes", labelsize=14) # fontsize of the x and y labels + plt.rc("xtick", labelsize=12) # fontsize of the tick labels + plt.rc("ytick", labelsize=12) # fontsize of the tick labels + plt.rc("legend", fontsize=12) # legend fontsize + plt.rc("figure", titlesize=16) # fontsize of the figure title +end + """ `read_data(dataset_infos; datasets_pww=def_datasets_pww, datasets_bpm=def_datasets_bpm,