Merge branch 'master' into feature_decline_slice_info

This commit is contained in:
alekseisasin 2017-12-21 10:24:35 +01:00 committed by GitHub
commit d7146a90f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
256 changed files with 17379 additions and 4694 deletions

View file

@ -104,7 +104,9 @@ class SliceInfo(Extension):
"type": extruder.material.getMetaData().get("material", ""),
"brand": extruder.material.getMetaData().get("brand", "")
}
extruder_dict["material_used"] = print_information.materialLengths[int(extruder.getMetaDataEntry("position", "0"))]
extruder_position = int(extruder.getMetaDataEntry("position", "0"))
if extruder_position in print_information.materialLengths:
extruder_dict["material_used"] = print_information.materialLengths[extruder_position]
extruder_dict["variant"] = extruder.variant.getName()
extruder_dict["nozzle_size"] = extruder.getProperty("machine_nozzle_size", "value")