Index: experimental/display/trunk/display/display.py
===================================================================
--- experimental/display/trunk/display/display.py	(revision 3850)
+++ experimental/display/trunk/display/display.py	(revision 3851)
@@ -12,5 +12,5 @@
 # import wx.lib.buttons as buttons #for special wx buttons
 
-class write_to_file_short(standardInterfaces__POA.complexShort):
+class display_short(standardInterfaces__POA.complexShort):
     '''Writes I and Q data to 2 files'''
 
@@ -32,5 +32,5 @@
 
 #generate wx ids for my wx controls
-[wxID_MAINFRAME, wxID_SPLITTERWINDOW1, wxID_WRITEPACKETBTN, wxID_WRITEBUFFERBTN, wxID_IFILENAMEEDITOR, wxID_QFILENAMEEDITOR, wxID_IFILESTATICTEXT,wxID_QFILESTATICTEXT] = [wx.NewId() for _init_ctrls in range(8)]
+[wxID_MAINFRAME, wxID_SPLITTERWINDOW1] = [wx.NewId() for _init_ctrls in range(2)]
 
 
@@ -86,82 +86,7 @@
               True, True, True, True))
 
-        self.WritePacketBtn = wx.Button(id=wxID_WRITEPACKETBTN, label='Write Packet',
-              name='WritePacketBtn', parent=self.splitterWindow1, pos=wx.Point(155, 150),
-              size=wx.Size(165, 50))
-        self.WritePacketBtn.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, wx.BOLD, False))
-        self.WritePacketBtn.SetBackgroundColour("green")
-        self.WritePacketBtn.Bind(wx.EVT_BUTTON, self.OnWritePacketBtnButton,
-              id=wxID_WRITEPACKETBTN)
-
-        self.WriteBufferBtn = wx.Button(id=wxID_WRITEBUFFERBTN, label='Write BUFFER',
-              name='WriteBufferBtn', parent=self.splitterWindow1, pos=wx.Point(155, 210),
-              size=wx.Size(165, 50))
-        self.WriteBufferBtn.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, wx.BOLD, False))
-        self.WriteBufferBtn.SetBackgroundColour("green")
-        self.WriteBufferBtn.Bind(wx.EVT_BUTTON, self.OnWriteBufferBtnButton,
-              id=wxID_WRITEBUFFERBTN)
-
-        #####
-        ## if you want an image on the button
-        # button_bmp = wx.Image("../AWG/my_image.bmp", wx.BITMAP_TYPE_BMP).ConvertToBitmap()
-        # self.WritePacketBtn = buttons.GenBitmapTextButton(self.splitterWindow1,
-        #       wxID_WRITEPACKETBTN,button_bmp, 'Write Packet',
-        #       name='WritePacketBtn', pos=wx.Point(155, 250),
-        #       size=wx.Size(300, 100), style=0)
-        # self.WritePacketBtn.Bind(wx.EVT_BUTTON, self.OnWritePacketBtnButton,
-        #       id=wxID_WRITEPACKETBTN)
-        #####
-
-       
-        self.iFileNameEditor = wx.TextCtrl(id=wxID_IFILENAMEEDITOR,
-              name=u'iFileNameEditor', parent=self.splitterWindow1, pos=wx.Point(215, 50),
-              size=wx.Size(250, 30), style=0, value=u'')
-			  
-
-        self.qFileNameEditor = wx.TextCtrl(id=wxID_QFILENAMEEDITOR,
-              name=u'qFileNameEditor', parent=self.splitterWindow1, pos=wx.Point(215, 100),
-              size=wx.Size(250, 30), style=0, value=u'')
 
 
-        self.iFileStaticText = wx.StaticText(id=wxID_IFILESTATICTEXT,
-              label=u'I channel file:', name='qFileStaticText', parent=self.splitterWindow1,
-              pos=wx.Point(55, 50), size= wx.Size(100, 20), style=0)
-        self.iFileStaticText.SetFont(wx.Font(10,wx.SWISS,wx.NORMAL,wx.BOLD,True,u'Sans'))
-
-        self.qFileStaticText = wx.StaticText(id=wxID_QFILESTATICTEXT,
-              label=u'Q channel file:', name='qFileStaticText', parent=self.splitterWindow1,
-              pos=wx.Point(55, 100), size= wx.Size(100, 20), style=0)
-        self.qFileStaticText.SetFont(wx.Font(10,wx.SWISS,wx.NORMAL,wx.BOLD,True,u'Sans'))
-  
- 
-
-    def OnWritePacketBtnButton(self,event):
-        #get the file names from the file name editors in the GUI
-        self.i_file_name = self.iFileNameEditor.GetLineText(0)
-        self.q_file_name = self.qFileNameEditor.GetLineText(0)
-
-        #write the data out
-        open_file = open(self.i_file_name, 'w')   #open the file for writing
-        open_file.write(str(self.I_data))
-        open_file.close()
-
-        open_file = open(self.q_file_name, 'w')   #open the file for writing
-        open_file.write(str(self.Q_data))
-        open_file.close()
-
-    def OnWriteBufferBtnButton(self,event):
-        #get the file names from the file name editors in the GUI
-        self.i_file_name = self.iFileNameEditor.GetLineText(0)
-        self.q_file_name = self.qFileNameEditor.GetLineText(0)
-
-        #write the data out
-        open_file = open(self.i_file_name, 'w')   #open the file for writing
-        open_file.write(str(self.I_data))
-        open_file.close()
-
-        open_file = open(self.q_file_name, 'w')   #open the file for writing
-        open_file.write(str(self.Q_data))
-        open_file.close()
-
+    
     def OnFileExit(self, event):
         '''This is what will happen when you select File -> Exit in the menu bar'''
@@ -203,6 +128,6 @@
          
         
-         #create the class instance of the write_to_file class 
-         self.my_file_writer = write_to_file_short(self.orb, self)
+         #create the class instance of the display class 
+         self.my_file_writer = display_short(self.orb, self)
 
          obj_poa = self.orb.resolve_initial_references("RootPOA")
@@ -210,5 +135,5 @@
          poaManager.activate()
          obj_poa.activate_object(self.my_file_writer)
-         self.PortHandle.connectPort(self.my_file_writer._this(), "thisismyconnectionid_w2file")
+         self.PortHandle.connectPort(self.my_file_writer._this(), "thisismyconnectionid_disp")
          #orb.run()
 
@@ -221,5 +146,5 @@
     def __del__(self):
         if self.CORBA_being_used:
-            self.PortHandle.disconnectPort("thisismyconnectionid_w2file")
+            self.PortHandle.disconnectPort("thisismyconnectionid_disp")
             while (_time.time() - self.my_local_plot.end_time) < 1.5:
                 #print (time.time() - self.my_local_plot.end_time)