diff --git a/cura/PrinterOutput/GenericOutputController.py b/cura/PrinterOutput/GenericOutputController.py index 60b277c33e..88ac529e01 100644 --- a/cura/PrinterOutput/GenericOutputController.py +++ b/cura/PrinterOutput/GenericOutputController.py @@ -11,7 +11,7 @@ if TYPE_CHECKING: from cura.UI.PrintJobOutputModel import PrintJobOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice - from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel + from cura.UI.ExtruderOutputModel import ExtruderOutputModel class GenericOutputController(PrinterOutputController): diff --git a/cura/PrinterOutput/PrinterOutputController.py b/cura/PrinterOutput/PrinterOutputController.py index 22d4788ab0..4352c59762 100644 --- a/cura/PrinterOutput/PrinterOutputController.py +++ b/cura/PrinterOutput/PrinterOutputController.py @@ -7,7 +7,7 @@ from UM.Signal import Signal MYPY = False if MYPY: from cura.UI.PrintJobOutputModel import PrintJobOutputModel - from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel + from cura.UI.ExtruderOutputModel import ExtruderOutputModel from cura.UI.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice diff --git a/cura/PrinterOutput/ExtruderOutputModel.py b/cura/UI/ExtruderOutputModel.py similarity index 100% rename from cura/PrinterOutput/ExtruderOutputModel.py rename to cura/UI/ExtruderOutputModel.py diff --git a/cura/UI/PrinterOutputModel.py b/cura/UI/PrinterOutputModel.py index ae1bd922d0..5cd6e0e206 100644 --- a/cura/UI/PrinterOutputModel.py +++ b/cura/UI/PrinterOutputModel.py @@ -5,7 +5,7 @@ from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, from typing import List, Dict, Optional from UM.Math.Vector import Vector from cura.PrinterOutput.ConfigurationModel import ConfigurationModel -from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel +from cura.UI.ExtruderOutputModel import ExtruderOutputModel MYPY = False if MYPY: diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py index 49f2d8dfbc..922d3e840c 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py @@ -3,7 +3,7 @@ from typing import Union, Dict, Optional, Any from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel -from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel +from cura.UI.ExtruderOutputModel import ExtruderOutputModel from .CloudClusterPrinterConfigurationMaterial import CloudClusterPrinterConfigurationMaterial from .BaseCloudModel import BaseCloudModel