Changeset 582

Timestamp:

09/13/05 17:11:49 (8 years ago)

Author:

depriest

Message:

Updated readme and fixed more bugs in GUI

Location:

WaveDev/trunk/WaveDev

Files:

• README.txt (modified) (1 diff)
• gui/ComponentFrame.py (modified) (8 diffs)
• gui/ConnectDialog.py (modified) (4 diffs)
• gui/MainFrame.py (modified) (2 diffs)
• gui/PortDialog.py (modified) (2 diffs)

WaveDev/trunk/WaveDev/README.txt

@@ -86 +86 @@
 4. The waveform is now ready to be populated. Exit the Waveform Developer
 
-5. To create a functional waveform, the start() function in AssemblyController and pushPacket()
-   function in other components must be completed.
+5. To create a functional waveform, the start() function in AssemblyController and pushPacket() function in other components must be completed.
+
+6. To build the waveform:
+   >> cd <output directory from 3>
+   >> ./reconf
+   >> ./configure
+   >> make
+
+7. To run:
+  - start the naming service
+  - start the event service
+  - run waveform_manager: >> ./waveform_manager
+  - run your waveform:    >> ./<waveform_name>
+
+NOTES:
+1) The edit feature in the GUI is not functional yet.
+2) You can add ports to a component, but it will not affect any of the
+   generated code (again, "yet")

WaveDev/trunk/WaveDev/gui/ComponentFrame.py

@@ -9 +9 @@
     return CompFrame(parent)
 
-[wxID_COMPFRAME, wxID_COMPFRAMEADDPORTBTN, wxID_COMPFRAMEBUTTON2, 
- wxID_COMPFRAMEBUTTON3, wxID_COMPFRAMEBUTTON4, wxID_COMPFRAMECLOSEBTN, 
- wxID_COMPFRAMEGRID1, wxID_COMPFRAMENAMETEXT, wxID_COMPFRAMEPORTBOX, 
+[wxID_COMPFRAME, wxID_COMPFRAMEADDPORTBTN, wxID_COMPFRAMEBUTTON3, 
+ wxID_COMPFRAMEBUTTON4, wxID_COMPFRAMECLOSEBTN, wxID_COMPFRAMEGRID1, 
+ wxID_COMPFRAMENAMETEXT, wxID_COMPFRAMEPORTBOX, wxID_COMPFRAMEREMOVEBTN, 
  wxID_COMPFRAMESTATICTEXT1, wxID_COMPFRAMESTATICTEXT2, 
  wxID_COMPFRAMESTATUSBARCOMPONENT, 
@@ -96 +96 @@
               id=wxID_COMPFRAMEADDPORTBTN)
 
-        self.button2 = wx.Button(id=wxID_COMPFRAMEBUTTON2, label='Delete',
-              name='button2', parent=self, pos=wx.Point(280, 181),
-              size=wx.Size(85, 30), style=0)
+        self.RemoveBtn = wx.Button(id=wxID_COMPFRAMEREMOVEBTN, label='Remove',
+              name='RemoveBtn', parent=self, pos=wx.Point(280, 181),
+              size=wx.Size(85, 30), style=0)
+        self.RemoveBtn.Bind(wx.EVT_BUTTON, self.OnRemoveBtnButton,
+              id=wxID_COMPFRAMEREMOVEBTN)
 
         self.grid1 = wx.grid.Grid(id=wxID_COMPFRAMEGRID1, name='grid1',
@@ -105 +107 @@
         self.grid1.SetColLabelSize(20)
         self.grid1.SetRowLabelSize(52)
+        self.grid1.Enable(False)
 
         self.button3 = wx.Button(id=wxID_COMPFRAMEBUTTON3, label='Add Prop',
               name='button3', parent=self, pos=wx.Point(64, 296),
               size=wx.Size(85, 30), style=0)
+        self.button3.Enable(False)
 
         self.button4 = wx.Button(id=wxID_COMPFRAMEBUTTON4, label='Delete Prop',
               name='button4', parent=self, pos=wx.Point(192, 296),
               size=wx.Size(85, 30), style=0)
+        self.button4.Enable(False)
 
         self.staticText1 = wx.StaticText(id=wxID_COMPFRAMESTATICTEXT1,
@@ -127 +132 @@
 
         self.CloseBtn = wx.Button(id=wxID_COMPFRAMECLOSEBTN, label='Close',
-              name='CloseBtn', parent=self, pos=wx.Point(360, 256),
+              name='CloseBtn', parent=self, pos=wx.Point(360, 296),
               size=wx.Size(85, 30), style=0)
         self.CloseBtn.Bind(wx.EVT_BUTTON, self.OnCloseBtnButton,
@@ -136 +141 @@
         self.active_comp = parent.active_comp
         self._init_ctrls(parent)
+        self.grid1.CreateGrid(6,6)
+        self.grid1.SetColLabelValue(0,"Property")
+        self.grid1.SetColLabelValue(1,"Value")
+        self.grid1.SetColLabelValue(2,"Value2")
+        self.grid1.SetColLabelValue(3,"....")
+        self.grid1.SetColLabelValue(4,"....")
+        self.grid1.SetColLabelValue(5,"....")
 
     def OnListBox1Listbox(self, event):
@@ -163 +175 @@
             
         self.displayPorts()    
-        
-        #self.grid1.CreateGrid(6,6)
-        #self.grid1.SetColLabelValue(0,"Property")
-        #self.grid1.SetColLabelValue(1,"Value")
-        #self.grid1.SetColLabelValue(2,"Value2")
-        #self.grid1.SetColLabelValue(3,"....")
-        #self.grid1.SetColLabelValue(4,"....")
-        #self.grid1.SetColLabelValue(5,"....")
         event.Skip()
 
@@ -195 +199 @@
     
     def displayPorts(self):
+        self.PortBox.Clear()
         pnames = []
         for p in self.active_comp.ports:
@@ -200 +205 @@
         print pnames
         self.PortBox.InsertItems(pnames,0)
+
+    def OnButton2Button(self, event):
+        event.Skip()
+
+    def OnRemoveBtnButton(self, event):
+        sels = self.PortBox.GetSelections()
+        if len(sels) == 0:
+            dlg = wx.MessageDialog(self, '("Please select a port to remove!")',
+              'Error', wx.OK | wx.ICON_INFORMATION)
+            try:
+                dlg.ShowModal()
+            finally:
+                dlg.Destroy()
+            return
+        for x in sels:
+            temp = self.PortBox.GetString(x)
+            plist = [y.name for y in self.active_comp.ports]
+            ti = plist.index(temp)
+            del self.active_comp.ports[ti]
+            self.PortBox.Delete(x)
+            
+        self.displayPorts()
+        event.Skip()

WaveDev/trunk/WaveDev/gui/ConnectDialog.py

@@ -7 +7 @@
     return ConnectDialog(parent)
 
-[wxID_CONNECTDIALOG, wxID_CONNECTDIALOGCONLABEL, wxID_CONNECTDIALOGCONNECTBTN, 
- wxID_CONNECTDIALOGLISTBOX1, 
-] = [wx.NewId() for _init_ctrls in range(4)]
+[wxID_CONNECTDIALOG, wxID_CONNECTDIALOGCANCELBTN, wxID_CONNECTDIALOGCONLABEL, 
+ wxID_CONNECTDIALOGCONNECTBTN, wxID_CONNECTDIALOGLISTBOX1, 
+] = [wx.NewId() for _init_ctrls in range(5)]
 
 class ConnectDialog(wx.Dialog):
@@ -25 +25 @@
         self.ConnectBtn = wx.Button(id=wxID_CONNECTDIALOGCONNECTBTN,
               label='Connect', name='ConnectBtn', parent=self, pos=wx.Point(273,
-              295), size=wx.Size(85, 30), style=0)
+              218), size=wx.Size(85, 30), style=0)
         self.ConnectBtn.Bind(wx.EVT_BUTTON, self.OnConnectBtnButton,
               id=wxID_CONNECTDIALOGCONNECTBTN)
@@ -32 +32 @@
               label='None', name='ConLabel', parent=self, pos=wx.Point(29, 21),
               size=wx.Size(31, 17), style=0)
+
+        self.CancelBtn = wx.Button(id=wxID_CONNECTDIALOGCANCELBTN,
+              label='Cancel', name='CancelBtn', parent=self, pos=wx.Point(273,
+              295), size=wx.Size(85, 30), style=0)
+        self.CancelBtn.Bind(wx.EVT_BUTTON, self.OnCancelBtnButton,
+              id=wxID_CONNECTDIALOGCANCELBTN)
 
     def __init__(self, parent):
@@ -61 +67 @@
         self.Close()
         event.Skip()
+
+    def OnCancelBtnButton(self, event):
+        self.Close()
+        event.Skip()

WaveDev/trunk/WaveDev/gui/MainFrame.py

@@ -115 +115 @@
               name='EditBtn', parent=self, pos=wx.Point(336, 174),
               size=wx.Size(85, 32), style=0)
