Changes needed wrt how we build Arcus with Sip 6.

part of CURA-7924

2 files changed, 20 insertions, 20 deletions

diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index 55a9415899..8cfc4cff34 100755
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -31,7 +31,7 @@ from cura.Utils.Threading import call_on_qt_thread
 from .ProcessSlicedLayersJob import ProcessSlicedLayersJob
 from .StartSliceJob import StartSliceJob, StartJobResult
 
-import Arcus
+import pyArcus
 
 if TYPE_CHECKING:
     from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
@@ -102,8 +102,8 @@ class CuraEngineBackend(QObject, Backend):
         self._layer_view_active = False #type: bool
         self._onActiveViewChanged()
 
-        self._stored_layer_data = []  # type: List[Arcus.PythonMessage]
-        self._stored_optimized_layer_data = {}  # type: Dict[int, List[Arcus.PythonMessage]] # key is build plate number, then arrays are stored until they go to the ProcessSlicesLayersJob
+        self._stored_layer_data = []  # type: List[pyArcus.PythonMessage]
+        self._stored_optimized_layer_data = {}  # type: Dict[int, List[pyArcus.PythonMessage]] # key is build plate number, then arrays are stored until they go to the ProcessSlicesLayersJob
 
         self._scene = application.getController().getScene() #type: Scene
         self._scene.sceneChanged.connect(self._onSceneChanged)
@@ -607,7 +607,7 @@ class CuraEngineBackend(QObject, Backend):
 
         self._invokeSlice()
 
-    def _onSocketError(self, error: Arcus.Error) -> None:
+    def _onSocketError(self, error: pyArcus.Error) -> None:
         """Called when an error occurs in the socket connection towards the engine.
 
         :param error: The exception that occurred.
@@ -617,18 +617,18 @@ class CuraEngineBackend(QObject, Backend):
             return
 
         super()._onSocketError(error)
-        if error.getErrorCode() == Arcus.ErrorCode.Debug:
+        if error.getErrorCode() == pyArcus.ErrorCode.Debug:
             return
 
         self._terminate()
         self._createSocket()
 
-        if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]:
+        if error.getErrorCode() not in [pyArcus.ErrorCode.BindFailedError, pyArcus.ErrorCode.ConnectionResetError, pyArcus.ErrorCode.Debug]:
             Logger.log("w", "A socket error caused the connection to be reset")
 
         # _terminate()' function sets the job status to 'cancel', after reconnecting to another Port the job status
         # needs to be updated. Otherwise backendState is "Unable To Slice"
-        if error.getErrorCode() == Arcus.ErrorCode.BindFailedError and self._start_slice_job is not None:
+        if error.getErrorCode() == pyArcus.ErrorCode.BindFailedError and self._start_slice_job is not None:
             self._start_slice_job.setIsCancelled(False)
 
     # Check if there's any slicable object in the scene.
@@ -695,7 +695,7 @@ class CuraEngineBackend(QObject, Backend):
             self.needsSlicing()
             self._onChanged()
 
-    def _onLayerMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onLayerMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when a sliced layer data message is received from the engine.
 
         :param message: The protobuf message containing sliced layer data.
@@ -703,7 +703,7 @@ class CuraEngineBackend(QObject, Backend):
 
         self._stored_layer_data.append(message)
 
-    def _onOptimizedLayerMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onOptimizedLayerMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when an optimized sliced layer data message is received from the engine.
 
         :param message: The protobuf message containing sliced layer data.
@@ -714,7 +714,7 @@ class CuraEngineBackend(QObject, Backend):
                 self._stored_optimized_layer_data[self._start_slice_job_build_plate] = []
             self._stored_optimized_layer_data[self._start_slice_job_build_plate].append(message)
 
-    def _onProgressMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onProgressMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when a progress message is received from the engine.
 
         :param message: The protobuf message containing the slicing progress.
@@ -736,7 +736,7 @@ class CuraEngineBackend(QObject, Backend):
             else:
                 self._change_timer.start()
 
-    def _onSlicingFinishedMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onSlicingFinishedMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when the engine sends a message that slicing is finished.
 
         :param message: The protobuf message signalling that slicing is finished.
@@ -784,7 +784,7 @@ class CuraEngineBackend(QObject, Backend):
             self.enableTimer()  # manually enable timer to be able to invoke slice, also when in manual slice mode
             self._invokeSlice()
 
-    def _onGCodeLayerMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onGCodeLayerMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when a g-code message is received from the engine.
 
         :param message: The protobuf message containing g-code, encoded as UTF-8.
@@ -795,7 +795,7 @@ class CuraEngineBackend(QObject, Backend):
         except KeyError:  # Can occur if the g-code has been cleared while a slice message is still arriving from the other end.
             pass  # Throw the message away.
 
-    def _onGCodePrefixMessage(self, message: Arcus.PythonMessage) -> None:
+    def _onGCodePrefixMessage(self, message: pyArcus.PythonMessage) -> None:
         """Called when a g-code prefix message is received from the engine.
 
         :param message: The protobuf message containing the g-code prefix,
