rename wait_for -> sync

Author: hexaeder

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -157,7 +157,7 @@ function inspect(sol; restart=false, reset=false, display=CURRENT_DISPLAY[])
     APPSTATE[] = appstate
     CURRENT_WEBAPP[] = webapp
 
-    wait_for()
+    sync()
     nothing
 end
 

NetworkDynamicsInspector/src/appstate.jl

@@ -96,13 +96,13 @@ set_maybe!(obs::Observable, ::NotSpecified) = nothing
 Set the solution of the current appstate to `sol`.
 """
 function set_sol!(sol)
-    wait_for()
+    sync()
     if isnothing(APPSTATE[])
         APPSTATE[] = AppState(sol)
     else
         APPSTATE[].sol[] = sol
     end
-    wait_for()
+    sync()
     nothing
 end
 
@@ -117,12 +117,12 @@ function set_state!(; sol = NotSpecified(),
                       t = NotSpecified(),
                       tmin = NotSpecified(),
                       tmax = NotSpecified())
-    wait_for()
+    sync()
     sol != NotSpecified() && set_sol!(sol)
     set_maybe!(appstate().t, t)
     set_maybe!(appstate().tmin, tmin)
     set_maybe!(appstate().tmax, tmax)
-    wait_for()
+    sync()
     nothing
 end
 
@@ -139,15 +139,15 @@ function set_graphplot!(; nstate = NotSpecified(),
                           estate_rel = NotSpecified(),
                           ncolorrange = NotSpecified(),
                           ecolorrange = NotSpecified())
-    wait_for()
+    sync()
     gp = appstate().graphplot
     set_maybe!(gp.nstate, nstate)
     set_maybe!(gp.estate, estate)
     set_maybe!(gp.nstate_rel, nstate_rel)
     set_maybe!(gp.estate_rel, estate_rel)
     set_maybe!(gp.ncolorrange, ncolorrange)
     set_maybe!(gp.ecolorrange, ecolorrange)
-    wait_for()
+    sync()
     nothing
 end
 
@@ -161,15 +161,15 @@ To automaticially create commands see [`dump_app_state()`](@ref).
 function set_timeseries!(key; selcomp = NotSpecified(),
                               states = NotSpecified(),
                               rel = NotSpecified())
-    wait_for()
+    sync()
     if !haskey(appstate().tsplots[], key)
         appstate().tsplots[][key] = TimeseriesPlot()
     end
     tsplot = appstate().tsplots[][key]
     set_maybe!(tsplot.selcomp, selcomp)
     set_maybe!(tsplot.states, states)
     set_maybe!(tsplot.rel, rel)
-    wait_for()
+    sync()
     nothing
 end
 
@@ -182,7 +182,7 @@ Defines timeseries, where `tsarray` is an array of timeseries keyword arguments
 To automaticially create commands see [`dump_app_state()`](@ref).
 """
 function define_timeseries!(tsarray)
-    wait_for()
+    sync()
     if length(tsarray) != length(appstate().tsplots[])
         empty!(appstate().tsplots[])
         tskeys = [gendomid("ts") for _ in tsarray]
@@ -193,7 +193,7 @@ function define_timeseries!(tsarray)
         set_timeseries!(key; tsargs...)
     end
     notify(appstate().tsplots)
-    wait_for()
+    sync()
     nothing
 end
 
@@ -205,7 +205,7 @@ commands to recreate the current appstate.
 The intended usecase is to quickly recreate "starting points" for interactive exploration.
 """
 function dump_app_state(io=stdout)
-    wait_for()
+    sync()
     println(io, "# To recreate the current state, run the following commands:\n")
     println(io, styled"set_sol!({red:sol}) # optional if after inspect(sol)")
     println(io, "set_state!(; t=$(appstate().t[]), tmin=$(appstate().tmin[]), tmax=$(appstate().tmax[]))")

NetworkDynamicsInspector/src/serving.jl

@@ -133,6 +133,7 @@ function get_electron_app end
 function get_electron_window end
 
 function save_electron_screenshot(path=joinpath(@__DIR__, "screenshot.png"), resize=true)
+    sync()
     resize && _resize_electron_to_content()
 
     path = isabspath(path) ? path : joinpath(pwd(), path)
@@ -146,7 +147,7 @@ function save_electron_screenshot(path=joinpath(@__DIR__, "screenshot.png"), res
         console.log('Screenshot saved to ', screenshotPath);
     });
     """
-    wait_for()
+    sync()
     sleep(3) # make sure that axis updates and so on
     d = run(get_electron_app(), js)
     while !(isfile(path))
@@ -162,7 +163,7 @@ function _resize_electron_to_content()
         let maxHeight = 0;
         Array.from(document.querySelectorAll('.graphplot-col, .timeseries-col')).forEach(el => {
             const height = el.offsetHeight;
-            console.log(height)
+            // console.log("Set new height", height)
             if (height > maxHeight) {
                 maxHeight = height;
             }
@@ -176,4 +177,5 @@ function _resize_electron_to_content()
     resolution = (oldres[1], y)
     CURRENT_DISPLAY[] = ElectronDisp(; resolution)
     get_electron_window() # trigger resize
+    sleep(3)
 end

NetworkDynamicsInspector/src/utils.jl

@@ -142,7 +142,7 @@ function download_assets()
     end
 end
 
-function wait_for()
+function sync()
     isnothing(APPSTATE[]) && return
     for cache in values(APPSTATE[]._tsplotscache)
         wait_for(cache.plotqueue)