3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make the UM3 work properly

Browse source
This commit is contained in:
Arjen Hiemstra 2017-04-18 17:42:20 +02:00
parent 0a0353da82
commit 0467a8688a
3 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
cura/Settings/CuraStackBuilder.py
View file

@ -21,14 +21,14 @@ class CuraStackBuilder:
# \return The new global stack or None if an error occurred.
@classmethod
def createMachine(cls, name: str, definition_id: str) -> GlobalStack:
cls.__registry = ContainerRegistry.getInstance()
definitions = cls.__registry.findDefinitionContainers(id = definition_id)
registry = ContainerRegistry.getInstance()
definitions = registry.findDefinitionContainers(id = definition_id)
if not definitions:
Logger.log("w", "Definition {definition} was not found!", definition = definition_id)
return None
machine_definition = definitions[0]
name = cls.__registry.createUniqueName("machine", "", name, machine_definition.name)
name = registry.createUniqueName("machine", "", name, machine_definition.name)
new_global_stack = cls.createGlobalStack(
new_stack_id = name,
@ -38,14 +38,14 @@ class CuraStackBuilder:
variant = "default",
)
for extruder_definition in cls.__registry.findDefinitionContainers(machine = machine_definition.id):
for extruder_definition in registry.findDefinitionContainers(machine = machine_definition.id):
position = extruder_definition.getMetaDataEntry("position", None)
if not position:
Logger.log("w", "Extruder definition %s specifies no position metadata entry.", extruder_definition.id)
new_extruder_id = cls.__registry.uniqueName(extruder_definition.id)
new_extruder_id = registry.uniqueName(extruder_definition.id)
new_extruder = cls.createExtruderStack(
new_extruder_id = new_extruder_id,
new_extruder_id,
definition = extruder_definition,
machine_definition = machine_definition,
quality = "default",
@ -66,34 +66,34 @@ class CuraStackBuilder:
# \return A new Global stack instance with the specified parameters.
@classmethod
def createExtruderStack(cls, new_stack_id: str, definition: DefinitionContainer, machine_definition: DefinitionContainer, **kwargs) -> ExtruderStack:
cls.__registry = ContainerRegistry.getInstance()
stack = ExtruderStack(new_stack_id)
stack.setName(definition.getName())
stack.setDefinition(definition)
stack.addMetaDataEntry("position", definition.getMetaDataEntry("position"))
user_container = InstanceContainer(new_stack_id + "_user")
user_container.addMetaDataEntry("type", "user")
user_container.addMetaDataEntry("extruder", new_stack_id)
user_container.setDefinition(machine_definition)
stack.setUserChanges(user_container)
if "next_stack" in kwargs:
stack.setNextStack(kwargs["next_stack"])
# Important! The order here matters, because that allows functions like __setStackQuality to
# Important! The order here matters, because that allows the stack to
# assume the material and variant have already been set.
if "definition_changes" in kwargs:
stack.setDefinitionChangesById(kwargs["definition_changes"])
if "variant" in kwargs:
cls.__setStackVariant(stack, kwargs["variant"])
stack.setVariantById(kwargs["variant"])
if "material" in kwargs:
cls.__setStackMaterial(stack, kwargs["material"])
stack.setMaterialById(kwargs["material"])
if "quality" in kwargs:
cls.__setStackQuality(stack, kwargs["quality"])
stack.setQualityById(kwargs["quality"])
if "quality_changes" in kwargs:
stack.setQualityChangesById(kwargs["quality_changes"])
@ -101,8 +101,9 @@ class CuraStackBuilder:
# Only add the created containers to the registry after we have set all the other
# properties. This makes the create operation more transactional, since any problems
# setting properties will not result in incomplete containers being added.
cls.__registry.addContainer(stack)
cls.__registry.addContainer(user_container)
registry = ContainerRegistry.getInstance()
registry.addContainer(stack)
registry.addContainer(user_container)
return stack
@ -115,8 +116,6 @@ class CuraStackBuilder:
# \return A new Global stack instance with the specified parameters.
@classmethod
def createGlobalStack(cls, new_stack_id: str, definition: DefinitionContainer, **kwargs) -> GlobalStack:
cls.__registry = ContainerRegistry.getInstance()
stack = GlobalStack(new_stack_id)
stack.setDefinition(definition)
@ -127,24 +126,25 @@ class CuraStackBuilder:
stack.setUserChanges(user_container)
# Important! The order here matters, because that allows functions like __setStackQuality to
# Important! The order here matters, because that allows the stack to
# assume the material and variant have already been set.
if "definition_changes" in kwargs:
stack.setDefinitionChangesById(kwargs["definition_changes"])
if "variant" in kwargs:
cls.__setStackVariant(stack, kwargs["variant"])
stack.setVariantById(kwargs["variant"])
if "material" in kwargs:
cls.__setStackMaterial(stack, kwargs["material"])
stack.setMaterialById(kwargs["material"])
if "quality" in kwargs:
cls.__setStackQuality(stack, kwargs["quality"])
stack.setQualityById(kwargs["quality"])
if "quality_changes" in kwargs:
stack.setQualityChangesById(kwargs["quality_changes"])
cls.__registry.addContainer(stack)
cls.__registry.addContainer(user_container)
registry = ContainerRegistry.getInstance()
registry.addContainer(stack)
registry.addContainer(user_container)
return stack

4
cura/Settings/ExtruderManager.py
View file

@ -396,7 +396,6 @@ class ExtruderManager(QObject):
# \param machine_id The machine to get the extruders of.
def getMachineExtruders(self, machine_id):
if machine_id not in self._extruder_trains:
Logger.log("w", "Tried to get the extruder trains for machine %s, which doesn't exist.", machine_id)
return []
return [self._extruder_trains[machine_id][name] for name in self._extruder_trains[machine_id]]
@ -420,13 +419,12 @@ class ExtruderManager(QObject):
global_stack = Application.getInstance().getGlobalContainerStack()
result = []
if global_stack:
if global_stack and global_stack.getId() in self._extruder_trains:
for extruder in sorted(self._extruder_trains[global_stack.getId()]):
result.append(self._extruder_trains[global_stack.getId()][extruder])
return result
def __globalContainerStackChanged(self) -> None:
self._addCurrentMachineExtruders()
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack and global_container_stack.getBottom() and global_container_stack.getBottom().getId() != self._global_container_stack_definition_id:
self._global_container_stack_definition_id = global_container_stack.getBottom().getId()

6
cura/Settings/ExtruderStack.py
View file

@ -60,6 +60,12 @@ class ExtruderStack(CuraContainerStack):
return super().getProperty(key, property_name)
@override(CuraContainerStack)
def _getMachineDefinition(self) -> ContainerInterface:
if not self.getNextStack():
raise Exceptions.NoGlobalStackError("Extruder {id} is missing the next stack!".format(id = self.id))
return self.getNextStack()._getMachineDefinition()
extruder_stack_mime = MimeType(
name = "application/x-cura-extruderstack",