Rename ConfigurationModel to PrinterConfigurationModel

cura/PrinterOutput/PrinterOutputDevice.py

@@ -17,7 +17,7 @@ from UM.FlameProfiler import pyqtSlot
 MYPY = False
 if MYPY:
     from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.UI.ConfigurationModel import ConfigurationModel
+    from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
     from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
     from UM.FileHandler.FileHandler import FileHandler
     from UM.Scene.SceneNode import SceneNode
@@ -73,7 +73,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
         super().__init__(device_id = device_id, parent = parent) # type: ignore  # MyPy complains with the multiple inheritance
 
         self._printers = []  # type: List[PrinterOutputModel]
-        self._unique_configurations = []   # type: List[ConfigurationModel]
+        self._unique_configurations = []   # type: List[PrinterConfigurationModel]
 
         self._monitor_view_qml_path = ""  # type: str
         self._monitor_component = None  # type: Optional[QObject]
@@ -216,7 +216,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
 
     # Returns the unique configurations of the printers within this output device
     @pyqtProperty("QVariantList", notify = uniqueConfigurationsChanged)
-    def uniqueConfigurations(self) -> List["ConfigurationModel"]:
+    def uniqueConfigurations(self) -> List["PrinterConfigurationModel"]:
         return self._unique_configurations
 
     def _updateUniqueConfigurations(self) -> None:

cura/Settings/MachineManager.py

@@ -23,7 +23,7 @@ from UM.Signal import postponeSignals, CompressTechnique
 
 from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.UI.MaterialOutputModel import MaterialOutputModel
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
@@ -106,7 +106,7 @@ class MachineManager(QObject):
         # There might already be some output devices by the time the signal is connected
         self._onOutputDevicesChanged()
 
-        self._current_printer_configuration = ConfigurationModel()   # Indicates the current configuration setup in this printer
+        self._current_printer_configuration = PrinterConfigurationModel()   # Indicates the current configuration setup in this printer
         self.activeMaterialChanged.connect(self._onCurrentConfigurationChanged)
         self.activeVariantChanged.connect(self._onCurrentConfigurationChanged)
         # Force to compute the current configuration
@@ -174,7 +174,7 @@ class MachineManager(QObject):
         self.outputDevicesChanged.emit()
 
     @pyqtProperty(QObject, notify = currentConfigurationChanged)
-    def currentConfiguration(self) -> ConfigurationModel:
+    def currentConfiguration(self) -> PrinterConfigurationModel:
         return self._current_printer_configuration
 
     def _onCurrentConfigurationChanged(self) -> None:
@@ -205,7 +205,7 @@ class MachineManager(QObject):
         self.currentConfigurationChanged.emit()
 
     @pyqtSlot(QObject, result = bool)
-    def matchesConfiguration(self, configuration: ConfigurationModel) -> bool:
+    def matchesConfiguration(self, configuration: PrinterConfigurationModel) -> bool:
         return self._current_printer_configuration == configuration
 
     @pyqtProperty("QVariantList", notify = outputDevicesChanged)
@@ -1375,7 +1375,7 @@ class MachineManager(QObject):
         self.setActiveMachine(new_machine.getId())
 
     @pyqtSlot(QObject)
-    def applyRemoteConfiguration(self, configuration: ConfigurationModel) -> None:
+    def applyRemoteConfiguration(self, configuration: PrinterConfigurationModel) -> None:
         if self._global_container_stack is None:
             return
         self.blurSettings.emit()

cura/UI/PrintJobOutputModel.py

@@ -9,7 +9,7 @@ from PyQt5.QtGui import QImage
 if TYPE_CHECKING:
     from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
     from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.UI.ConfigurationModel import ConfigurationModel
+    from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 
 
 class PrintJobOutputModel(QObject):
@@ -35,7 +35,7 @@ class PrintJobOutputModel(QObject):
         self._assigned_printer = None  # type: Optional[PrinterOutputModel]
         self._owner = ""  # Who started/owns the print job?
 
-        self._configuration = None  # type: Optional[ConfigurationModel]
+        self._configuration = None  # type: Optional[PrinterConfigurationModel]
         self._compatible_machine_families = []  # type: List[str]
         self._preview_image_id = 0
 
@@ -69,10 +69,10 @@ class PrintJobOutputModel(QObject):
             self.previewImageChanged.emit()
 
     @pyqtProperty(QObject, notify=configurationChanged)
-    def configuration(self) -> Optional["ConfigurationModel"]:
+    def configuration(self) -> Optional["PrinterConfigurationModel"]:
         return self._configuration
 
