Changeset 743 for moxy/trunk/src

Timestamp:

Dec 26, 2011 1:21:12 AM (13 years ago)

Author:

jemian

Message:

now working on axis configure dialog

Location:

moxy/trunk/src/moxy

Files:

• vc_axis.py (modified) (6 diffs)
• vc_axis_configure.py (added)
• vc_pv.py (modified) (2 diffs)

moxy/trunk/src/moxy/vc_axis.py ¶

@@ -25 +25 @@
 from m_pv import PvConnection
 from m_axis import SingleAxis
+from vc_axis_configure import AxisConfigure_Dialog
 
 
@@ -58 +59 @@
 
     def OnExit(self):
-        print "OnExit", self.axis
+        #print "OnExit", self.axis
         self.axis.disconnect()
 
@@ -67 +68 @@
     '''
     def __init__(self, parent, axis): #@ReservedAssignment
-        wx.Frame.__init__(self, parent, wx.ID_ANY, 'DemoView', size=(200,300))
+        self.axis = axis
+        wx.Frame.__init__(self, parent, wx.ID_ANY, 'DemoView', size=(240,300))
         self.SetToolTipString(u'Single Axis DemoFrame')
         self.panel = SingleAxisPanel(parent=self, axis=axis)
@@ -79 +81 @@
         dlg.Destroy()
         if result == wx.ID_OK:
-            # TODO: here is where to disconnect() the PVs, need "axis" above
-                        # see: http://wiki.wxpython.org/wxPython%20by%20Example
-                        # see: http://docs.wxwidgets.org/stable/wx_wxdialog.html
+            self.axis.disconnect()
             self.Destroy()
 
@@ -98 +98 @@
         self.connected = False
         self.show_buttons = show_buttons
+        self.parent = parent
 
         wx.Panel.__init__(self, id=wx.ID_ANY, parent=parent)
@@ -229 +230 @@
     def doConfigureButton(self, event):
         '''run dialog to configure the EPICS PVs of this axis'''
-        print "Configure pressed - feature not enabled yet"    # TODO: unfinished
+        modal = AxisConfigure_Dialog(self.parent, self.axis)
+        modal.ShowModal()
+        modal.Destroy()
 
     def doConnnectButton(self, event):

moxy/trunk/src/moxy/vc_pv.py ¶

@@ -63 +63 @@
         
         self._init_widgets()
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
 
     def _init_widgets(self):
@@ -234 +235 @@
             wx.CallAfter(self.w_value.SetBackgroundColour, color)
 
+    def OnClose(self, event):
+        dlg = wx.MessageDialog(self, 
+            "Do you really want to close this application?",
+            "Confirm Exit", wx.OK|wx.CANCEL|wx.ICON_QUESTION)
+        result = dlg.ShowModal()
+        dlg.Destroy()
+        if result == wx.ID_OK:
+            if self.pv is not None:
+                self.pv.disconnect()
+            self.Destroy()
+