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

Fix coding style issues

Browse source
This commit is contained in:
Arjen Hiemstra 2015-11-27 13:57:53 +01:00
parent 743b403b29
commit 9267b517d6
12 changed files with 68 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py
View file

@ -32,7 +32,7 @@ class ProcessSlicedObjectListJob(Job):
Application.getInstance().getController().activeViewChanged.connect(self._onActiveViewChanged)
objectIdMap = {}
object_id_map = {}
new_node = SceneNode()
## Put all nodes in a dict identified by ID
for node in DepthFirstIterator(self._scene.getRoot()):
@ -40,11 +40,10 @@ class ProcessSlicedObjectListJob(Job):
if node.callDecoration("getLayerData"):
self._scene.getRoot().removeChild(node)
else:
objectIdMap[id(node)] = node
object_id_map[id(node)] = node
Job.yieldThread()
settings = Application.getInstance().getMachineManager().getActiveProfile()
layerHeight = settings.getSettingValue("layer_height")
center = None
if not settings.getSettingValue("machine_center_is_zero"):
@ -62,7 +61,7 @@ class ProcessSlicedObjectListJob(Job):
current_layer = 0
for object in self._message.objects:
try:
node = objectIdMap[object.id]
node = object_id_map[object.id]
except KeyError:
continue

5
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -115,12 +115,17 @@ class StartSliceJob(Job):
return str(value).encode("utf-8")
def _sendSettings(self, profile):
Application.getInstance().getMachineManager().getActiveMachineInstance().setMachineSettingValue("machine_gcode_flavor", "RepRap")
msg = Cura_pb2.SettingList()
settings = profile.getAllSettingValues(include_machine = True)
start_gcode = settings["machine_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
for key, value in settings.items():
if key == "machine_gcode_flavor":
print("machine_gcode_flavor", value)
s = msg.settings.add()
s.name = key
if key == "machine_start_gcode" or key == "machine_end_gcode":