3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jack Ha 2018-01-11 09:33:15 +01:00
commit b8a21a5eb3
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/CuraApplication.py
View file

@ -1483,7 +1483,14 @@ class CuraApplication(QtApplication):
# Step is for skipping tests to make it a lot faster. it also makes the outcome somewhat rougher
node, _ = arranger.findNodePlacement(node, offset_shape_arr, hull_shape_arr, step = 10)
node.addDecorator(BuildPlateDecorator(target_build_plate))
# This node is deepcopied from some other node which already has a BuildPlateDecorator, but the deepcopy
# of BuildPlateDecorator produces one that's assoicated with build plate -1. So, here we need to check if
# the BuildPlateDecorator exists or not and always set the correct build plate number.
build_plate_decorator = node.getDecorator(BuildPlateDecorator)
if build_plate_decorator is None:
build_plate_decorator = BuildPlateDecorator(target_build_plate)
node.addDecorator(build_plate_decorator)
build_plate_decorator.setBuildPlateNumber(target_build_plate)
op = AddSceneNodeOperation(node, scene.getRoot())
op.push()

16
cura/Settings/CuraContainerRegistry.py
View file

@ -214,8 +214,6 @@ class CuraContainerRegistry(ContainerRegistry):
name_seed = os.path.splitext(os.path.basename(file_name))[0]
new_name = self.uniqueName(name_seed)
# Ensure it is always a list of profiles
if type(profile_or_list) is not list:
profile_or_list = [profile_or_list]
@ -238,16 +236,6 @@ class CuraContainerRegistry(ContainerRegistry):
else: #More extruders in the imported file than in the machine.
continue #Delete the additional profiles.
# if the loaded profile comes from g-code then the instance containers should be
# defined differently
if extension == "gcode":
if profile.getMetaDataEntry("extruder") is None:
temp_defintion = profile.getMetaDataEntry("definition")
profile.metaData["id"] = (temp_defintion + "_" + new_name).lower()
elif profile.getMetaDataEntry("extruder") is not None: # be sure that extruder data exist
temp_extruder = profile.getMetaDataEntry("extruder")
profile.metaData["id"] = (temp_extruder + "_" + new_name).lower()
result = self._configureProfile(profile, profile_id, new_name)
if result is not None:
return {"status": "error", "message": catalog.i18nc(
@ -280,6 +268,10 @@ class CuraContainerRegistry(ContainerRegistry):
profile._id = new_id
profile.setName(new_name)
# Set the unique Id to the profile, so it's generating a new one even if the user imports the same profile
# It also solves an issue with importing profiles from G-Codes
profile.setMetaDataEntry("id", new_id)
if "type" in profile.getMetaData():
profile.setMetaDataEntry("type", "quality_changes")
else: