fix missing imports

Author: hexaeder

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -7,7 +7,12 @@ using NetworkDynamics: NetworkDynamics, SII, EIndex, VIndex, Network,
                        obssym, psym, sym, extract_nw
 
 using Graphs: nv, ne
-using WGLMakie.Makie: @lift, MouseEvent
+using WGLMakie: WGLMakie
+using WGLMakie.Makie: Makie, @lift, MouseEvent, Point2f, with_theme,
+                      Cycle, lines!, vlines!, Theme, Figure, Colorbar, Axis,
+                      xlims!, ylims!, autolimits!, hidespines!, hidedecorations!,
+                      register_interaction!, MouseEventTypes, Consume, events,
+                      mouseposition
 
 using GraphMakie: GraphMakie, EdgeClickHandler, EdgeHoverHandler,
                   NodeClickHandler, NodeHoverHandler, graphplot!
@@ -49,8 +54,8 @@ function wrapsol(sol)
         tmax = Observable{Float64}(sol.t[end]),
         active_tsplot = Observable{String}("ts-1"),
         graphplot = (;
-            nstate = Observable{Vector{Symbol}}([:θ]),
-            estate = Observable{Vector{Symbol}}([:P]),
+            nstate = Observable{Vector{Symbol}}([]),
+            estate = Observable{Vector{Symbol}}([]),
             nstate_rel = Observable{Bool}(false),
             estate_rel = Observable{Bool}(false),
             ncolorrange = Observable{Tuple{Float32,Float32}}((-1.0, 1.0)),
@@ -67,11 +72,11 @@ function wrapsol(sol)
                 states = Observable{Vector{Symbol}}(Symbol[]),
                 rel = Observable{Bool}(false),
             ),
-            # "b" => (;
-            #     selcomp = Observable{Vector{SymbolicCompIndex}}(SymbolicCompIndex[]),
-            #     states = Observable{Vector{Symbol}}(Symbol[]),
-            #     rel = Observable{Bool}(false),
-            # ),
+            "ts-2" => (;
+                selcomp = Observable{Vector{SymbolicCompIndex}}(SymbolicCompIndex[]),
+                states = Observable{Vector{Symbol}}(Symbol[]),
+                rel = Observable{Bool}(false),
+            ),
         ))
     );
 end
@@ -138,6 +143,7 @@ function inspect(app::NamedTuple)
         )
     end;
     serve_app(_app)
+    return app
 end
 
 
@@ -155,6 +161,11 @@ function apptheme()
 end
 
 function timeslider_card(app)
+    on(app.sol) do _sol
+        app.tmin[] = _sol.t[begin]
+        app.tmax[] = _sol.t[end]
+    end
+
     trange_sol = @lift ($(app.sol).t[begin], $(app.sol).t[end])
     tw_slider = ContinuousSlider(trange_sol, app.tmin, app.tmax)
     twindow = @lift ($(app.tmin), $(app.tmax))

NetworkDynamicsInspector/src/timeseries.jl

@@ -294,6 +294,7 @@ function timeseries_card(app, key, session)
                 # if last_autolimits[][1] != valid_idxs[] || last_autolimits[][2] != tsplot.rel[]
                 if last_autolimits[] != (valid_idxs[], tsplot.rel[])
                     autolimits!(ax)
+                    xlims!(ax, (app.tmin[], app.tmax[]))
                     last_autolimits[] = (copy(valid_idxs[]), tsplot.rel[])
                 end
             catch e
@@ -305,6 +306,7 @@ function timeseries_card(app, key, session)
 
     on(reset_axis_button.value) do _
         autolimits!(ax)
+        xlims!(ax, (app.tmin[], app.tmax[]))
     end
 
     ####

NetworkDynamicsInspector/src/utils.jl

@@ -124,12 +124,14 @@ function onany_delayed(f, obs...; delay)
 end
 
 function sidx_to_str(s, app)
+    nw = extract_nw(app.sol[])
+    name = nw[s].name
     if s isa VIndex
-        "v$(s.compidx)"
+        "v$(s.compidx) ($name)"
     else
-        edge = extract_nw(app.sol[]).im.edgevec[s.compidx]
+        edge = nw.im.edgevec[s.compidx]
         src, dst = edge.src, edge.dst
-        "e$(s.compidx): $src→$dst"
+        "e$(s.compidx): $src→$dst ($name)"
     end
 end
 

NetworkDynamicsInspector/src/widgets.jl

@@ -303,7 +303,7 @@ function Bonito.jsrender(session::Session, slider::ContinuousSlider)
     """
     Bonito.onload(session, container, jscode)
 
-    return jsrender(session, container)
+    return Bonito.jsrender(session, container)
 end
 
 
@@ -521,7 +521,7 @@ function Bonito.jsrender(session::Session, multiselect::MultiSelect)
     """
     Bonito.onload(session, select, js_onload)
 
-    return jsrender(session, container)
+    return Bonito.jsrender(session, container)
 end
 
 function options_to_jsoptions(options; option_to_string=repr)
@@ -691,5 +691,5 @@ function Bonito.jsrender(session::Session, toggle::ToggleSwitch)
         );
         style=domlabel_style
     )
-    jsrender(session, container)
+    Bonito.jsrender(session, container)
 end