Merge pull request #213 from JuliaDynamics/hw/inspector

fix half commented out css selector

Author: hexaeder

NetworkDynamicsInspector/Project.toml

@@ -1,7 +1,7 @@
 name = "NetworkDynamicsInspector"
 uuid = "0a4713f2-d58f-43f2-b63b-1b5d5ee4e65a"
 authors = ["Hans Würfel <git@wuerfel.io>"]
-version = "0.1.3"
+version = "0.1.4"
 
 [deps]
 Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"

NetworkDynamicsInspector/ext/ElectronExt.jl

@@ -51,16 +51,6 @@ function NDI.get_electron_window()
         length(windows(app)) != 1 && @warn "App contains multiple windows"
         first(windows(app))
     end
-    # check window size
-    if NDI.CURRENT_DISPLAY[] isa NDI.ElectronDisp
-        x, y = NDI.CURRENT_DISPLAY[].resolution
-        try
-            run(NDI.get_electron_app(),
-                "BrowserWindow.fromId($(window.id)).setSize($x, $y)")
-        catch e
-            @warn "Could not resize window: $e"
-        end
-    end
 
     return window
 end

NetworkDynamicsInspector/src/serving.jl

@@ -134,6 +134,10 @@ function get_electron_window end
 
 function save_electron_screenshot(path=joinpath(@__DIR__, "screenshot.png"), resize=true)
     sync()
+    if isempty(run(get_electron_window(),
+        "Array.from(document.querySelectorAll('.graphplot-col, .timeseries-col'))"))
+        error("No content to screenshot!")
+    end
     resize && _resize_electron_to_content()
 
     path = isabspath(path) ? path : joinpath(pwd(), path)
@@ -173,9 +177,15 @@ function _resize_electron_to_content()
     """
     y = run(window, js_max_h)
 
-    oldres = CURRENT_DISPLAY[].resolution
-    resolution = (oldres[1], y)
-    CURRENT_DISPLAY[] = ElectronDisp(; resolution)
-    get_electron_window() # trigger resize
+    # set size
+    app = get_electron_app()
+    resize_js = """
+    {
+        let window = BrowserWindow.fromId($(window.id));
+        let size = window.getSize();
+        window.setSize(size[0], $y);
+    }
+    """
+    run(app, resize_js)
     sleep(3)
 end

NetworkDynamicsInspector/src/timeseries.jl

@@ -372,6 +372,13 @@ function timeseries_card(app, key, session)
     # plot the thing
     onany(data, replot; update=true) do _dat, _
         task = @task begin
+            while session.status == Bonito.UNINITIALIZED
+                sleep(0.1)
+            end
+            if session.status == Bonito.CLOSED
+                @debug "$key: Session closed, aborting plot"
+                return
+            end
             @debug "$key: Launch plot for valid_idxs[]"
             try
                 empty!(ax)

NetworkDynamicsInspector/src/widgets.jl

@@ -593,9 +593,9 @@ function Bonito.jsrender(session::Session, toggle::ToggleSwitch)
             "transition" => "$(toggle.transition_time)s",
             "border-radius" => "$(toggle.height/2)px",
         ),
-        CSS(":hover",
-            # "background-color" => "#2196F3",
-        ),
+        # CSS(":hover",
+        #     "background-color" => "#2196F3",
+        # ),
         CSS("::before",
             "position" => "absolute",
             "content" => "''",

docs/src/inspector.md

@@ -61,6 +61,7 @@ First, we need to define the system we want to inspect.
     end
 
     sol = get_sol()
+    nothing #hide
     ```
 
 Now that we have an `ODESolution` `sol`, we can call [`inspect`](@ref) to open the inspector GUI. The docstring provides several options to customize how the app is displayed.