Merge pull request #3148 from thocevar/webview

[FIX] WebView fixes

Author: ajdapretnar

Orange/widgets/report/report.py

@@ -184,7 +184,7 @@ def report_plot(self, name=None, plot=None):
         elif isinstance(plot, WebviewWidget):
             try:
                 svg = plot.svg()
-            except IndexError:
+            except (IndexError, ValueError):
                 svg = plot.html()
             self.report_html += svg
 

Orange/widgets/utils/webview.py

@@ -475,23 +475,23 @@ class IdStore:
         def __init__(self):
             self.id = 0
             self.lock = threading.Lock()
-            self.ids = set()
+            self.ids = dict()
 
         def create(self):
             with self.lock:
                 self.id += 1
                 return self.id
 
-        def store(self, id):
+        def store(self, id, value):
             with self.lock:
-                self.ids.add(id)
+                self.ids[id] = value
 
         def __contains__(self, id):
             return id in self.ids
 
-        def remove(self, id):
+        def pop(self, id):
             with self.lock:
-                self.ids.remove(id)
+                return self.ids.pop(id, None)
 
 
     class _JSObjectChannel(QObject):
@@ -554,11 +554,11 @@ def __init__(self, parent=None, bridge=None, *, debug=False, **kwargs):
         def _evalJS(self, code):
             wait(until=self._jsobject_channel.is_all_exposed)
             if sip.isdeleted(self):
-                return
+                return None
             result = self._results.create()
-            self.runJavaScript(code, lambda x: self._results.store(result))
+            self.runJavaScript(code, lambda x: self._results.store(result, x))
             wait(until=lambda: result in self._results)
-            self._results.remove(result)
+            return self._results.pop(result)
 
         def onloadJS(self, code):
             self._onloadJS(code, injection_point=QWebEngineScript.Deferred)