Changeset 4194

Timestamp:

06/18/07 16:03:14 (6 years ago)

Author:

DrewCormier

Message:

starting to restructure code so that each source-type method has the same API

Location:

experimental/AWG/trunk/AWG

Files:

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

experimental/AWG/trunk/AWG/AWG.py

@@ -28 +28 @@
         delimiter = ','
 
-        my_signal = sources.sources()    #instance of signals class
+        my_signal = sources.sources(self)    #instance of signals class
 
         self.signal_type = self.signal_type.lower()  #makes comparison case insesitive
@@ -58 +58 @@
     def __init__(self, parent, id, title, namespace, interface, component_name, port_name):
 
-        #TODO: get this from the sources class
-        tmp_sources_instance = sources.sources()
+        tmp_sources_instance = sources.sources(self)
         self.available_sources = tmp_sources_instance.get_sources_list()
 

experimental/AWG/trunk/AWG/sources.py

@@ -5 +5 @@
 
 class sources:
-    def __init__(self):
+    def __init__(self,parent):
+        self.parent = parent
         self.available_sources = ['file', 'sine', 'cosine', 'random', 'zeros']
         self.corresponding_methods = ['read_file','gen_sine', 'gen_cosine', 'gen_random_data', 'gen_zeros']
@@ -13 +14 @@
         return self.available_sources
 
+
+    def gen_signal(self):
+        pass
 
     def read_file(self, file_name, delimiter):