diff options
-rw-r--r-- | LegoJAM.py | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -45,12 +45,9 @@ class LegoJAM(Window): self.canvas.pack_start(treeview, True, True, 0) for num, robot in enumerate(robots): - try: - robot_str = '%s %s' % (robot.type, robot.host) - - except AttributeError: - robot_str = '%s %s' % (robot.type, num+1) - liststore.append([num+1, robot_str]) + robot_id = robot.host if robot.type == 'bluetooth' else num+1 + robot_str = '%s %s' % (robot.type, robot_id) + liststore.append([num, robot_str]) treeview.connect('row-activated', self.select_robot, robots) @@ -58,7 +55,7 @@ class LegoJAM(Window): def select_robot(self, treeview, treepath, column, robots): treeview.destroy() - self.set_layout(robots[treepath[0] - 1]) + self.set_layout(robots[treepath[0]]) def set_layout(self, robot): self.robot = Robot(robot) |