diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 7b4b19eb1c..4786e5e25a 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -66,19 +66,19 @@ from UM.Settings.SettingFunction import SettingFunction from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.MachineNameValidator import MachineNameValidator -from cura.Machines.Models.BuildPlateModel import BuildPlateModel -from cura.Machines.Models.NozzleModel import NozzleModel -from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel -from cura.Machines.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel -from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel -from cura.Machines.Models.FavoriteMaterialsModel import FavoriteMaterialsModel -from cura.Machines.Models.GenericMaterialsModel import GenericMaterialsModel -from cura.Machines.Models.MaterialBrandsModel import MaterialBrandsModel -from cura.Machines.Models.QualityManagementModel import QualityManagementModel -from cura.Machines.Models.QualitySettingsModel import QualitySettingsModel -from cura.Machines.Models.MachineManagementModel import MachineManagementModel +from cura.UI.Models.BuildPlateModel import BuildPlateModel +from cura.UI.Models.NozzleModel import NozzleModel +from cura.UI.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel +from cura.UI.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel +from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel +from cura.UI.Models.FavoriteMaterialsModel import FavoriteMaterialsModel +from cura.UI.Models.GenericMaterialsModel import GenericMaterialsModel +from cura.UI.Models.MaterialBrandsModel import MaterialBrandsModel +from cura.UI.Models import QualityManagementModel +from cura.UI.Models.QualitySettingsModel import QualitySettingsModel +from cura.UI.Models.MachineManagementModel import MachineManagementModel -from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel +from cura.UI.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel from cura.Machines.MachineErrorChecker import MachineErrorChecker @@ -111,7 +111,7 @@ from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions from cura.UI.ObjectsModel import ObjectsModel -from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrintersModel +from cura.UI.Models.DiscoveredPrintersModel import DiscoveredPrintersModel from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage diff --git a/cura/Scene/CuraSceneController.py b/cura/Scene/CuraSceneController.py index 91ff26cadc..e331a109ec 100644 --- a/cura/Scene/CuraSceneController.py +++ b/cura/Scene/CuraSceneController.py @@ -5,7 +5,7 @@ from PyQt5.QtWidgets import QApplication from UM.Scene.Camera import Camera from cura.UI.ObjectsModel import ObjectsModel -from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel +from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel from UM.Application import Application from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/UI/MachineModels/BaseMaterialsModel.py similarity index 100% rename from cura/Machines/Models/BaseMaterialsModel.py rename to cura/UI/MachineModels/BaseMaterialsModel.py diff --git a/cura/Machines/Models/BuildPlateModel.py b/cura/UI/MachineModels/BuildPlateModel.py similarity index 100% rename from cura/Machines/Models/BuildPlateModel.py rename to cura/UI/MachineModels/BuildPlateModel.py diff --git a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py b/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py similarity index 93% rename from cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py rename to cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py index dcade8cb0d..9a31256ec3 100644 --- a/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py +++ b/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py @@ -3,7 +3,7 @@ from UM.Logger import Logger -from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel +from cura.UI.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel # diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/UI/MachineModels/DiscoveredPrintersModel.py similarity index 100% rename from cura/Machines/Models/DiscoveredPrintersModel.py rename to cura/UI/MachineModels/DiscoveredPrintersModel.py diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/UI/MachineModels/FavoriteMaterialsModel.py similarity index 94% rename from cura/Machines/Models/FavoriteMaterialsModel.py rename to cura/UI/MachineModels/FavoriteMaterialsModel.py index 98a2a01597..2540fd0608 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/UI/MachineModels/FavoriteMaterialsModel.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel +from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel ## Model that shows the list of favorite materials. class FavoriteMaterialsModel(BaseMaterialsModel): diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/UI/MachineModels/GenericMaterialsModel.py similarity index 91% rename from cura/Machines/Models/GenericMaterialsModel.py rename to cura/UI/MachineModels/GenericMaterialsModel.py index 8f41dd6a70..a99cdfc8eb 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/UI/MachineModels/GenericMaterialsModel.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from UM.Logger import Logger -from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel +from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel class GenericMaterialsModel(BaseMaterialsModel): diff --git a/cura/Machines/Models/MachineManagementModel.py b/cura/UI/MachineModels/MachineManagementModel.py similarity index 100% rename from cura/Machines/Models/MachineManagementModel.py rename to cura/UI/MachineModels/MachineManagementModel.py diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/UI/MachineModels/MaterialBrandsModel.py similarity index 96% rename from cura/Machines/Models/MaterialBrandsModel.py rename to cura/UI/MachineModels/MaterialBrandsModel.py index ac82cf6670..7f02dd5302 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/UI/MachineModels/MaterialBrandsModel.py @@ -1,10 +1,9 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty +from PyQt5.QtCore import Qt, pyqtSignal from UM.Qt.ListModel import ListModel -from UM.Logger import Logger -from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel +from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel class MaterialTypesModel(ListModel): diff --git a/cura/Machines/Models/MultiBuildPlateModel.py b/cura/UI/MachineModels/MultiBuildPlateModel.py similarity index 100% rename from cura/Machines/Models/MultiBuildPlateModel.py rename to cura/UI/MachineModels/MultiBuildPlateModel.py diff --git a/cura/Machines/Models/NozzleModel.py b/cura/UI/MachineModels/NozzleModel.py similarity index 100% rename from cura/Machines/Models/NozzleModel.py rename to cura/UI/MachineModels/NozzleModel.py diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/UI/MachineModels/QualityManagementModel.py similarity index 100% rename from cura/Machines/Models/QualityManagementModel.py rename to cura/UI/MachineModels/QualityManagementModel.py diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/UI/MachineModels/QualityProfilesDropDownMenuModel.py similarity index 100% rename from cura/Machines/Models/QualityProfilesDropDownMenuModel.py rename to cura/UI/MachineModels/QualityProfilesDropDownMenuModel.py diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/UI/MachineModels/QualitySettingsModel.py similarity index 100% rename from cura/Machines/Models/QualitySettingsModel.py rename to cura/UI/MachineModels/QualitySettingsModel.py diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/UI/MachineModels/SettingVisibilityPresetsModel.py similarity index 100% rename from cura/Machines/Models/SettingVisibilityPresetsModel.py rename to cura/UI/MachineModels/SettingVisibilityPresetsModel.py diff --git a/cura/Machines/Models/__init__.py b/cura/UI/MachineModels/__init__.py similarity index 100% rename from cura/Machines/Models/__init__.py rename to cura/UI/MachineModels/__init__.py diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index ceba5f3006..3d0d4fb11e 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -10,20 +10,17 @@ from time import time from typing import Any, cast, Dict, List, Optional, Set, TYPE_CHECKING from UM.Backend.Backend import Backend, BackendState -from UM.Scene.Camera import Camera from UM.Scene.SceneNode import SceneNode from UM.Signal import Signal from UM.Logger import Logger from UM.Message import Message from UM.PluginRegistry import PluginRegistry -from UM.Resources import Resources from UM.Platform import Platform from UM.Qt.Duration import DurationFormat from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Settings.Interfaces import DefinitionContainerInterface from UM.Settings.SettingInstance import SettingInstance #For typing. from UM.Tool import Tool #For typing. -from UM.Mesh.MeshData import MeshData #For typing. from cura.CuraApplication import CuraApplication from cura.Settings.ExtruderManager import ExtruderManager @@ -33,7 +30,7 @@ from .StartSliceJob import StartSliceJob, StartJobResult import Arcus if TYPE_CHECKING: - from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel + from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel from cura.Machines.MachineErrorChecker import MachineErrorChecker from UM.Scene.Scene import Scene from UM.Settings.ContainerStack import ContainerStack diff --git a/tests/Settings/TestSettingVisibilityPresets.py b/tests/Settings/TestSettingVisibilityPresets.py index b82aa62ea7..079bda3912 100644 --- a/tests/Settings/TestSettingVisibilityPresets.py +++ b/tests/Settings/TestSettingVisibilityPresets.py @@ -5,7 +5,7 @@ import os.path from UM.Preferences import Preferences from UM.Resources import Resources from cura.CuraApplication import CuraApplication -from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel +from cura.UI.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel from cura.Settings.SettingVisibilityPreset import SettingVisibilityPreset setting_visibility_preset_test_settings = {"test", "zomg", "derp", "yay", "whoo"}