Fix powerspectrum bands on notebooks (#527)

* fix repeated generation of powerspectrum bands and labels

* reduce the threshold for checking if the solution was saved at regular time steps

* make it almost impossible to generate duplicate params

* bump version

---------

Co-authored-by: Mason Protter <[email protected]>
Co-authored-by: harisorgn <[email protected]>

Project.toml

@@ -1,7 +1,7 @@
 name = "Neuroblox"
 uuid = "769b91e5-4c60-41ee-bfae-153c84203cb2"
 repo = "https://github.com/Neuroblox/Neuroblox.jl.git"
-version = "0.5.5"
+version = "0.5.6"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

ext/MakieExtension.jl

@@ -298,6 +298,13 @@ end
         gamma_label_position = 60,
         band_labels_vertical_position = "top",
         band_labels_vertical_offset = 0.065,
+        bands_generated = false,
+        poly_alpha = nothing,
+        poly_beta = nothing,
+        poly_gamma = nothing,
+        alpha_label = nothing,
+        beta_label = nothing,
+        gamma_label = nothing,
 
         show_bands = true,
         sampling_rate = nothing,
@@ -393,14 +400,28 @@ function set_powerplot_axis(p)
 end
 
 function show_bands!(p, y1, y2)
-    poly!(p, Point2f[(p.alpha_start[], y1), (p.alpha_start[], y2), (p.beta_start[], y2), (p.beta_start[], y1)], color = (:red,0.2), strokecolor = :black, strokewidth = 1)
-    poly!(p, Point2f[(p.beta_start[], y1), (p.beta_start[], y2), (p.gamma_start[], y2), (p.gamma_start[], y1)], color = (:blue,0.2), strokecolor = :black, strokewidth = 1)
-    poly!(p, Point2f[(p.gamma_start[], y1), (p.gamma_start[], y2), (p.gamma_end[], y2), (p.gamma_end[], y1)], color = (:green,0.2), strokecolor = :black, strokewidth = 1)
-
+    alpha_band_position = Point2f[(p.alpha_start[], y1), (p.alpha_start[], y2), (p.beta_start[], y2), (p.beta_start[], y1)]
+    beta_band_position = Point2f[(p.beta_start[], y1), (p.beta_start[], y2), (p.gamma_start[], y2), (p.gamma_start[], y1)]
+    gamma_band_position = Point2f[(p.gamma_start[], y1), (p.gamma_start[], y2), (p.gamma_end[], y2), (p.gamma_end[], y1)]
     labels_y = p.band_labels_vertical_position[] == "top" ? y2 - (y2-y1)*p.band_labels_vertical_offset[] : y1 + (y2-y1)*p.band_labels_vertical_offset[]
-    text!(p, (p.alpha_label_position[], labels_y); text=L"\alpha", fontsize=24)
-    text!(p, (p.beta_label_position[], labels_y); text=L"\beta", fontsize=24)
-    text!(p, (p.gamma_label_position[], labels_y); text=L"\gamma", fontsize=24)
+
+    if !p.bands_generated[]
+        p.poly_alpha[] = poly!(p, alpha_band_position, color = (:red,0.2), strokecolor = :black, strokewidth = 1)
+        p.poly_beta[] = poly!(p, beta_band_position, color = (:blue,0.2), strokecolor = :black, strokewidth = 1)
+        p.poly_gamma[] = poly!(p, gamma_band_position, color = (:green,0.2), strokecolor = :black, strokewidth = 1)
+
+        p.alpha_label[] = text!(p, (p.alpha_label_position[], labels_y); text=L"\alpha", fontsize=24)
+        p.beta_label[] = text!(p, (p.beta_label_position[], labels_y); text=L"\beta", fontsize=24)
+        p.gamma_label[] = text!(p, (p.gamma_label_position[], labels_y); text=L"\gamma", fontsize=24)
+        p.bands_generated[] = true
+    else
+        p.poly_alpha[][1] = alpha_band_position
+        p.poly_beta[][1] = beta_band_position
+        p.poly_gamma[][1] = gamma_band_position
+        p.alpha_label[][1] = (p.alpha_label_position[], labels_y)
+        p.beta_label[][1] = (p.beta_label_position[], labels_y)
+        p.gamma_label[][1] = (p.gamma_label_position[], labels_y)
+    end
 end
 
 function _powerspectrumplot(p, blox, sol::AbstractSolution, powspec_kwargs)

src/Neurographs.jl

@@ -91,7 +91,7 @@ function make_unique_param_pairs(params)
     else
         map(params) do p
             if count(pi -> Symbol(pi) == Symbol(p), params) > 1
-                p => Symbol(p, "_$(rand(1:1000))")
+                p => Symbol(p, "_$(rand(1:1000000))")
             else
                 p => Symbol(p)
             end

src/blox/blox_utilities.jl

@@ -671,7 +671,7 @@ function get_sampling_info(sol::SciMLBase.AbstractSolution; sampling_rate=nothin
     first_diff = dt[1]
 
     # check if the solution was saved at regular time steps
-    if !isapprox(dt_std, 0, atol=1e-10 * first_diff)
+    if !isapprox(dt_std, 0, atol=1e-2 * first_diff)
         if isnothing(sampling_rate)
             @warn("Solution not saved at fixed time steps. Provide 'sampling_rate' in milliseconds.")
             sampling_rate = first_diff