From f2a8cf1da1ddc42899bbabdeb4a1a9f43b9bba02 Mon Sep 17 00:00:00 2001 From: Agustin Zubiaga Date: Sat, 16 Jun 2012 17:01:16 +0000 Subject: Notebook eliminado --- diff --git a/LegoJAM.py b/LegoJAM.py index 644b4a1..8f06f5a 100755 --- a/LegoJAM.py +++ b/LegoJAM.py @@ -45,72 +45,40 @@ class LegoJAM(Window): canvas.pack_start(combobox, True, False) combobox.show() - notebook = gtk.Notebook() - notebook.show() - canvas.pack_start(notebook, True, True) - num = 0 for i in ['A', 'B', 'C']: store.append(['Motor %s' % i, num]) - vbox = gtk.VBox() - run_button = gtk.Button("Encender") - run_button.show() - run_button.connect_object("clicked", self.run_motor, num) - vbox.pack_start(run_button) - stop_button = gtk.Button("Apagar") - stop_button.show() - stop_button.connect_object("clicked", self.stop_motor, num) - vbox.pack_start(stop_button) - vbox.show() - notebook.append_page(vbox) - num += 1 - - #self.button_encender_motor_B = gtk.Button("Encender Motor B") - #self.button_encender_motor_C = gtk.Button("Encender Motor C") - - #self.button_detener_motor_A = gtk.Button("Apagar Motor A") - #self.button_detener_motor_B = gtk.Button("Apagar Motor B") - #self.button_detener_motor_C = gtk.Button("Apagar Motor C") - - #self.button_encender_motor_A.connect("clicked", self.run_motor) - #self.button_encender_motor_B.connect("clicked", self.run_motor) - #self.button_encender_motor_C.connect("clicked", self.run_motor) - - #self.button_detener_motor_A.connect("clicked", self.stop_motor) - #self.button_detener_motor_B.connect("clicked", self.stop_motor) - #self.button_detener_motor_C.connect("clicked", self.stop_motor) - - #motor = gtk.HBox() - #motor.pack_start(self.button_encender_motor_A, True, True, ) - #motor.pack_start(self.button_detener_motor_A, True, True, 0) - #self.base_box.pack_start(motor, True, True, 0) - - #motor = gtk.HBox(0) - #motor.pack_start(self.button_encender_motor_B, True, True, ) - #motor.pack_start(self.button_detener_motor_B, True, True, 0) - #self.base_box.pack_start(motor, True, True, 0) - - #motor = gtk.HBox(0) - #motor.pack_start(self.button_encender_motor_C, True, True, ) - #motor.pack_start(self.button_detener_motor_C, True, True, 0) - #self.base_box.pack_start(motor, True, True, 0) + + vbox = gtk.VBox() + run_button = gtk.Button("Encender") + run_button.show() + run_button.connect_object("clicked", self.run_motor, combobox) + vbox.pack_start(run_button) + stop_button = gtk.Button("Apagar") + stop_button.show() + stop_button.connect_object("clicked", self.stop_motor, combobox) + vbox.pack_start(stop_button) + vbox.show() + num += 1 + + canvas.pack_start(vbox, True, True) self.set_canvas(canvas) - def run_motor(self, num): - if num == 0: + def run_motor(self, combobox): + if combobox.get_active() == 0: self.robot.run_motor("A") - elif num == 1: + elif combobox.get_active() == 1: self.robot.run_motor("B") - elif num == 2: + elif combobox.get_active() == 2: self.robot.run_motor("C") - def stop_motor(self, num): - if num == 0: + def stop_motor(self, combobox): + if combobox.get_active() == 0: self.robot.stop_motor("A") - elif num == 1: + elif combobox.get_active() == 1: self.robot.stop_motor("B") - elif num == 2: + elif combobox.get_active() == 2: self.robot.stop_motor("C") def delete_event(self, widget, event): -- cgit v0.9.1