Changeset 7286 for ossiedev/branches/jsnyder/ComponentProject/PythonSrc/MainFrameGlue.py

Timestamp:

04/26/08 16:29:38 (5 years ago)

Author:

stedwar2

Message:

Added waveform loading. Fixed invalid uses of self.active_wave. Changed import of Waveform.

Files:

• ossiedev/branches/jsnyder/ComponentProject/PythonSrc/MainFrameGlue.py (modified) (7 diffs)

ossiedev/branches/jsnyder/ComponentProject/PythonSrc/MainFrameGlue.py

@@ -2 +2 @@
 import wavedev.importResource
 import wavedev.importNode
-import wavedev.WaveformClass
+from wavedev.WaveformClass import Waveform
 import wavedev.PlatformClass
 import wavedev.ComponentClass
@@ -28 +28 @@
 class MainFrameGlue(MainFrame):
     def __init__(self):
-        self.active_waveform = wavedev.WaveformClass.Waveform()
+        self.active_waveform = Waveform()
         self.active_platform = wavedev.PlatformClass.Platform()
         self.installPath = "/sdr/"
@@ -128 +128 @@
 
     def generateTestWaveform(self):
-        self.active_wave = wavedev.WaveformClass.Waveform()
+        self.active_waveform = Waveform()
         int1 = wavedev.ComponentClass.Interface('complexShort')
         op1 = wavedev.ComponentClass.Operation('pushPacket','void')
@@ -140 +140 @@
         p2 = wavedev.ComponentClass.Port('outPortTx1',copy.deepcopy(int1),'Uses')
         t2.ports.append(p1); t2.ports.append(p2)
-        self.active_wave.components.append(t2)
+        self.active_waveform.components.append(t2)
 
         t3 = wavedev.ComponentClass.Component("Channel")
@@ -150 +150 @@
         p6 = wavedev.ComponentClass.Port('outPortCh3',copy.deepcopy(int1),'Uses')
         t3.ports.extend([p1,p2,p3,p4,p5,p6])
-        self.active_wave.components.append(t3)
+        self.active_waveform.components.append(t3)
 
         t4 = wavedev.ComponentClass.Component("Receiver")
@@ -156 +156 @@
         p2 = wavedev.ComponentClass.Port('outPortRx1',copy.deepcopy(int1),'Uses')
         t4.ports.append(p1); t4.ports.append(p2)
-        self.active_wave.components.append(t4)
+        self.active_waveform.components.append(t4)
 
         temp_dev = wavedev.ComponentClass.Component("GPP")
-        self.active_wave.devices.append(temp_dev)
-        return [MainFrameTreeNode("Sample Waveform", self.active_wave)]
+        self.active_waveform.devices.append(temp_dev)
+        return [MainFrameTreeNode("Sample Waveform", self.active_waveform)]
 
     def displayDoxygen(self, referenceMaterials):
@@ -195 +195 @@
         f = open(saveProjectPath,'w')
         cPickle.dump(('project',self.active_waveform,self.active_platform),f)
+
+
+    def loadProject(self, projectPath):
+        f = open(projectPath,'r')
+        tmpObject = cPickle.load(f)
+        if tmpObject[0] == 'waveform':
+            self.active_waveform = tmpObject[1]
+        elif tmpObject[0] == 'platform':
+            self.active_platform =  tmpObject[1]
+        elif tmpObject[0] == 'project':
+            self.active_waveform = tmpObject[1]
+            self.active_platform = tmpObject[2]