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

Merge branch '2.4'

Browse Source
This commit is contained in:
Jack Ha 2017-01-25 15:28:56 +01:00
commit 7281b46118
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/3MFWriter/ThreeMFWriter.py
View File

@ -44,7 +44,7 @@ class ThreeMFWriter(MeshWriter):
result += str(matrix._data[2,2]) + " " result += str(matrix._data[2,2]) + " "
result += str(matrix._data[0,3]) + " " result += str(matrix._data[0,3]) + " "
result += str(matrix._data[1,3]) + " " result += str(matrix._data[1,3]) + " "
result += str(matrix._data[2,3]) + " " result += str(matrix._data[2,3])
return result return result
## Should we store the archive ## Should we store the archive
@ -78,10 +78,11 @@ class ThreeMFWriter(MeshWriter):
model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel") model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel")
model = ET.Element("model", unit = "millimeter", xmlns = self._namespaces["3mf"]) model = ET.Element("model", unit = "millimeter", xmlns = self._namespaces["3mf"])
model.set("xmlns:cura", self._namespaces["cura"])
# Add the version of Cura this was created with. As "CuraVersion" is not a recognised metadata name # Add the version of Cura this was created with. Since there is no "version" or similar metadata name we need
# by 3mf itself, we place it in our own namespace. # to prefix it with the cura namespace, as specified by the 3MF specification.
version_metadata = ET.SubElement(model, "metadata", xmlns = self._namespaces["cura"], name = "CuraVersion") version_metadata = ET.SubElement(model, "metadata", name = "cura:version")
version_metadata.text = Application.getInstance().getVersion() version_metadata.text = Application.getInstance().getVersion()
resources = ET.SubElement(model, "resources") resources = ET.SubElement(model, "resources")

4
resources/definitions/fdmprinter.def.json
View File

@ -1383,9 +1383,9 @@
"type": "float", "type": "float",
"resolve": "max(extruderValues('material_bed_temperature_layer_0'))", "resolve": "max(extruderValues('material_bed_temperature_layer_0'))",
"default_value": 60, "default_value": 60,
"value": "material_bed_temperature", "value": "max(extruderValues('material_bed_temperature'))",
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"", "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false, "settable_per_mesh": false,