Changeset 4195

Timestamp:

06/18/07 16:24:56 (6 years ago)

Author:

DrewCormier

Message:

standardizing method API's so that the user does not have to change code in AWG.py for basic use

Location:

experimental/AWG/trunk/AWG

Files:

• AWG.py (modified) (2 diffs)
• sources.py (modified) (6 diffs)

experimental/AWG/trunk/AWG/AWG.py

@@ -19 +19 @@
         self.parent = parent
 
-    def get_signal(self, signal_type, file_name):
+    def get_signal(self, signal_index, file_name):
         #signal I want is hard-coded for now
-        self.signal_type = signal_type
+        self.signal_index = signal_index
         self.signal_len = 8192   #length of packet
         self.frequency = 5   #cycles per packet
-        rand_type = 'random'
+        self.rand_type = 'random'
         self.file_name = file_name
-        delimiter = ','
+        self.delimiter = ','
 
         my_signal = sources.sources(self)    #instance of signals class
-
-        self.signal_type = self.signal_type.lower()  #makes comparison case insesitive
-        if self.signal_type == 'sine':
-            self.the_signal = my_signal.gen_sine(self.frequency, self.signal_len)
-        elif self.signal_type == 'cosine':
-            self.the_signal = my_signal.gen_cosine(self.frequency, self.signal_len)
-        elif self.signal_type == 'random':
-            self.the_signal = my_signal.gen_random_data(self.signal_len, rand_type)
-        elif self.signal_type == 'file':
-            self.the_signal = my_signal.read_file(self.file_name, delimiter) 
-        elif self.signal_type == 'zeros':
-            self.the_signal = my_signal.gen_zeros(self.signal_len)
-        else:
-            print "signals other than sine,cosine, rand, zeros, and readfile are not supported yet in _get_signal"
+        self.the_signal = my_signal.gen_signal()
 
         return self.the_signal              
@@ -196 +183 @@
         self.q_file_name = self.qFileNameEditor.GetLineText(0)
         AWG_instance = AWG(self)
-        i_source_selected = self.iSourceChoice.GetStringSelection()
-        q_source_selected = self.qSourceChoice.GetStringSelection()
+        i_source_selected = self.iSourceChoice.GetSelection()
+        q_source_selected = self.qSourceChoice.GetSelection()
         self.I = AWG_instance.get_signal(i_source_selected, self.i_file_name)
         self.Q = AWG_instance.get_signal(q_source_selected, self.q_file_name)

experimental/AWG/trunk/AWG/sources.py

@@ -8 +8 @@
         self.parent = parent
         self.available_sources = ['file', 'sine', 'cosine', 'random', 'zeros']
+        #IMPORTANT: corresponding_methods must be in the same order as the available_sources
         self.corresponding_methods = ['read_file','gen_sine', 'gen_cosine', 'gen_random_data', 'gen_zeros']
 
@@ -16 +17 @@
 
     def gen_signal(self):
-        pass
+        eval_string = "self." + self.corresponding_methods[parent.signal_index] + "()"
+        return eval(eval_string)  #return the signal generated by the corresponding method
 
-    def read_file(self, file_name, delimiter):
-
+    def read_file(self):
+        
         try:
-            my_file = open(file_name, 'r')
+            my_file = open(self.parent.file_name, 'r')
         except IOError:
-            print "no file named " + file_name
+            print "no file named " + self.parent.file_name
             return []  #return an empty packet
 
@@ -33 +35 @@
         data_from_file.strip(']')   #]'s will not be tollerated
 
-        data_from_file = data_from_file.split(delimiter)  #break string into a list
+        data_from_file = data_from_file.split(self.parent.delimiter)  #break string into a list
 
         return data_from_file
 
 
-    def gen_sine(self, freq, len):
+    def gen_sine(self):
         '''freq is frequency in cycles per packet.  len is the length of the packet.  type is the data type to return (e.g., "float", "short", "int")'''
 
         count = 0
         sine = []
-        while count < len:
-            sine.append(math.sin(freq*2*math.pi*count/len))
+        while count < self.parent.len:
+            sine.append(math.sin(self.parent.freq*2*math.pi*count/self.parent.len))
             count = count + 1
 
@@ -50 +52 @@
 
 
-    def gen_cosine(self, freq, len):
+    def gen_cosine(self):
         '''freq is frequency in cycles per packet.  len is the length of the packet.  type is the data type to return (e.g., "float", "short", "int")'''
 
         count = 0
         cosine = []
-        while count < len:
-            cosine.append(math.cos(freq*2*math.pi*count/len))
+        while count < self.parent.len:
+            cosine.append(math.cos(self.parent.freq*2*math.pi*count/self.parent.len))
             count = count + 1
 
@@ -63 +65 @@
 
 
-    def gen_random_data(self, len, rand_type):
+    def gen_random_data(self):
         '''the rand_type variable defines which function call to use in the random module'''
 
         data = []
-        rand_type = rand_type.lower()  #makes comparison case insensitive
-        if rand_type == 'random':
+        tmp_rand_type = self.parent.rand_type.lower()  #makes comparison case insensitive
+        if tmp_rand_type == 'random':
             count = 0
-            while count < len:
+            while count < self.parent.len:
                 data.append(random.random())
                 count = count + 1
-        elif rand_type == 'uniform':
+        elif tmp_rand_type == 'uniform':
             count = 0
-            while count < len:
+            while count < self.parent.len:
                 data.append(random.uniform())
                 count = count + 1
@@ -83 +85 @@
         return data
                 
-    def gen_zeros(self, len):
+    def gen_zeros(self):
         '''returns a list of zeros'''
         data = []
-        for n in range(len):
+        for n in range(self.parent.len):
             data.append(0)
         return data