Se elimina dependencia de dispatcher y se implementa el recibir.

[z.facultad/66.09/etherled.git] / cliente / cetherled.py

diff --git a/cliente/cetherled.py b/cliente/cetherled.py
index 936d9b7ee4da43a4556596fba1de5223d4a1c762..58d9aabf4e68fe7a05463c0f28bc080da4caf76c 100755 (executable)
--- a/cliente/cetherled.py
+++ b/cliente/cetherled.py
@@ -28,7 +28,7 @@ import os
 import gtk
 from simplegladeapp import SimpleGladeApp
 from simplegladeapp import bindtextdomain
-from dispatcher import Dispatcher
+#from dispatcher import Dispatcher
 from led import Led
 import etherled
 
@@ -63,6 +63,9 @@ class MainWindow(SimpleGladeApp):
     def on_btn_enviar_clicked(self, widget, *args):
         self.device.matrix = self.leds2matrix()
 
+    def on_btn_recibir_clicked(self, widget, *args):
+        self.device.matrix = self.leds2matrix()
+
     def on_main_window_delete_event(self, widget, event, *args):
         self.quit()
 
@@ -71,10 +74,13 @@ class MainWindow(SimpleGladeApp):
         for row in xrange(16):
             for col in xrange(16):
                 matrix[row,col] = int(self.tabla[row,col].prendido)
-                #print int(self.tabla[row,col].prendido),
-                print (row,col),
-            print
-        print
+        etherled.protocol._print_matrix(matrix)
+        return matrix
+
+    def matrix2leds(self, matrix):
+        for row in xrange(16):
+            for col in xrange(16):
+                self.tabla[row,col].prendido = matrix[row,col]
         etherled.protocol._print_matrix(matrix)
         return matrix