3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Update StartSliceJob to reflect the new Arcus API

Browse source
This commit is contained in:
Arjen Hiemstra 2016-01-28 03:23:10 +01:00
parent 6930008dd8
commit 22fb26bae6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -81,14 +81,14 @@ class StartSliceJob(Job):
self._sendSettings(self._profile) self._sendSettings(self._profile)
slice_message = Cura_pb2.Slice() slice_message = self._socket.createMessage("cura.proto.Slice");
for group in object_groups: for group in object_groups:
group_message = slice_message.object_lists.add() group_message = slice_message.addRepeatedMessage("object_lists");
for object in group: for object in group:
mesh_data = object.getMeshData().getTransformed(object.getWorldTransformation()) mesh_data = object.getMeshData().getTransformed(object.getWorldTransformation())
obj = group_message.objects.add() obj = group_message.addRepeatedMessage("objects");
obj.id = id(object) obj.id = id(object)
verts = numpy.array(mesh_data.getVertices()) verts = numpy.array(mesh_data.getVertices())
@ -115,13 +115,13 @@ class StartSliceJob(Job):
return str(value).encode("utf-8") return str(value).encode("utf-8")
def _sendSettings(self, profile): def _sendSettings(self, profile):
msg = Cura_pb2.SettingList() msg = self._socket.createMessage("cura.proto.SettingList");
settings = profile.getAllSettingValues(include_machine = True) settings = profile.getAllSettingValues(include_machine = True)
start_gcode = settings["machine_start_gcode"] start_gcode = settings["machine_start_gcode"]
settings["material_bed_temp_prepend"] = "{material_bed_temperature}" not in start_gcode settings["material_bed_temp_prepend"] = "{material_bed_temperature}" not in start_gcode
settings["material_print_temp_prepend"] = "{material_print_temperature}" not in start_gcode settings["material_print_temp_prepend"] = "{material_print_temperature}" not in start_gcode
for key, value in settings.items(): for key, value in settings.items():
s = msg.settings.add() s = msg.addRepeatedMessage("settings")
s.name = key s.name = key
if key == "machine_start_gcode" or key == "machine_end_gcode": if key == "machine_start_gcode" or key == "machine_end_gcode":
s.value = self._expandGcodeTokens(key, value, settings) s.value = self._expandGcodeTokens(key, value, settings)
@ -134,7 +134,7 @@ class StartSliceJob(Job):
profile = node.callDecoration("getProfile") profile = node.callDecoration("getProfile")
if profile: if profile:
for key, value in profile.getAllSettingValues().items(): for key, value in profile.getAllSettingValues().items():
setting = message.settings.add() setting = message.addRepeatedMessage("settings")
setting.name = key setting.name = key
setting.value = str(value).encode() setting.value = str(value).encode()
@ -145,7 +145,7 @@ class StartSliceJob(Job):
return return
for key, value in object_settings.items(): for key, value in object_settings.items():
setting = message.settings.add() setting = message.addRepeatedMessage("settings")
setting.name = key setting.name = key
setting.value = str(value).encode() setting.value = str(value).encode()