GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix circular import bullcrap

Browse Source 
Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-04 17:51:43 +02:00
parent d150acb79c
commit 354a467d8e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cura/Settings/ContainerManager.py
View File

@ -14,8 +14,7 @@ import UM.Platform
import UM.MimeTypeDatabase import UM.MimeTypeDatabase
import UM.Logger import UM.Logger
from .ExtruderManager import ExtruderManager import cura.Settings
from .MachineManager import MachineManager
from UM.MimeTypeDatabase import MimeTypeNotFoundError from UM.MimeTypeDatabase import MimeTypeNotFoundError
@ -363,11 +362,11 @@ class ContainerManager(QObject):
UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile") UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile")
return False return False
MachineManager.getInstance().blurSettings.emit() cura.Settings.MachineManager.getInstance().blurSettings.emit()
containers_to_merge.append((global_quality_changes, global_stack.getTop())) containers_to_merge.append((global_quality_changes, global_stack.getTop()))
for extruder in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()): for extruder in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
quality_changes = extruder.findContainer(type = "quality_changes") quality_changes = extruder.findContainer(type = "quality_changes")
if not quality_changes or quality_changes.isReadOnly(): if not quality_changes or quality_changes.isReadOnly():
UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile") UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile")
@ -382,9 +381,9 @@ class ContainerManager(QObject):
def clearUserContainers(self): def clearUserContainers(self):
global_stack = UM.Application.getInstance().getGlobalContainerStack() global_stack = UM.Application.getInstance().getGlobalContainerStack()
MachineManager.getInstance().blurSettings.emit() cura.Settings.MachineManager.getInstance().blurSettings.emit()
for extruder in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()): for extruder in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
extruder.getTop().clear() extruder.getTop().clear()
global_stack.getTop().clear() global_stack.getTop().clear()
@ -400,13 +399,13 @@ class ContainerManager(QObject):
UM.Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId()) UM.Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId())
return False return False
MachineManager.getInstance().blurSettings.emit() cura.Settings.MachineManager.getInstance().blurSettings.emit()
unique_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_container.getName()) unique_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_container.getName())
unique_id = unique_name.lower() unique_id = unique_name.lower()
unique_id.replace(" ", "_") unique_id.replace(" ", "_")
stacks = [ s for s in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()) ] stacks = [ s for s in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()) ]
stacks.insert(0, global_stack) stacks.insert(0, global_stack)
for stack in stacks: for stack in stacks: