Changeset 729

Timestamp:

Dec 19, 2011 10:37:56 PM (12 years ago)

Author:

jemian

Message:

work-in-progress

Location:

moxy/trunk/src/moxy

Files:

• Dialog1.py (added)
• Frame1.py (modified) (3 diffs)
• Panel1.py (added)
• vc_pv.py (modified) (2 diffs)

moxy/trunk/src/moxy/Frame1.py

@@ -2 +2 @@
 
 import wx
-from wx.lib.anchors import LayoutAnchors
+import wx.lib.masked.textctrl
 import wx.lib.buttons
 
@@ -8 +8 @@
     return Frame1(parent)
 
-[wxID_FRAME1, wxID_FRAME1GENBUTTON1, wxID_FRAME1GENBUTTON2, wxID_FRAME1PANEL1, 
- wxID_FRAME1STATICBOX1, wxID_FRAME1STATICBOX2, 
-] = [wx.NewId() for _init_ctrls in range(6)]
+[wxID_FRAME1, wxID_FRAME1PANEL1, 
+] = [wx.NewId() for _init_ctrls in range(2)]
 
 class Frame1(wx.Frame):
-    def _init_coll_panelSizer_Items(self, parent):
-        # generated method, don't edit
-
-        parent.AddWindow(self.staticBox1, 1, border=2, flag=wx.EXPAND)
-        parent.AddWindow(self.staticBox2, 1, border=2, flag=wx.EXPAND)
-        parent.AddSizer(self.buttonSizer, 0, border=0, flag=wx.EXPAND)
-
-    def _init_coll_buttonSizer_Items(self, parent):
-        # generated method, don't edit
-
-        parent.AddWindow(self.genButton1, 0, border=0, flag=0)
-        parent.AddWindow(self.genButton2, 0, border=0, flag=0)
-
-    def _init_sizers(self):
-        # generated method, don't edit
-        self.panelSizer = wx.BoxSizer(orient=wx.VERTICAL)
-
-        self.buttonSizer = wx.BoxSizer(orient=wx.HORIZONTAL)
-
-        self._init_coll_panelSizer_Items(self.panelSizer)
-        self._init_coll_buttonSizer_Items(self.buttonSizer)
-
-        self.panel1.SetSizer(self.panelSizer)
 
     def _init_ctrls(self, prnt):
         # generated method, don't edit
         wx.Frame.__init__(self, id=wxID_FRAME1, name=u'Frame1', parent=prnt,
-              pos=wx.Point(349, 351), size=wx.Size(732, 439),
+              pos=wx.Point(439, 340), size=wx.Size(732, 439),
               style=wx.DEFAULT_FRAME_STYLE, title=u'Frame1')
         self.SetClientSize(wx.Size(732, 439))
@@ -48 +24 @@
               pos=wx.Point(0, 0), size=wx.Size(732, 439),
               style=wx.TAB_TRAVERSAL)
-
-        self.staticBox1 = wx.StaticBox(id=wxID_FRAME1STATICBOX1,
-              label=u'PV name and value', name='staticBox1', parent=self.panel1,
-              pos=wx.Point(0, 0), size=wx.Size(732, 204), style=0)
-        self.staticBox1.SetToolTipString(u'PV name and value')
-
-        self.staticBox2 = wx.StaticBox(id=wxID_FRAME1STATICBOX2,
-              label='staticBox2', name='staticBox2', parent=self.panel1,
-              pos=wx.Point(0, 204), size=wx.Size(732, 204), style=0)
-
-        self.genButton1 = wx.lib.buttons.GenButton(id=wxID_FRAME1GENBUTTON1,
-              label=u'Connect', name='genButton1', parent=self.panel1,
-              pos=wx.Point(0, 408), size=wx.Size(88, 31), style=0)
-
-        self.genButton2 = wx.lib.buttons.GenButton(id=wxID_FRAME1GENBUTTON2,
-              label=u'Disconnect', name='genButton2', parent=self.panel1,
-              pos=wx.Point(88, 408), size=wx.Size(88, 31), style=0)
-
-        self._init_sizers()
 
     def __init__(self, parent):

moxy/trunk/src/moxy/vc_pv.py

@@ -27 +27 @@
 # - - - - - - - - - - - - - - - - - - Global
 
+
 __svnid__ = "$Id$"
 
@@ -43 +44 @@
         
         self._init_widgets()
-        self._place_widgets()
+        self._init_sizers()
 
     def _init_widgets(self):
         self.panel = wx.Panel(id=wx.ID_ANY, name='panel1', parent=self)
 
-        self.staticBox1 = wx.StaticBox(id=wx.ID_ANY,
-              label=u'PV name and value', name='staticBox1', parent=self.panel, size=wx.Size(300, 100),)
-        self.staticBox1.SetToolTipString(u'PV name and value')
+        #self.sbTop = wx.StaticBox(id=wx.ID_ANY,
+        #      label=u'PV name and value', name='sbTop', parent=self.panel, size=wx.Size(300, 100),)
+        #self.sbTop.SetToolTipString(u'PV name and value')
 
-        self.staticBox2 = wx.StaticBox(id=wx.ID_ANY,
-              label='staticBox2', name='staticBox2', parent=self.panel, size=wx.Size(300, 100),)
-        self.staticBox2.SetToolTipString(u'connection info')
+        #self.sbBottom = wx.StaticBox(id=wx.ID_ANY,
+        #      label='connection info', name='sbBottom', parent=self.panel, size=wx.Size(300, 100),)
+        #self.sbBottom.SetToolTipString(u'EPICS connection info')
 
         self.genButton1 = wx.lib.buttons.GenButton(id=wx.ID_ANY,
-              label=u'Connect', name='genButton1', parent=self.panel,)
+              label=u'Connect', name='connectButton', parent=self.panel,)
+        self.genButton1.SetToolTipString(u'Connect with EPICS PV')
+        self.genButton1.Bind(wx.EVT_BUTTON, self.doConnectButton)
 
         self.genButton2 = wx.lib.buttons.GenButton(id=wx.ID_ANY,
-              label=u'Disconnect', name='genButton2', parent=self.panel,)
+              label=u'Disconnect', name='disconnectButton', parent=self.panel,)
+        self.genButton2.SetToolTipString(u'Disconnect from EPICS PV')
+        self.genButton2.Bind(wx.EVT_BUTTON, self.doDisconnectButton)
+        
+        # wx.StaticBoxSizer( wx.StaticBox( parent_window, id, "label" ), wx.HORIZONTAL )
     
-    def _place_widgets(self):
+    def _init_sizers(self):
         self.panelSizer = wx.BoxSizer(orient=wx.VERTICAL)
         self.panel.SetSizer(self.panelSizer)
-        self.panelSizer.AddWindow(self.staticBox1, proportion=1, border=0, flag=wx.EXPAND)
-        self.panelSizer.AddWindow(self.staticBox2, proportion=1, border=0, flag=wx.EXPAND)
+        #self.panelSizer.AddWindow(self.sbTop, proportion=1, border=0, flag=wx.EXPAND)
+        #self.panelSizer.AddWindow(self.sbBottom, proportion=1, border=0, flag=wx.EXPAND)
         self.buttonSizer = wx.BoxSizer(orient=wx.HORIZONTAL)
         self.panelSizer.AddSizer(self.buttonSizer, 0, border=0, flag=wx.EXPAND)
         self.buttonSizer.AddWindow(self.genButton1, proportion=1, border=0, flag=wx.EXPAND)
         self.buttonSizer.AddWindow(self.genButton2, proportion=1, border=0, flag=wx.EXPAND)
+        
+        #self.sbTopSizer = wx.StaticBoxSizer(self.sbTop, wx.VERTICAL)
+        #self.sbBottomSizer = wx.StaticBoxSizer(self.sbBottom, wx.VERTICAL )
+        
+    def _example_(self, parent):
+        '''
+        StaticBoxSizer example
+        
+        create the control items,
+        defines self.motorList dictionary,
+        returns FlexGridSizer object
+        '''
+        sbox = wx.StaticBox(parent, id=wx.ID_ANY,
+              label='watch EPICS motors', style=0)
+        sbs = wx.StaticBoxSizer(sbox, wx.VERTICAL)
+        fgs = wx.FlexGridSizer(rows=4, cols=3, hgap=4, vgap=4)
+
+        # column labels
+        for item in self.AXIS_LABELS:
+            fgs.Add(
+                 wx.StaticText(parent, wx.ID_ANY, item),
+                 0, flag=wx.EXPAND)
+        # one motor axis per row
+        self.motorList = {}
+        for axis in self.AXIS_NAMES:
+            fgs.Add(
+                 wx.StaticText(parent, wx.ID_ANY, axis, style=wx.ALIGN_RIGHT),
+                 0, flag=wx.EXPAND)
+            D = {}
+            for field in self.AXIS_FIELDS:
+                text = '[%s].%s' % (axis, field)
+                widget = wx.TextCtrl(parent, wx.ID_ANY, text, style=wx.TE_READONLY|wx.ALIGN_RIGHT)
+                widget.SetBackgroundColour(self.NOT_MOVING_COLOR)
+                widget.SetToolTipString("motor,%s,%s" % (axis, field))
+                widget.SetFont(self.basicFont)
+                fgs.Add(widget, 0, flag=wx.EXPAND)
+                D[field] = widget
+            self.motorList[axis] = D
+
+        fgs.AddGrowableCol(1)
+        fgs.AddGrowableCol(2)
+
+        sbs.Add(fgs, 0, wx.EXPAND|wx.ALIGN_CENTRE|wx.ALL, 5)
+
+        return sbs
+
+    def doConnectButton(self, event):
+        event.Skip()
+        print "Connect button pressed"
+
+    def doDisconnectButton(self, event):
+        event.Skip()
+        print "Disconnect button pressed"