+        self.EditBtn.Enable(False)
         self.EditBtn.Bind(wx.EVT_BUTTON, self.OnEditBtnButton,
               id=wxID_FRAME1EDITBTN)
@@ -137 +138 @@
               name='button5', parent=self, pos=wx.Point(336, 290),
               size=wx.Size(85, 30), style=0)
+        self.button5.Enable(False)
 
         self.treeBox = wx.TreeCtrl(id=wxID_FRAME1TREEBOX, name='treeBox',

WaveDev/trunk/WaveDev/gui/PortDialog.py

@@ -27 +27 @@
               name='choice1', parent=self, pos=wx.Point(192, 88),
               size=wx.Size(80, 27), style=0)
+        self.choice1.Enable(False)
 
         self.choice2 = wx.Choice(choices=[], id=wxID_PORTDIALOGCHOICE2,
               name='choice2', parent=self, pos=wx.Point(72, 88),
               size=wx.Size(112, 27), style=0)
+        self.choice2.Enable(False)
 
         self.OkBtn = wx.Button(id=wxID_PORTDIALOGOKBTN, label='Ok',
@@ -48 +50 @@
     def OnOkBtnButton(self, event):
         tempLn = self.portNameBox.GetLineText(0)
+        if tempLn == '':
+            dlg = wx.MessageDialog(self, '("Please enter a name first!")',
+              'Error', wx.OK | wx.ICON_INFORMATION)
+            try:
+                dlg.ShowModal()
+            finally:
+                dlg.Destroy()
+            return
         tempP = ComponentClass.Port(tempLn)
         self.active_comp.ports.append(tempP)