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

This commit is contained in:
Jaime van Kessel 2016-09-19 13:02:22 +02:00
commit 909a021dfc

View File

@ -101,8 +101,9 @@ class SliceInfo(Extension):
print_information = Application.getInstance().getPrintInformation() print_information = Application.getInstance().getPrintInformation()
material_radius = 0.5 * global_container_stack.getProperty("material_diameter", "value") material_radius = 0.5 * global_container_stack.getProperty("material_diameter", "value")
# TODO: Send material per extruder instead of mashing it on a pile # Send material per extruder
material_used = math.pi * material_radius * material_radius * sum(print_information.materialLengths) #Volume of all materials used material_used = [str(math.pi * material_radius * material_radius * material_length) for material_length in print_information.materialLengths]
material_used = ",".join(material_used)
# Bundle the collected data # Bundle the collected data
submitted_data = { submitted_data = {
@ -139,4 +140,4 @@ class SliceInfo(Extension):
except Exception as e: except Exception as e:
# We really can't afford to have a mistake here, as this would break the sending of g-code to a device # We really can't afford to have a mistake here, as this would break the sending of g-code to a device
# (Either saving or directly to a printer). The functionality of the slice data is not *that* important. # (Either saving or directly to a printer). The functionality of the slice data is not *that* important.
Logger.log("e", "Exception raised while sending slice info: %s" %(repr(e))) # But we should be notified about these problems of course. Logger.log("e", "Exception raised while sending slice info: %s" %(repr(e))) # But we should be notified about these problems of course.