# SVN changeset patch
# User jsalyrosas
# Date 2013-05-15 15:16:53.525989
# Revision 165

- Las carpetas se han convertido en paquetes de Python para poder importar adecuadamente las clases.
- Se modificaron las clases sendFile y changeBeam:
- sendFile: recibe como parametro un archivo con ruta absoluta,
- changeBeam: recibe como parametro una cadena con el numero del beam(patron) a configurar.
- Se modifico la funcion sendFile de la clase sendFile que envia el nombre del archivo y su contenido. Actualmente valida que el archivo exista y que el nombre del archivo sea la ruta absoluta del mismo.

Index: trunk/absroot/source/abspy/abscontrol/__init__.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/__init__.py b/trunk/absroot/source/abspy/abscontrol/__init__.py
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/absroot/source/abspy/abscontrol/__init__.py	(revision 165)
Index: trunk/absroot/source/abspy/abscontrol/client3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/client3.py b/trunk/absroot/source/abspy/abscontrol/client3.py
--- a/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 164)
+++ b/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 165)
@@ -1,6 +1,7 @@
-import library3 
+import library3
+import os.path
 
-class ABSClient:
+class ABSClient(object):
     
     def __init__(self,ipSource="192.168.1.117", iDSource="Clnt_01", ipDestino="192.168.1.117", iDDestino = "CeCnMod", portDestino=7000):
         
@@ -15,7 +16,7 @@
     def createObjects(self):
         
         self.commObj = library3.TCPComm(self.ipSource, self.iDSource, self.ipDestino, self.iDDestino, self.portDestino)
-#        self.wFiles = library3.FilesStuff()
+        #self.wFiles = library3.FilesStuff()
         
     def __ConnectionWithCentralControl(self, cmd, data):
 
@@ -60,7 +61,9 @@
         fobj.close()        
         tmp = "".join(listData)
         #Adding filename to the begining of the data
-        data = filename + '\n' + tmp
+        newfilename = os.path.split(filename)[1]
+        #data = filename + '\n' + tmp
+        data = newfilename + '\n' + tmp
         return data
         
         
Index: trunk/absroot/source/abspy/abscontrol/library3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/library3.py b/trunk/absroot/source/abspy/abscontrol/library3.py
--- a/trunk/absroot/source/abspy/abscontrol/library3.py	(revision 164)
+++ b/trunk/absroot/source/abspy/abscontrol/library3.py	(revision 165)
@@ -278,7 +278,7 @@
                         return nexp
         fichero1.close()
     
-    def Paridad(numero):
+    def Paridad(self, numero):
         if numero%2==0: return 'par'
         elif numero%2==1: return 'impar'
         
Index: trunk/absroot/source/abspy/scripts/__init__.py
===================================================================
diff --git a/trunk/absroot/source/abspy/scripts/__init__.py b/trunk/absroot/source/abspy/scripts/__init__.py
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/absroot/source/abspy/scripts/__init__.py	(revision 165)
Index: trunk/absroot/source/abspy/scripts/changeBeam.py
===================================================================
diff --git a/trunk/absroot/source/abspy/scripts/changeBeam.py b/trunk/absroot/source/abspy/scripts/changeBeam.py
--- a/trunk/absroot/source/abspy/scripts/changeBeam.py	(revision 164)
+++ b/trunk/absroot/source/abspy/scripts/changeBeam.py	(revision 165)
@@ -1,13 +1,32 @@
-import file
-from client3 import *
-import sys
+import optparse, os, sys
 
-absObj = ABSClient(ipDestino="10.10.10.97")
-#absObj = ABSClient()
+pathFile = os.getcwd()
+sys.path.append(os.path.split(pathFile)[0])
 
-if len(sys.argv) == 2:
-#beam = "2"
-    beam = sys.argv[1]
-    absObj.changeBeam(beam)
-else:
-    print "Only one argument needed"
\ No newline at end of file
+from abscontrol.client3 import ABSClient
+
+class changeBeam(object):
+    
+    def __init__(self):
+        pass
+    
+    def execute(self, beam="0"):
+        absObj = ABSClient(ipDestino="10.10.10.97")
+        absObj.changeBeam(beam)
+        
+
+usage = "::::::::::::\n"
+        
+
+if __name__ == '__main__':
+    
+    parser = optparse.OptionParser(usage=usage)
+        
+    parser.add_option("-n", "--beam", dest="pattern", type="string", default="0", help="Number of Pattern")
+    
+    (options, args) = parser.parse_args()
+    
+    beam = options.pattern
+    
+    app = changeBeam()
+    app.execute(beam)
\ No newline at end of file
Index: trunk/absroot/source/abspy/scripts/sendFile.py
===================================================================
diff --git a/trunk/absroot/source/abspy/scripts/sendFile.py b/trunk/absroot/source/abspy/scripts/sendFile.py
--- a/trunk/absroot/source/abspy/scripts/sendFile.py	(revision 164)
+++ b/trunk/absroot/source/abspy/scripts/sendFile.py	(revision 165)
@@ -1,12 +1,36 @@
-import file
-from client3 import *
-import sys
 
-absObj = ABSClient(ipDestino="10.10.10.97")
-#absObj = ABSClient()
-if len(sys.argv) == 2:
-#filename = "experimento1.abs"
-    filename = sys.argv[1] 
-    absObj.sendFile(filename)
-else:
-    print "Only one argument needed"
\ No newline at end of file
+import optparse, os, sys
+
+pathFile = os.getcwd()
+sys.path.append(os.path.split(pathFile)[0])
+
+from abscontrol.client3 import ABSClient
+
+class sendFile(object):
+    
+    def __init__(self):
+        pass
+    
+    def execute(self, filename):
+        if os.path.exists(filename):
+            absObj = ABSClient(ipDestino="10.10.10.97")
+            absObj.sendFile(filename)
+            pass
+        else:
+            print "No file"
+
+usage = "::::::::::::\n"
+        
+
+if __name__ == '__main__':
+    
+    parser = optparse.OptionParser(usage=usage)
+        
+    parser.add_option("-f", "--filename", dest="filename", type="string", default="", help="Filename")
+    
+    (options, args) = parser.parse_args()
+    
+    filename = options.filename
+    
+    app = sendFile()
+    app.execute(filename)
\ No newline at end of file