close plotqueues on clear_obs!

Author: hexaeder

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -65,7 +65,7 @@ function get_webapp(app)
             @info "GUI Session updated"
         end
 
-        clear_obs!(app)
+        clear_obs_and_close!(app)
 
         resize_with_gp = js"""
         const graphplotCard = document.querySelector(".graphplot-card");
@@ -139,7 +139,7 @@ function inspect(sol; restart=false, reset=false, display=CURRENT_DISPLAY[])
     CURRENT_DISPLAY[] = display
 
     appstate = if reset || isnothing(APPSTATE[])
-        isnothing(APPSTATE[]) || clear_obs!(APPSTATE[])
+        isnothing(APPSTATE[]) || clear_obs_and_close!(APPSTATE[])
         AppState(sol)
     else
         APPSTATE[].sol[] = sol

NetworkDynamicsInspector/src/utils.jl

@@ -27,28 +27,34 @@ function gen_state_options(nw::Network, sidxs)
     options
 end
 
-function clear_obs!(x::Union{NamedTuple, AbstractDict})
+function clear_obs_and_close!(x::Union{NamedTuple, AbstractDict})
     for v in values(x)
-        clear_obs!(v)
+        clear_obs_and_close!(v)
     end
 end
-function clear_obs!(obs::Observable)
+function clear_obs_and_close!(obs::Observable)
     empty!(obs.listeners)
-    clear_obs!(obs.val)
+    clear_obs_and_close!(obs.val)
 end
-function clear_obs!(v::AbstractVector)
+function clear_obs_and_close!(v::AbstractVector)
     for el in v
-        clear_obs!(el)
+        clear_obs_and_close!(el)
     end
 end
-function clear_obs!(x::T) where {T}
+function clear_obs_and_close!(x::T) where {T}
     if T <: Union{GraphPlot, TimeseriesPlot, AppState}
         for f in fieldnames(T)
-            clear_obs!(getfield(x, f))
+            clear_obs_and_close!(getfield(x, f))
         end
     end
     x
 end
+function clear_obs_and_close!(of::Observables.ObserverFunction)
+    Observables.off(of)
+end
+function clear_obs_and_close!(ch::Channel)
+    close(ch)
+end
 
 NetworkDynamics.extract_nw(o::Observable) = extract_nw(o.val)
 function NetworkDynamics.extract_nw(o::NamedTuple)

NetworkDynamicsInspector/test/multiselect_test.jl

@@ -28,7 +28,7 @@ end
         selection_single = Observable{Vector{Symbol}}(Symbol[:Julia])
     )
     disp = App(;) do session
-        NetworkDynamicsInspector.clear_obs!(gui)
+        NetworkDynamicsInspector.clear_obs_and_close!(gui)
 
         ms1 = TomSelect(gui.options, gui.selection; placeholder="multi", T=Symbol)
         ms2 = TomSelect(gui.options, gui.selection_single; placeholder="single", multi=false, T=Symbol)

NetworkDynamicsInspector/test/slider_test.jl

@@ -22,7 +22,7 @@ end
     )
 
     disp = App(;) do session
-        NetworkDynamicsInspector.clear_obs!(gui)
+        NetworkDynamicsInspector.clear_obs_and_close!(gui)
         sl1 = ContinuousSlider(gui.range, gui.val1, gui.val2)
         sl2 = ContinuousSlider(gui.range, gui.val; arrowkeys=true)
 

NetworkDynamicsInspector/test/toggle_test.jl

@@ -3,7 +3,7 @@ using NetworkDynamicsInspector, Bonito
 tog = Observable{Bool}(true)
 let
     _app = App() do session
-        NetworkDynamicsInspector.clear_obs!(tog)
+        NetworkDynamicsInspector.clear_obs_and_close!(tog)
         toggle = NetworkDynamicsInspector.ToggleSwitch(value=tog, label="Toggle me")
         on(toggle.value) do state
             @info "value = $state"