Changeset 4204

Timestamp:

06/19/07 23:22:24 (6 years ago)

Author:

cdietric

Message:

Now reads and displays component description from SPD file (Component Editor and OWD via right click on available component. Optional display of component Doxygen manual (pdf or html) is next

Location:

WaveDev/trunk/WaveDev/wavedev

Files:

• ComponentClass.py (modified) (2 diffs)
• ComponentFrame.py (modified) (1 diff)
• MainFrame.py (modified) (4 diffs)
• importResource.py (modified) (1 diff)

WaveDev/trunk/WaveDev/wavedev/ComponentClass.py

@@ -24 +24 @@
 # Component Class
 class Component:
-  def __init__(self, name="",AC=False,type="resource",generate=True):
+  def __init__(self, name="",AC=False,type="resource",description="",generate=True):
     self.name = name        # this refers to the instance name
     self.baseName = name    # this refers to the component that the instance is based on
@@ -41 +41 @@
     self.xmlName = name     #if imported from component library - this may change
     self.properties = []
+    self.description = description
   
   def __getitem__(self,i):

WaveDev/trunk/WaveDev/wavedev/ComponentFrame.py

@@ -380 +380 @@
 
             self.compDescrBox.Clear()
-            # write description from spd file here: self.compDescrBox.WriteText(self.active_comp.description)
+            self.compDescrBox.WriteText(self.active_comp.description)
             
             if self.active_comp.type != 'resource':

WaveDev/trunk/WaveDev/wavedev/MainFrame.py

@@ -271 +271 @@
         self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupAddMenu,
               id=wxID_FRAME1RESOURCEBOXPOPUPADD)
-        self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupAddMenu,
+        self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupGetDescr,
               id=wxID_FRAME1RESOURCEBOXPOPUPGETDESCR)
-        self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupAddMenu,
+        self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupGetDoxygenRefMan,
               id=wxID_FRAME1RESOURCEBOXPOPUPGETDOXYGENREFMAN)
         self.Bind(wx.EVT_MENU, self.OnResourceBoxPopupAdddevMenu,
@@ -467 +467 @@
         self.savePlatformPath = None
         self.saveProjectPath = None
-        
+        self.description = None
         
 ################################################################################
@@ -1565 +1565 @@
                 x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPADDNODE)
                 x.Enable(False)           
-                x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPGETDESCR)
-                x.Enable(False)
-                x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPGETDOXYGENREFMAN)
-                x.Enable(False)
+                #x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPGETDESCR)
+                #x.Enable(False)
+                #x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPGETDOXYGENREFMAN)
+                #x.Enable(False)
             elif tmpRes.type == 'node':
                 x = self.resourceBoxPopup.FindItemById(wxID_FRAME1RESOURCEBOXPOPUPADDDEV)
@@ -1660 +1660 @@
         self.resourceBox.Unselect()
         event.Skip()
+
+    def OnResourceBoxPopupGetDescr(self, event):
+        sn = self.resourceBox.GetSelection()
+        tmpRes =  self.resourceBox.GetPyData(sn)
+        self.compDescrBox.Clear()
+        self.compDescrBox.WriteText(tmpRes.name + ":  " + tmpRes.description)
+
+    def OnResourceBoxPopupGetDoxygenRefMan(self, event):
+        errorMsg(self,"Doxygen Ref Man not implemented yet")
 
     def OnResourceBoxPopupAddnodeMenu(self, event):

WaveDev/trunk/WaveDev/wavedev/importResource.py

@@ -48 +48 @@
         return None
     
+    doc_spd = amara.parse(stripDoctype(spdPath))
+    if not hasattr(doc_spd.softpkg.implementation, 'description'):
+        #errorMsg(parent,"No description found in " + spdPath)
+        Rdescription='Description unavailable'
+    else:
+        Rdescription=str(doc_spd.softpkg.implementation.description)
+        #errorMsg(parent,Rdescription)
+    
     #Instantiate a new component of the appropriate type
     if doc_scd.softwarecomponent.componenttype == u'resource':
-        newComp = CC.Component(name=Rname,type='resource')
+        newComp = CC.Component(name=Rname,type='resource',description=Rdescription)
     elif doc_scd.softwarecomponent.componenttype == u'executabledevice':
-        newComp = CC.Component(name=Rname,type='executabledevice')
+        newComp = CC.Component(name=Rname,type='executabledevice',description=Rdescription)
     elif doc_scd.softwarecomponent.componenttype == u'loadabledevice':
-        newComp = CC.Component(name=Rname,type='loadabledevice')
+        newComp = CC.Component(name=Rname,type='loadabledevice',description=Rdescription)
     elif doc_scd.softwarecomponent.componenttype == u'device':
-        newComp = CC.Component(name=Rname,type='device')
+        newComp = CC.Component(name=Rname,type='device',description=Rdescription)
     else:
         errorMsg(parent,"Can't identify resource type for: " + Rname)