Changeset 6f2c919 in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Jul 25, 2009 6:58:31 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

812b901

Parents:

e2da832

Message:

sansview: fixed mouse interaction with text control for partial string selection.

File:

• sansview/perspectives/fitting/modelpage.py (modified) (10 diffs)

sansview/perspectives/fitting/modelpage.py

@@ -84 +84 @@
         sizer_npts= wx.GridSizer(1, 1,5, 5)
     
-        self.npts    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.npts    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.npts.SetValue(format_number(self.num_points))
         self.npts.SetToolTipString("Number of point to plot.")
-        self.npts.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-        self.npts.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.npts.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
         
         sizer_npts.Add(wx.StaticText(self, -1, 'Npts'),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
@@ -173 +170 @@
                         ix = 1
                         value= self.model.getParam(name1)
-                        ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                        ctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                                             style=wx.TE_PROCESS_ENTER)
                         ctl1.SetValue(str (format_number(value)))
-                        ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                        ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                        ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                         self.sizer4_4.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
                         self.fittable_param.append([None,name1,ctl1,None,
@@ -185 +179 @@
                             ix =2
                             value= self.model.getParam(name2)
-                            Tctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
+                            Tctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
                                                 style=wx.TE_PROCESS_ENTER)
                             Tctl1.SetValue(str (format_number(value)))
-                            Tctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                            Tctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                            Tctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                             self.sizer4_4.Add(Tctl1, (iy,ix),(1,1),
                                                wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -198 +189 @@
                             ix =3 
                             value= self.model.getParam(name3)
-                            Tctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
+                            Tctl2 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
                                                 style=wx.TE_PROCESS_ENTER)
                             Tctl2.SetValue(str (format_number(value)))
-                            Tctl2.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                            Tctl2.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                            Tctl2.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                             self.sizer4_4.Add(Tctl2, (iy,ix),(1,1),
                                                wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -226 +214 @@
                         ix = 1
                         value= self.model.getParam(name1)
-                        ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                        ctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                                             style=wx.TE_PROCESS_ENTER)
                         ctl1.SetValue(str (format_number(value)))
-                        ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                        ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                        ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                         if not self.enable2D:
                             ctl1.Disable()
@@ -244 +229 @@
                             ix =2
                             value= self.model.getParam(name2)
-                            Tctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
+                            Tctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
                                                 style=wx.TE_PROCESS_ENTER)
                             Tctl1.SetValue(str (format_number(value)))
-                            Tctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                            Tctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                            Tctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                             if not self.enable2D:
                                 Tctl1.Disable()
@@ -263 +245 @@
                             ix =3 
                             value= self.model.getParam(name3)
-                            Tctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
+                            Tctl2 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20),
                                                 style=wx.TE_PROCESS_ENTER)
                             Tctl2.SetValue(str (format_number(value)))
-                            Tctl2.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                            Tctl2.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                            Tctl2.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                             if not self.enable2D:
                                 Tctl2.Disable()
@@ -506 +485 @@
                 ix += 1
                 value= self.model.getParam(item)
-                ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                ctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                     style=wx.TE_PROCESS_ENTER)
                 
                 ctl1.SetValue(str (format_number(value)))
-                ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                 
                 sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
@@ -537 +513 @@
                 ix += 1
                 value= self.model.getParam(item)
-                ctl1 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20),
+                ctl1 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                     style=wx.TE_PROCESS_ENTER)
                 
@@ -545 +521 @@
                 else:
                     ctl1.Enable()
-                ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-                ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                 
                 sizer.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)