Changeset 7709

Timestamp:

05/31/08 19:22:37 (5 years ago)

Author:

stedwar2

Message:

Redesigned the wavedev.cfg parsing code to be in a separate
module and to allow overrides from Eclipse. Removed extraneous
dependencies on wavedev.cfg parsing.

Location:

ossiedev/branches/jsnyder/ComponentProject

Files:

• PythonSrc/MainFrameGlue.py (modified) (10 diffs)
• WaveDev/wavedev/XML_gen/application_gen.py (modified) (2 diffs)
• WaveDev/wavedev/XML_gen/component_gen.py (modified) (1 diff)
• WaveDev/wavedev/cfg.py (added)

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

@@ -38 +38 @@
 import string
 import ComponentClass as CC
-
+import cfg
 
 class MainFrameTreeNode:
@@ -67 +67 @@
         self.stdIdlPath = "/usr/local/include/standardinterfaces/"
         self.customIdlPath = "/usr/local/include/custominterfaces/"
+        self.Available_Ints = []
 
 
@@ -161 +162 @@
 
 
-    def setOssieInstallPath(self, path):
-        self.installPath = self.pathWithSlash(path)
+    def pathWithoutSlash(self, path):
+        length = len(path)
+        if length > 0 and path[length - 1] == '/':
+            path = path[0:length - 1]
+        return path
 
 
@@ -181 +185 @@
     def setOssieInstallPath(self, path):
         self.installPath = self.pathWithSlash(path)
+        cfg.overrideCfgValue('installpath', self.pathWithoutSlash(path))
 
 
@@ -187 +192 @@
 
 
-    def setIncludePath(self, newOssieIncludePath):
-        self.ossieIncludePath = newOssieIncludePath
-
-
-    def setStandardIdlPath(self, newStdIdlPath):
-        self.stdIdlPath = newStdIdlPath
-
-
-    def setCstmIdlPath(self, newCustomIdlPath):
-        self.customIdlPath = newCustomIdlPath
+    def setIncludePath(self, path):
+        self.ossieIncludePath = path
+        cfg.setCfgValueIfNecessary('ossieincludepath',
+                                   self.pathWithoutSlash(path))
+
+
+    def setStandardIdlPath(self, path):
+        self.stdIdlPath = path
+        cfg.setCfgValueIfNecessary('stdidlpath', self.pathWithoutSlash(path))
+
+
+    def setCstmIdlPath(self, path):
+        self.customIdlPath = path
 
 
@@ -326 +334 @@
 
     def importStandardIDL(self):
-        print "0"
         '''Imports IDL from cf, standardinterfaces, and custominterfaces'''
+
+        # If we've computed this value before, just reuse it
+        if len(self.Available_Ints) > 0:
+            return MainFrameTreeNode('Interfaces', self.Available_Ints)
+
         #temporarily change self.parent to self so this works
         #normally this function looks at the MainFrame - but not in standalone
-        print "1"
-        self.Available_Ints = []
         self.parent = self
         changedParent = True
@@ -343 +353 @@
             tmpstr += self.ossieIncludePath
             errorMsg(self,tmpstr)
-        print 2
+
         # for each file in the standardinterfaces directory, import all available
         # interfaces (skip standardIdl files)
@@ -354 +364 @@
                         # as a result of customInterfaces not being found
             custom_idl_list = []
-        print 3
+
         if len(standard_idl_list) <= 0:
             tmpstr = "Can't find any files in: " + self.stdIdlPath
@@ -378 +388 @@
                 if t not in self.Available_Ints:
                     self.Available_Ints.append(t)
-        print 4
+
         # import custom interfaces
         for custom_idl_file in custom_idl_list:
@@ -398 +408 @@
                         self.timing_port = CC.Port('send_timing_report', self.timing_interface, "Uses", "data")
 #                    print "CF.py: " + t.name + "  " + str(len(t.operations))
-        print 5
         if changedParent == True:
             self.parent = None
         print self.Available_Ints
-        return MainFrameTreeNode("Interfaces", self.Available_Ints)
+        return MainFrameTreeNode('Interfaces', self.Available_Ints)
 
 

ossiedev/branches/jsnyder/ComponentProject/WaveDev/wavedev/XML_gen/application_gen.py

@@ -30 +30 @@
 
 
-try:
-    doc_cfg = xml.dom.minidom.parse('../wavedev.cfg')
-except:   #if  not being called from wavedev, try looking for the file
-    doc_cfg = xml.dom.minidom.parse('/sdr/tools/WaveDev/wavedev.cfg')
-
-
-version = str(doc_cfg.getElementsByTagName("version")[0].firstChild.data)
-
-#vtext = open('../version.txt')
-#version = unicode(vtext.readline())
-#version = version.strip('\n')
-commentLine = u'<!--Created with OSSIE WaveDev ' + version \
-    + u'-->\n<!--Powered by Python-->\n'
-
-
 xmlpath = u'/xml/'
 #######################################################################
@@ -198 +183 @@
             devFlag = False
 
-            print "Processing connection : "
-            print "  component name  : " + cname
-            print "  local comp type : " + n.type
-            print "  local port type : " + i.localPort.type
-            print "  local port name : " + unicode(i.localPort.name)
-            print "  remote comp type: " + i.remoteComp.type
-            print "  remote port type: " + i.remotePort.type
-            print "  remote port name: " + unicode(i.remotePort.name)
+#            print "Processing connection : "
+#            print "  component name  : " + cname
+#            print "  local comp type : " + n.type
+#            print "  local port type : " + i.localPort.type
+#            print "  local port name : " + unicode(i.localPort.name)
+#            print "  remote comp type: " + i.remoteComp.type
+#            print "  remote port type: " + i.remotePort.type
+#            print "  remote port name: " + unicode(i.remotePort.name)
 
             if i.localPort.type == 'Uses':

ossiedev/branches/jsnyder/ComponentProject/WaveDev/wavedev/XML_gen/component_gen.py

@@ -26 +26 @@
 from WaveDev.wavedev.uuidgen import uuidgen
 
-#import xmlBeautify
-
-
-try:
-   doc_cfg = xml.dom.minidom.parse('../wavedev.cfg')
-except:  #if not being called from wavedev, try looking for wavedev
-   doc_cfg = xml.dom.minidom.parse('/sdr/tools/WaveDev/wavedev.cfg')
-
-version = str(doc_cfg.getElementsByTagName("version")[0].firstChild.data)
-
-#vtext = open('../version.txt')
-#version = unicode(vtext.readline())
-#version = version.strip('\n')
-commentLine = u'<!--Created with OSSIE WaveDev ' + version \
-    + u'-->\n<!--Powered by Python-->\n'
 
 xmlpath = u'xml/'