@@ -841,7 +841,7 @@ class CuraEngineBackend(QObject, Backend):
             else:
                 self._change_timer.start()
 
-    def _onPrintTimeMaterialEstimates(self, message: Arcus.PythonMessage) -> None:
+    def _onPrintTimeMaterialEstimates(self, message: pyArcus.PythonMessage) -> None:
         """Called when a print time message is received from the engine.
 
         :param message: The protobuf message containing the print time per feature and
@@ -855,7 +855,7 @@ class CuraEngineBackend(QObject, Backend):
         times = self._parseMessagePrintTimes(message)
         self.printDurationMessage.emit(self._start_slice_job_build_plate, times, material_amounts)
 
-    def _parseMessagePrintTimes(self, message: Arcus.PythonMessage) -> Dict[str, float]:
+    def _parseMessagePrintTimes(self, message: pyArcus.PythonMessage) -> Dict[str, float]:
         """Called for parsing message to retrieve estimated time per feature
 
         :param message: The protobuf message containing the print time per feature
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 0e592c8d20..4a83fcbc30 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -7,7 +7,7 @@ from enum import IntEnum
 import time
 from typing import Any, cast, Dict, List, Optional, Set
 import re
-import Arcus #For typing.
+import pyArcus #For typing.
 from PyQt6.QtCore import QCoreApplication
 
 from UM.Job import Job
@@ -90,17 +90,17 @@ class GcodeStartEndFormatter(Formatter):
 class StartSliceJob(Job):
     """Job class that builds up the message of scene data to send to CuraEngine."""
 
-    def __init__(self, slice_message: Arcus.PythonMessage) -> None:
+    def __init__(self, slice_message: pyArcus.PythonMessage) -> None:
         super().__init__()
 
         self._scene = CuraApplication.getInstance().getController().getScene() #type: Scene
-        self._slice_message = slice_message #type: Arcus.PythonMessage
+        self._slice_message = slice_message #type: pyArcus.PythonMessage
         self._is_cancelled = False #type: bool
         self._build_plate_number = None #type: Optional[int]
 
         self._all_extruders_settings = None #type: Optional[Dict[str, Any]] # cache for all setting values from all stacks (global & extruder) for the current machine
 
-    def getSliceMessage(self) -> Arcus.PythonMessage:
+    def getSliceMessage(self) -> pyArcus.PythonMessage:
         return self._slice_message
 
     def setBuildPlate(self, build_plate_number: int) -> None:
@@ -502,7 +502,7 @@ class StartSliceJob(Job):
                 setting_extruder.extruder = extruder_position
             Job.yieldThread()
 
-    def _handlePerObjectSettings(self, node: CuraSceneNode, message: Arcus.PythonMessage):
+    def _handlePerObjectSettings(self, node: CuraSceneNode, message: pyArcus.PythonMessage):
         """Check if a node has per object settings and ensure that they are set correctly in the message
 
         :param node: Node to check.