lavavu-osmesa 1.8.83__cp311-cp311-manylinux_2_28_x86_64.whl → 1.9.9__cp311-cp311-manylinux_2_28_x86_64.whl

lavavu/control.py

@@ -481,8 +481,20 @@ class Window(_Container):
         self.align = align
         self.wrapper = wrapper
         self.fullscreen = fullscreen
-        if resolution is not None:
-            viewer.output_resolution = resolution
+        if resolution is None:
+            #Default to largest of 640x480 or output res / 2
+            resolution = [0,0]
+            resolution[0] = max(viewer.output_resolution[0]//2, 640)
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+        elif isinstance(resolution, int):
+            #Passed interger - interpert as width
+            resolution = [resolution,0]
+
+        if resolution[1] == 0:
+            #Width only, set height based on output aspect ratio
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+
+        viewer.output_resolution = resolution
 
     def html(self):
         #print(self.viewer["resolution"], self.viewer.output_resolution)
@@ -1677,13 +1689,26 @@ class _ControlFactory(object):
         """
         if not is_notebook():
             return
-        #Find matching viewer id, redisplay all that match
+        from IPython.display import display,HTML,Javascript
+        display(Javascript(self.redisplay_call()))
+
+    def redisplay_call(self):
+        """Update the active viewer image if any
+        Applies changes made in python to the viewer and forces a redisplay
+        """
+        #Find matching viewer id, redisplay first  match
+        ids = self.active_viewers()
+        return ';'.join('_wi["{0}"].redisplay()'.format(i) for i in ids)
+
+    def active_viewers(self):
+        """Return matching active viewer IDs
+        """
+        #Find matching viewer ids, all that match
+        ids = []
         for idx,obj in enumerate(windows):
             if obj == self._target():
-                viewerid = winids[idx]
-                from IPython.display import display,HTML,Javascript
-                #display(Javascript('_wi["{0}"].redisplay();'.format(viewerid)))
-                display(HTML('<script>_wi["{0}"].redisplay();</script>'.format(viewerid)))
+                ids.append(winids[idx])
+        return ids
 
     def update(self):
         """Update the control values from current viewer data

lavavu/dict.json

@@ -2147,6 +2147,17 @@
       false
     ]
   },
+  "upscalelines": {
+    "default": false,
+    "target": "global",
+    "type": "real",
+    "desc": "Enable to scale lines with the viewport size.",
+    "strict": true,
+    "redraw": 0,
+    "control": [
+      true
+    ]
+  },
   "fps": {
     "default": false,
     "target": "global",

lavavu/html/control.js

@@ -87,7 +87,7 @@ function WindowInteractor(id, uid, port) {
 
     //Several possible modes to try
     //Modern JupyterHub lab URL
-    var regex = /\/lab\//;
+    var regex = /\/lab(\/|\?|$)/; //Match "/lab" at end of url or "/lab/" or "/lab?" anywhere
     var parsed = regex.exec(loc.href);
     if (parsed && parsed.length > 0) {
       connect(loc.href.substring(0,parsed.index) + "/proxy/" + port);

lavavu/html/menu.js

@@ -123,7 +123,12 @@ function menu_addctrls(menu, obj, viewer, onchange) {
     //Check if it has been set on the target object
     if (prop in obj) {
       //console.log(prop + " ==> " + JSON.stringify(viewer.dict[prop]));
-      menu_addctrl(menu, obj, viewer, prop, onchange);
+      try {
+        //Catch errors and continue gracefully
+        menu_addctrl(menu, obj, viewer, prop, onchange);
+      } catch(e) {
+        console.log("Error adding control to menu: " + e);
+      }
 
     } else {
       //Save list of properties without controls
@@ -159,9 +164,9 @@ function menu_addctrls(menu, obj, viewer, onchange) {
 
 function menu_addcmaps(menu, obj, viewer, onchange) {
   //Colourmap editing menu
-  if (viewer.cgui.prmenu) viewer.cgui.removeFolder(viewer.cgui.prmenu);
-  if (viewer.cgui.cmenu) viewer.cgui.removeFolder(viewer.cgui.cmenu);
-  if (viewer.cgui.pomenu) viewer.cgui.removeFolder(viewer.cgui.pomenu);
+  if (viewer.cgui.prmenu) viewer.cgui.remove(viewer.cgui.prmenu);
+  if (viewer.cgui.cmenu) viewer.cgui.remove(viewer.cgui.cmenu);
+  if (viewer.cgui.pomenu) viewer.cgui.remove(viewer.cgui.pomenu);
   viewer.cgui.prmenu = viewer.cgui.addFolder("Properties");
   viewer.cgui.cmenu = viewer.cgui.addFolder("Colours");
   viewer.cgui.pomenu = viewer.cgui.addFolder("Positions");

lavavu/html/webview.html

@@ -27,7 +27,7 @@
 
     <input id="fileinput" type="file" style="visibility:hidden" onchange="useFileInput(this)" />
 
-    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.83/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.9.9/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>