diff options
author | Michael Cetrulo <mail2samus@gmail.com> | 2012-06-16 19:49:10 (GMT) |
---|---|---|
committer | Michael Cetrulo <mail2samus@gmail.com> | 2012-06-16 20:18:57 (GMT) |
commit | 7c016a40ca85f73e3755e010b04aacc449e529e2 (patch) | |
tree | 5604798da822f4eee67a6c6922d9871b3393634c | |
parent | 7ab16f852de97bd35923a6743da940cfcbf0871b (diff) |
generalizacion de nombres de motor
-rw-r--r-- | LegoJAM.py | 31 |
1 files changed, 11 insertions, 20 deletions
@@ -20,6 +20,7 @@ from interface.window import Window class LegoJAM(Window): + motor_names = ('A', 'B', 'C') def __init__(self): super(LegoJAM, self).__init__() @@ -43,15 +44,13 @@ class LegoJAM(Window): self.canvas.pack_start(treeview, True, True, 0) - num = 1 - for robot in robots: + for num, robot in enumerate(robots): try: robot_str = '%s %s' % (robot.type, robot.host) except AttributeError: - robot_str = '%s %s' % (robot.type, num) - liststore.append([num, robot_str]) - num += 1 + robot_str = '%s %s' % (robot.type, num+1) + liststore.append([num+1, robot_str]) treeview.connect('row-activated', self.select_robot, robots) @@ -71,8 +70,7 @@ class LegoJAM(Window): self.canvas.pack_start(combobox, True, False) combobox.show() - num = 0 - for i in ['A', 'B', 'C']: + for num, i in enumerate(LegoJAM): store.append(['Motor %s' % i, num]) combobox.set_active(0) @@ -86,7 +84,6 @@ class LegoJAM(Window): stop_button.connect_object("clicked", self.stop_motor, combobox) vbox.pack_start(stop_button) vbox.show() - num += 1 battery_status = gtk.Label( 'Estado de la bateria: %s' % self.robot.robot.get_battery_level()) @@ -99,20 +96,14 @@ class LegoJAM(Window): self.show_all() def run_motor(self, combobox): - if combobox.get_active() == 0: - self.robot.run_motor("A") - elif combobox.get_active() == 1: - self.robot.run_motor("B") - elif combobox.get_active() == 2: - self.robot.run_motor("C") + motor_index = combobox.get_active() + motor_name = LegoJAM.motor_names[motor_index] + self.robot.run_motor(motor_name) def stop_motor(self, combobox): - if combobox.get_active() == 0: - self.robot.stop_motor("A") - elif combobox.get_active() == 1: - self.robot.stop_motor("B") - elif combobox.get_active() == 2: - self.robot.stop_motor("C") + motor_index = combobox.get_active() + motor_name = LegoJAM.motor_names[motor_index] + self.robot.stop_motor(motor_name) def delete_event(self, widget, event): self.salir() |