mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-09 07:56:22 -06:00
Move PrinterOutputModel into cura.UI module
This commit is contained in:
parent
2b39d6422c
commit
6a8db55112
15 changed files with 14 additions and 14 deletions
|
@ -7,7 +7,7 @@ from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationM
|
||||||
from typing import Optional, TYPE_CHECKING
|
from typing import Optional, TYPE_CHECKING
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
|
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
|
||||||
from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
|
from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ MYPY = False
|
||||||
if MYPY:
|
if MYPY:
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
|
from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
|
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ from UM.FlameProfiler import pyqtSlot
|
||||||
|
|
||||||
MYPY = False
|
MYPY = False
|
||||||
if MYPY:
|
if MYPY:
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
||||||
from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
|
from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
|
||||||
from UM.FileHandler.FileHandler import FileHandler
|
from UM.FileHandler.FileHandler import FileHandler
|
||||||
|
|
|
@ -8,7 +8,7 @@ from PyQt5.QtGui import QImage
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ from UM.Scene.SceneNode import SceneNode
|
||||||
|
|
||||||
from cura.CuraApplication import CuraApplication
|
from cura.CuraApplication import CuraApplication
|
||||||
from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
|
from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
||||||
|
|
||||||
from .CloudOutputController import CloudOutputController
|
from .CloudOutputController import CloudOutputController
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
from typing import List, Union, Dict, Optional, Any
|
from typing import List, Union, Dict, Optional, Any
|
||||||
|
|
||||||
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from .CloudClusterBuildPlate import CloudClusterBuildPlate
|
from .CloudClusterBuildPlate import CloudClusterBuildPlate
|
||||||
from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration
|
from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration
|
||||||
from .BaseCloudModel import BaseCloudModel
|
from .BaseCloudModel import BaseCloudModel
|
||||||
|
|
|
@ -22,7 +22,7 @@ from cura.CuraApplication import CuraApplication
|
||||||
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
||||||
from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
|
from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
|
||||||
from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
|
from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ from typing import List, Optional
|
||||||
|
|
||||||
from cura.CuraApplication import CuraApplication
|
from cura.CuraApplication import CuraApplication
|
||||||
from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState
|
from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
|
||||||
|
|
|
@ -8,7 +8,7 @@ from UM.Version import Version
|
||||||
MYPY = False
|
MYPY = False
|
||||||
if MYPY:
|
if MYPY:
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
|
|
||||||
|
|
||||||
class LegacyUM3PrinterOutputController(PrinterOutputController):
|
class LegacyUM3PrinterOutputController(PrinterOutputController):
|
||||||
|
|
|
@ -6,7 +6,7 @@ from unittest.mock import patch, MagicMock
|
||||||
|
|
||||||
from UM.Scene.SceneNode import SceneNode
|
from UM.Scene.SceneNode import SceneNode
|
||||||
from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
|
from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from ...src.Cloud import CloudApiClient
|
from ...src.Cloud import CloudApiClient
|
||||||
from ...src.Cloud.CloudOutputDevice import CloudOutputDevice
|
from ...src.Cloud.CloudOutputDevice import CloudOutputDevice
|
||||||
from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
|
from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
|
||||||
|
|
|
@ -8,7 +8,7 @@ from UM.Qt.Duration import DurationFormat
|
||||||
|
|
||||||
from cura.CuraApplication import CuraApplication
|
from cura.CuraApplication import CuraApplication
|
||||||
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
|
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.GenericOutputController import GenericOutputController
|
from cura.PrinterOutput.GenericOutputController import GenericOutputController
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import pytest
|
||||||
|
|
||||||
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
|
|
||||||
test_validate_data_get_set = [
|
test_validate_data_get_set = [
|
||||||
{"attribute": "compatibleMachineFamilies", "value": ["yay"]},
|
{"attribute": "compatibleMachineFamilies", "value": ["yay"]},
|
||||||
|
|
|
@ -5,7 +5,7 @@ from unittest.mock import MagicMock
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
from cura.UI.PrintJobOutputModel import PrintJobOutputModel
|
||||||
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
|
from cura.UI.PrinterOutputModel import PrinterOutputModel
|
||||||
|
|
||||||
test_validate_data_get_set = [
|
test_validate_data_get_set = [
|
||||||
{"attribute": "name", "value": "YAY"},
|
{"attribute": "name", "value": "YAY"},
|
Loading…
Add table
Add a link
Reference in a new issue