Changeset 4225

Timestamp:

06/25/07 16:48:31 (6 years ago)

Author:

cdietric

Message:

left click on component shows description, left double click adds component to waveform

Files:

• WaveDev/trunk/WaveDev/wavedev/MainFrame.py (modified) (4 diffs)

WaveDev/trunk/WaveDev/wavedev/MainFrame.py

@@ -381 +381 @@
         self.resourceBox.SetBestFittingSize(wx.Size(175, 396))
         self.resourceBox.Bind(wx.EVT_RIGHT_UP, self.OnResourceBoxRightUp)
-
+        self.resourceBox.Bind(wx.EVT_LEFT_UP, self.OnResourceBoxLeftUp)
+        self.resourceBox.Bind(wx.EVT_LEFT_DCLICK, self.OnResourceBoxLeftDoubleClick)
         self.staticText1 = wx.StaticText(id=wxID_FRAME1STATICTEXT1,
               label=u'Available Resources', name='staticText1', parent=self,
@@ -1503 +1504 @@
     def OnResourceBoxPopupAddMenu(self, event):
         sn = self.resourceBox.GetSelection()
-        tmpRes =  self.resourceBox.GetPyData(sn)
-        #if tmpRes.type != 'resource':
-        #    errorMsg(self,'You cannot add this type of resource')
-        #    return
-        
-        tmpBaseName = tmpRes.name
-        tmpCount = 1
-        for c in self.active_wave.components:
-            if c.baseName == tmpBaseName:
-                tmpCount += 1
-        
-        dlg = wx.TextEntryDialog(self, 'Please enter an instance name for this '\
-         + tmpRes.name + ' component.', 'Enter Name', tmpRes.name + str(tmpCount))
-        try:
-            returnCode = dlg.ShowModal()
-            if returnCode == wx.ID_OK:
-                newname = dlg.GetValue()
-                if len(newname) <= 0:
-                    errorMsg(self,'Invalid instance name.')
-                    dlg.Destroy()
-                    return
+        tmpRes = None
+        if (sn != self.resourceBox.GetRootItem() and self.resourceBox.GetItemParent(sn) != self.resourceBox.GetRootItem()):
+            # a child component (Component or Device)
+            tmpRes =  self.resourceBox.GetPyData(sn)
+            if tmpRes.type == 'resource':
+#            errorMsg(self,'You cannot add this type of resource to a waveform.  Right click to add to platform or node')
+ #           return
+                tmpBaseName = tmpRes.name
+                tmpCount = 1
+                for c in self.active_wave.components:
+                    if c.baseName == tmpBaseName:
+                        tmpCount += 1
+        
+                dlg = wx.TextEntryDialog(self, 'Please enter an instance name for this '\
+                + tmpRes.name + ' component.', 'Enter Name', tmpRes.name + str(tmpCount))
+                try:
+                    returnCode = dlg.ShowModal()
+                    if returnCode == wx.ID_OK:
+                        newname = dlg.GetValue()
+                        if len(newname) <= 0:
+                            errorMsg(self,'Invalid instance name.')
+                            dlg.Destroy()
+                            return
                 
-                for c in self.active_wave.components:
-                    if newname == c.name:
-                        errorMsg(self,'A component instance with this name already exists in your waveform.')
+                        for c in self.active_wave.components:
+                            if newname == c.name:
+                                errorMsg(self,'A component instance with this name already exists in your waveform.')
+                                dlg.Destroy()
+                                return
+                    elif returnCode == wx.ID_CANCEL:
                         dlg.Destroy()
                         return
-            elif returnCode == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-        finally:
-            dlg.Destroy()
-        
-        
-        newRes = copy.deepcopy(tmpRes)
-        newRes.name = newname    
-        newRes.baseName = tmpBaseName    
-        newRes.setUUID()    # this gives the component instance a unique id
+                finally:
+                    dlg.Destroy()
+        
+        
+                newRes = copy.deepcopy(tmpRes)
+                newRes.name = newname    
+                newRes.baseName = tmpBaseName    
+                newRes.setUUID()    # this gives the component instance a unique id
         # we do not set the newRes.file_uuid because it is the same for all components of this type
         
-        self.active_wave.components.append(newRes)
-        self.displayComps()
-        self.resourceBox.Unselect()
-        event.Skip()
+                self.active_wave.components.append(newRes)
+                self.displayComps()
+                self.resourceBox.Unselect()
+                event.Skip()
 
     def OnResourceBoxRightUp(self, event):
@@ -1599 +1602 @@
         event.Skip()
 
+    def OnResourceBoxLeftUp(self, event):
+        self.OnResourceBoxPopupGetDescr(event)
+
+    def OnResourceBoxLeftDoubleClick(self, event):
+        self.OnResourceBoxPopupAddMenu(event)
+
     def OnResourceBoxPopupAdddevMenu(self, event):
         sn = self.resourceBox.GetSelection()
@@ -1669 +1678 @@
 
     def OnResourceBoxPopupGetDescr(self, event):
+
         sn = self.resourceBox.GetSelection()
-        tmpRes =  self.resourceBox.GetPyData(sn)
-        self.compDescrBox.Clear()
-        self.compDescrBox.WriteText(tmpRes.name + ":  " + tmpRes.description)
+        tmpRes = None
+        if (sn != self.resourceBox.GetRootItem() and self.resourceBox.GetItemParent(sn) != self.resourceBox.GetRootItem()):
+            # a child component (Component or Device)
+            tmpRes =  self.resourceBox.GetPyData(sn)
+            if tmpRes.type == 'resource':
+                self.compDescrBox.Clear()
+                self.compDescrBox.WriteText(tmpRes.name + ":  " + tmpRes.description)
 
     def OnResourceBoxPopupGetDoxygenRefMan(self, event):