Executor: move image viewer in main thread

Render/imageviewer.py

@@ -37,6 +37,7 @@
     QGuiApplication,
     QMenu,
     QFileDialog,
+    QApplication,
 )
 from PySide.QtCore import Qt, Slot, QSize, QPoint
 
@@ -260,7 +261,7 @@ def display_image(img_path):
         return
 
     # Create widget and subwindow
-    viewer = ImageViewer(Gui.getMainWindow())
+    viewer = ImageViewer(None)
     mdiarea = Gui.getMainWindow().centralWidget()
     subw = mdiarea.addSubWindow(viewer)
     subw.setWindowTitle("Rendering result")

Render/rdrexecutor.py

@@ -72,8 +72,10 @@ def __init__(self, cmd, img, cwd, open_after_render):
         self.cmd = cmd
         self.img = img
         self.cwd = cwd
-        if open_after_render:
-            self.result_ready.connect(display_image)
+        self.open_after_render = open_after_render
+        # TODO
+        # if open_after_render:
+        # self.result_ready.connect(display_image)
 
     def run(self):
         """Run worker.
@@ -211,6 +213,8 @@ def start(self):
         self.worker.finished.connect(self.worker.deleteLater)
         self.worker.finished.connect(self.thread.exit)
         self.thread.finished.connect(self.thread.deleteLater)
+        if getattr(self.worker, "open_after_render", False):
+            self.worker.result_ready.connect(self.display_result)
         # self.thread.finished.connect(lambda: print("Thread finished")) # Dbg
 
         # Start the thread
@@ -226,6 +230,13 @@ def join(self):
         self.thread.finished.connect(loop.quit, Qt.QueuedConnection)
         loop.exec_(flags=QEventLoop.ExcludeUserInputEvents)
 
+    @Slot(str)
+    def display_result(self, img_path):
+        """Display result in GUI (slot)."""
+        # Very important: must execute in main (GUI) thread!
+        # Therefore, not callable directly from worker
+        display_image(img_path)
+
 
 class RendererExecutorCli(threading.Thread):
     """A class to execute a rendering engine in Command Line Interface mode.