diff options
author | Jaime van Kessel <nallath@gmail.com> | 2021-09-24 17:17:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 17:17:12 +0300 |
commit | fa3f3efbecb3e5a9dd3fe85f3cfff004b59f61ea (patch) | |
tree | d8209e0797e05ac535aad292c254cf0c2418812c | |
parent | f2ed6d9054de18fd0842a850a69f5413c001acae (diff) | |
parent | 2238234741769bcb8c967741e45d844ead1f70a4 (diff) |
Merge pull request #10289 from fieldOfView/feature_material_type_name_patterns
Add {material_type}, {material_name}, {material_id} and {material_brand} as replacement patterns
CURA-8598
-rw-r--r-- | plugins/CuraEngineBackend/StartSliceJob.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index dfe478cb2b..9e53ce8b3a 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -353,10 +353,19 @@ class StartSliceJob(Job): result[key] = stack.getProperty(key, "value") Job.yieldThread() - result["print_bed_temperature"] = result["material_bed_temperature"] # Renamed settings. + # Material identification in addition to non-human-readable GUID + result["material_id"] = stack.material.getMetaDataEntry("base_file", "") + result["material_type"] = stack.material.getMetaDataEntry("material", "") + result["material_name"] = stack.material.getMetaDataEntry("name", "") + result["material_brand"] = stack.material.getMetaDataEntry("brand", "") + + # Renamed settings. + result["print_bed_temperature"] = result["material_bed_temperature"] result["print_temperature"] = result["material_print_temperature"] result["travel_speed"] = result["speed_travel"] - result["time"] = time.strftime("%H:%M:%S") #Some extra settings. + + #Some extra settings. + result["time"] = time.strftime("%H:%M:%S") result["date"] = time.strftime("%d-%m-%Y") result["day"] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][int(time.strftime("%w"))] result["initial_extruder_nr"] = CuraApplication.getInstance().getExtruderManager().getInitialExtruderNr() |