Changeset 9353

Timestamp:

05/14/09 12:41:47 (4 years ago)

Author:

deepanns

Message:

merging rev 9352(duplicate SAD/DAS file and PRF read error)

Location:

ossiedev/branches/0.7.x/tools/wavedash/src

Files:

• ComponentModel.py (modified) (6 diffs)
• WavedashController.py (modified) (5 diffs)

ossiedev/branches/0.7.x/tools/wavedash/src/ComponentModel.py

@@ -3 +3 @@
 from PropertyModel import Property
 from PropertyWidgets import WidgetContainer
+import sys
 
 class ComponentEvent:
@@ -33 +34 @@
     components' attributes and methods """
      
-    def __init__(self, parent, id, name, pos, spd_file, controller, visibility = True):
+    def __init__(self, parent, id, name, pos, spd_file, controller, visible = True):
         self.id = id
         self.parent = parent
@@ -40 +41 @@
         self.spdFile = str(spd_file)
         self.controller = controller
-        self.visibility = visibility
+        self.visible = visible
         self.properties = []
         self.buildProperties(controller)
@@ -60 +61 @@
     
     def hide(self):
-        self.visibility = False
+        self.visible = False
     
     def show(self):
-      self.visibility = True
+      self.visible = True
     
     def isVisible(self):
-        return self.visibility
+        return self.visible
     
     def getParent(self):
@@ -102 +103 @@
         if newPrpList is None:
             return
-        
-        
         for newprp in newPrpList:
             prp = self.findPropertyByID(newprp.id)
-            prp.setValue(newprp.value._v)
+            if (prp is not None):
+                prp.setValue(newprp.value._v)
             
-        
        # print newPrpList
         return
@@ -154 +153 @@
         prpList = prpNode.childNodes
         
-        
-        for prp in prpList:
-            if ( prp.nodeType != Node.ELEMENT_NODE ):
-                continue
-            #populate property fields and create the property object
+        try:
+            for prp in prpList:
+                if ( prp.nodeType != Node.ELEMENT_NODE ):
+                    continue
+                #populate property fields and create the property object
+                
+                id = prp.attributes['id'].value
+                name = prp.attributes['name'].value
+                type = (str(prp.tagName), str(prp.attributes['type'].value))
+                mode = prp.attributes['mode'].value
+                
+                desc = ''
+                value = None
+                range = (0,10000)
+                actionType = ''
+                kindType = ''
+                
+                #Iterate through children of <simple> tag to update desc, value and kindType
+                for child in prp.childNodes:
+                    if (child.nodeType == Node.ELEMENT_NODE):
+                        if (child.tagName == 'description'):
+                            desc = child.firstChild.data
+                        elif (child.tagName == 'value'):
+                            value = child.firstChild.data
+                        elif (child.tagName == 'kind'):
+                            kindType = child.attributes['kindtype'].value
+                        elif (child.tagName == 'range'):
+                            min = child.childNodes[1].firstChild.data
+                            max = child.childNodes[3].firstChild.data
+                            range = (min, max)
+                        elif (child.tagName == 'action'):
+                            actionType = child.attributes['type'].value
+                
+                
+                widget = controller.getDefaultWidget(type) 
+                newProp = Property(self, id, name, type, mode, desc, value, 
+                                   range, kindType, actionType, widget, prf_file)
+                self.properties.append(newProp)
+        except:
+            print "Error in reading PRF files for ", self.parent.getName(), "/", self.name
+            errorMsg = sys.exc_info()
+            print errorMsg
+            sys.exit(-1)
             
-            id = prp.attributes['id'].value
-            name = prp.attributes['name'].value
-            type = (str(prp.tagName), str(prp.attributes['type'].value))
-            mode = prp.attributes['mode'].value
-            
-            desc = ''
-            value = None
-            range = (0,0)
-            actionType = ''
-            kindType = ''
-            
-            #Iterate through children of <simple> tag to update desc, value and kindType
-            for child in prp.childNodes:
-                if (child.nodeType == Node.ELEMENT_NODE):
-                    if (child.tagName == 'description'):
-                        desc = child.firstChild.data
-                    elif (child.tagName == 'value'):
-                        value = child.firstChild.data
-                    elif (child.tagName == 'kind'):
-                        kindType = child.attributes['kindtype'].value
-                    elif (child.tagName == 'range'):
-                        min = child.childNodes[1].firstChild.data
-                        max = child.childNodes[3].firstChild.data
-                        range = (min, max)
-                    elif (child.tagName == 'action'):
-                        actionType = child.attributes['type'].value
-            
-            
-            widget = controller.getDefaultWidget(type) 
-            newProp = Property(self, id, name, type, mode, desc, value, 
-                               range, kindType, actionType, widget, prf_file)
-            self.properties.append(newProp)
-    
     def changePropWidget(self, property, newWidgetType):
         prpRef = self.findPropertyByName(property)

ossiedev/branches/0.7.x/tools/wavedash/src/WavedashController.py

@@ -21 +21 @@
 import os
 import wx
+import sys
 import xml.dom.minidom as minidom
 from WavedashModel import WavedashModel
@@ -50 +51 @@
         sadFileList = self.getFileList(SDR_WAVEFORMS_DIR, SAD_XML) #list holding sad files of all the system waveforms           
         dasFileList = self.getFileList(SDR_WAVEFORMS_DIR, DAS_XML)
+        if (sadFileList is None):
+            print "buildModel(): Error in reading sad files"
+            sys.exit(-1)
+        if (dasFileList is None):
+            print "buildModel(): Error in reading das files"
+            sys.exit(-1)
+             
         self.model.buildWaveforms(sadFileList, dasFileList)
         
@@ -97 +105 @@
                         abs_file_path = dirpath + "/" + fname
                
-                    fileList.append(abs_file_path)
+                    #do not add duplicate entries to the list
+                    if (abs_file_path not in fileList):
+                        fileList.append(abs_file_path)
                 
         if not fileFound:
@@ -124 +134 @@
                 instanceName = instance[instance.find("::") + 2 :]
                 self.model.addInstanceWaveform(wformName, instanceName, start)
-#                wformRef = self.model.getWaveform(instanceName, WaveformModel.INSTANCE_WAVEFORM)
-#                if start:
-#                    wformRef.isRunning = True
-#                else:
-#                    wformRef.isRunning = False
+
             else:
                 utils.showMessage("Unable to find applications", utils.NON_FATAL)
@@ -167 +173 @@
     ctrlr.CORBAutils.init_CORBA()
     ctrlr.buildModel()
-    
     ctrlr.MainLoop()
-    
         
 if __name__ == '__main__':