-    def updateConfiguration(self, configuration: Optional["ConfigurationModel"]) -> None:
+    def updateConfiguration(self, configuration: Optional["PrinterConfigurationModel"]) -> None:
         if self._configuration != configuration:
             self._configuration = configuration
             self.configurationChanged.emit()

cura/UI/PrinterConfigurationModel.py

@@ -9,7 +9,7 @@ if MYPY:
     from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 
-class ConfigurationModel(QObject):
+class PrinterConfigurationModel(QObject):
 
     configurationChanged = pyqtSignal()
 

cura/UI/PrinterOutputModel.py

@@ -4,7 +4,7 @@
 from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl
 from typing import List, Dict, Optional
 from UM.Math.Vector import Vector
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from cura.UI.ExtruderOutputModel import ExtruderOutputModel
 
 MYPY = False
@@ -37,7 +37,7 @@ class PrinterOutputModel(QObject):
         self._controller = output_controller
         self._controller.canUpdateFirmwareChanged.connect(self._onControllerCanUpdateFirmwareChanged)
         self._extruders = [ExtruderOutputModel(printer = self, position = i) for i in range(number_of_extruders)]
-        self._printer_configuration = ConfigurationModel()  # Indicates the current configuration setup in this printer
+        self._printer_configuration = PrinterConfigurationModel()  # Indicates the current configuration setup in this printer
         self._head_position = Vector(0, 0, 0)
         self._active_print_job = None  # type: Optional[PrintJobOutputModel]
         self._firmware_version = firmware_version
@@ -291,7 +291,7 @@ class PrinterOutputModel(QObject):
 
     # Returns the configuration (material, variant and buildplate) of the current printer
     @pyqtProperty(QObject, notify = configurationChanged)
-    def printerConfiguration(self) -> Optional[ConfigurationModel]:
+    def printerConfiguration(self) -> Optional[PrinterConfigurationModel]:
         if self._printer_configuration.isValid():
             return self._printer_configuration
         return None

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py

@@ -2,7 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import List, Optional, Union, Dict, Any
 
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel
 from ...ConfigurationChangeModel import ConfigurationChangeModel
 from ..CloudOutputController import CloudOutputController
@@ -95,9 +95,9 @@ class CloudClusterPrintJobStatus(BaseCloudModel):
         return model
 
     ## Creates a new configuration model
-    def _createConfigurationModel(self) -> ConfigurationModel:
+    def _createConfigurationModel(self) -> PrinterConfigurationModel:
         extruders = [extruder.createConfigurationModel() for extruder in self.configuration or ()]
-        configuration = ConfigurationModel()
+        configuration = PrinterConfigurationModel()
         configuration.setExtruderConfigurations(extruders)
         return configuration
 

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -19,7 +19,7 @@ from UM.Scene.SceneNode import SceneNode  # For typing.
 from UM.Settings.ContainerRegistry import ContainerRegistry
 
 from cura.CuraApplication import CuraApplication
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
 from cura.UI.PrinterOutputModel import PrinterOutputModel
@@ -522,7 +522,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
         print_job = UM3PrintJobOutputModel(output_controller=ClusterUM3PrinterOutputController(self),
                                         key=data["uuid"], name= data["name"])
 
-        configuration = ConfigurationModel()
+        configuration = PrinterConfigurationModel()
         extruders = [ExtruderConfigurationModel(position = idx) for idx in range(0, self._number_of_extruders)]
         for index in range(0, self._number_of_extruders):
             try:

tests/UI/TestPrintJobOutputModel.py

@@ -2,7 +2,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.UI.PrinterOutputModel import PrinterOutputModel
 
@@ -11,7 +11,7 @@ test_validate_data_get_set = [
 ]
 
 test_validate_data_get_update = [
-    {"attribute": "configuration", "value": ConfigurationModel()},
+    {"attribute": "configuration", "value": PrinterConfigurationModel()},
     {"attribute": "owner", "value": "WHOO"},
     {"attribute": "assignedPrinter", "value": PrinterOutputModel(MagicMock())},
     {"attribute": "key", "value": "YAY"},

tests/UI/TestPrinterConfigurationModel.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.ConfigurationModel import ConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 test_validate_data_get_set = [
@@ -16,7 +16,7 @@ test_validate_data_get_set = [
 
 @pytest.mark.parametrize("data", test_validate_data_get_set)
 def test_getAndSet(data):
-    model = ConfigurationModel()
+    model = PrinterConfigurationModel()
 
     # Convert the first letter into a capital
     attribute = list(data["attribute"])