Browse Source

WIP: Move NozzleModel.py

Lipu Fei 7 years ago
parent
commit
13d745f07d

+ 1 - 3
cura/CuraApplication.py

@@ -52,7 +52,7 @@ from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyT
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.SettingFunction import SettingFunction
 from UM.Settings.SettingFunction import SettingFunction
 from cura.Settings.MachineNameValidator import MachineNameValidator
 from cura.Settings.MachineNameValidator import MachineNameValidator
-from cura.Settings.NozzleModel import NozzleModel
+from cura.Machines.Models.NozzleModel import NozzleModel
 from cura.Settings.ProfilesModel import ProfilesModel, NewQualityProfilesModel, NewCustomQualityProfilesModel
 from cura.Settings.ProfilesModel import ProfilesModel, NewQualityProfilesModel, NewCustomQualityProfilesModel
 from cura.Settings.MaterialsModel import MaterialsModel, BrandMaterialsModel, GenericMaterialsModel
 from cura.Settings.MaterialsModel import MaterialsModel, BrandMaterialsModel, GenericMaterialsModel
 from cura.Settings.QualityAndUserProfilesModel import QualityAndUserProfilesModel
 from cura.Settings.QualityAndUserProfilesModel import QualityAndUserProfilesModel
@@ -61,8 +61,6 @@ from cura.Settings.UserProfilesModel import UserProfilesModel
 from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
 from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
 
 
 from cura.Machines.VariantManager import VariantManager
 from cura.Machines.VariantManager import VariantManager
-from cura.Machines.QualityManager import QualityGroup
-
 
 
 from . import PlatformPhysics
 from . import PlatformPhysics
 from . import BuildVolume
 from . import BuildVolume

+ 0 - 0
cura/Settings/NozzleModel.py → cura/Machines/Models/NozzleModel.py


+ 0 - 0
cura/Machines/Models/__init__.py


+ 0 - 3
cura/Settings/MachineManager.py

@@ -122,9 +122,6 @@ class MachineManager(QObject):
             # Make sure _active_container_stack is properly initiated
             # Make sure _active_container_stack is properly initiated
             ExtruderManager.getInstance().setActiveExtruderIndex(0)
             ExtruderManager.getInstance().setActiveExtruderIndex(0)
 
 
-        self._auto_materials_changed = {}
-        self._auto_hotends_changed = {}
-
         self._material_incompatible_message = Message(catalog.i18nc("@info:status",
         self._material_incompatible_message = Message(catalog.i18nc("@info:status",
                                                 "The selected material is incompatible with the selected machine or configuration."),
                                                 "The selected material is incompatible with the selected machine or configuration."),
                                                 title = catalog.i18nc("@info:title", "Incompatible Material"))
                                                 title = catalog.i18nc("@info:title", "Incompatible Material"))