resolve merge conflict

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -7,6 +7,7 @@ import os
 import threading
 from typing import List, Tuple
 
+
 import xml.etree.ElementTree as ET
 
 from UM.Workspace.WorkspaceReader import WorkspaceReader
@@ -28,43 +29,13 @@ from cura.Settings.ExtruderStack import ExtruderStack
 from cura.Settings.GlobalStack import GlobalStack
 from cura.Settings.CuraContainerStack import _ContainerIndexes
 from cura.CuraApplication import CuraApplication
+from cura.Utils.Threading import call_on_qt_thread
 
 from .WorkspaceDialog import WorkspaceDialog
 
 i18n_catalog = i18nCatalog("cura")
 
 
-#
-# HACK:
-#
-# In project loading, when override the existing machine is selected, the stacks and containers that are correctly
-# active in the system will be overridden at runtime. Because the project loading is done in a different thread than
-# the Qt thread, something else can kick in the middle of the process. One of them is the rendering. It will access
-# the current stacks and container, which have not completely been updated yet, so Cura will crash in this case.
-#
-# This "@call_on_qt_thread" decorator makes sure that a function will always be called on the Qt thread (blocking).
-# It is applied to the read() function of project loading so it can be guaranteed that only after the project loading
-# process is completely done, everything else that needs to occupy the QT thread will be executed.
-#
-class InterCallObject:
-    def __init__(self):
-        self.finish_event = threading.Event()
-        self.result = None
-
-
-def call_on_qt_thread(func):
-    def _call_on_qt_thread_wrapper(*args, **kwargs):
-        def _handle_call(ico, *args, **kwargs):
-            ico.result = func(*args, **kwargs)
-            ico.finish_event.set()
-        inter_call_object = InterCallObject()
-        new_args = tuple([inter_call_object] + list(args)[:])
-        CuraApplication.getInstance().callLater(_handle_call, *new_args, **kwargs)
-        inter_call_object.finish_event.wait()
-        return inter_call_object.result
-    return _call_on_qt_thread_wrapper
-
-
 class ContainerInfo:
     def __init__(self, file_name: str, serialized: str, parser: ConfigParser):
         self.file_name = file_name