webengine: rename forceSync parameter to wait

proppages.py

@@ -1052,8 +1052,8 @@ def __init__(self, parent, layer):
         self.setProperties(layer.properties)
 
         wnd = self.parent().parent()
-        loaded = wnd.runScript("app.scene.mapLayers[{}].loadedPointCount()".format(layer.jsLayerId), forceSync=True)
-        visible = wnd.runScript("app.scene.mapLayers[{}].pcg.children[0].numVisiblePoints".format(layer.jsLayerId), forceSync=True)
+        loaded = wnd.runScript("app.scene.mapLayers[{}].loadedPointCount()".format(layer.jsLayerId), wait=True)
+        visible = wnd.runScript("app.scene.mapLayers[{}].pcg.children[0].numVisiblePoints".format(layer.jsLayerId), wait=True)
 
         total = bbox = None
 

q3dwebengineview.py

@@ -46,18 +46,18 @@ def reload(self):
 
         self.setUrl(self.myUrl)
 
-    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, forceSync=False):
-        """forceSync: whether to run script synchronously"""
-        Q3DWebPageCommon.runScript(self, string, data, message, sourceID, callback, forceSync)
+    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, wait=False):
+        """wait: whether to wait until script execution has completed"""
+        Q3DWebPageCommon.runScript(self, string, data, message, sourceID, callback, wait)
 
         if data is not None:
             assert callback is None, "cannot callback when data is set"
-            assert not forceSync, "synchronous script execution with data not supported"
+            assert not wait, "synchronous script execution with data not supported"
 
             self.bridge.sendScriptData.emit(string, data)
             return
 
-        if not forceSync:
+        if not wait:
             if callback:
                 self.runJavaScript(string, callback)
 

q3dwebkitview.py

@@ -63,8 +63,8 @@ def reload(self):
 
         self.mainFrame().setUrl(self.myUrl)
 
-    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, forceSync=False):
-        Q3DWebPageCommon.runScript(self, string, data, message, sourceID, callback, forceSync)
+    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, wait=False):
+        Q3DWebPageCommon.runScript(self, string, data, message, sourceID, callback, wait)
 
         if data is not None:
             self.bridge.setData(data)

q3dwebviewcommon.py

@@ -82,7 +82,7 @@ def initialized(self):
 
         self.wnd.showStatusMessage("")
 
-    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, forceSync=False):
+    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, wait=False):
         if not DEBUG_MODE or message is None:
             return
 
@@ -112,7 +112,7 @@ def loadScriptFiles(self, ids, force=False):
             self.loadScriptFile(id, force)
 
     def cameraState(self, flat=False):
-        return self.runScript("cameraState({})".format(1 if flat else 0), forceSync=True)
+        return self.runScript("cameraState({})".format(1 if flat else 0), wait=True)
 
     def setCameraState(self, state):
         """set camera position and camera target"""
@@ -220,11 +220,11 @@ def dropEvent(self, event):
     def sendData(self, data):
         self._page.sendData(data)
 
-    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, forceSync=False):
-        return self._page.runScript(string, data, message, sourceID, callback, forceSync)
+    def runScript(self, string, data=None, message="", sourceID="q3dview.py", callback=None, wait=False):
+        return self._page.runScript(string, data, message, sourceID, callback, wait)
 
     def showJSInfo(self):
-        info = self.runScript("app.renderer.info", forceSync=True)
+        info = self.runScript("app.renderer.info", wait=True)
         QMessageBox.information(self, "three.js Renderer Info", str(info))
 
 

q3dwindow.py

@@ -296,8 +296,8 @@ def changeEvent(self, event):
             else:
                 self.runScript("app.resume()")
 
-    def runScript(self, string, data=None, message="", sourceID="Q3DWindow.py", callback=None, forceSync=False):
-        return self.webPage.runScript(string, data, message, sourceID, callback, forceSync)
+    def runScript(self, string, data=None, message="", sourceID="Q3DWindow.py", callback=None, wait=False):
+        return self.webPage.runScript(string, data, message, sourceID, callback, wait)
 
     def showMessageBar(self, msg, duration=0, warning=False):
         self.runScript("showMessageBar(pyData(), {}, {})".format(duration, js_bool(warning)), msg)