Merge pull request #818 from thopiekar/master-CURA-1445

[CURA-1445] SliceInfo: Providing data from all containers
This commit is contained in:
Aldo Hoeben 2016-06-23 09:55:53 +02:00 committed by GitHub
commit cf718a3a42

View File

@ -82,7 +82,7 @@ class SliceInfo(Extension):
"processor": platform.processor(), "processor": platform.processor(),
"machine": platform.machine(), "machine": platform.machine(),
"platform": platform.platform(), "platform": platform.platform(),
"global_settings": global_container_stack.serialize(), "settings": global_container_stack.serialize(), # global_container with references on used containers
"version": Application.getInstance().getVersion(), "version": Application.getInstance().getVersion(),
"modelhash": "None", "modelhash": "None",
"printtime": print_information.currentPrintTime.getDisplayString(), "printtime": print_information.currentPrintTime.getDisplayString(),
@ -90,6 +90,13 @@ class SliceInfo(Extension):
"language": Preferences.getInstance().getValue("general/language"), "language": Preferences.getInstance().getValue("general/language"),
"materials_profiles ": {} "materials_profiles ": {}
} }
for container in global_container_stack.getContainers():
container_id = container.getId()
container_serialized = container.serialize()
if container_serialized:
submitted_data["settings_%s" %(container_id)] = container_serialized # This can be anything, eg. INI, JSON, etc.
else:
Logger.log("i", "No data found in %s to be serialized!", container_id)
# Convert data to bytes # Convert data to bytes
submitted_data = urllib.parse.urlencode(submitted_data) submitted_data = urllib.parse.urlencode(submitted_data)