Changeset 6f2c919 in sasview for sansview/perspectives/fitting/basepage.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/basepage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -116 +116 @@
         self.set_layout()
        
+    class ModelTextCtrl(wx.TextCtrl):
+        """
+            Text control for model and fit parameters.
+            Binds the appropriate events for user interactions.
+            Default callback methods can be overwritten on initialization
+            
+            @param kill_focus_callback: callback method for EVT_KILL_FOCUS event
+            @param set_focus_callback:  callback method for EVT_SET_FOCUS event
+            @param mouse_up_callback:   callback method for EVT_LEFT_UP event
+            @param text_enter_callback: callback method for EVT_TEXT_ENTER event
+        """
+        def __init__(self, parent, id=-1, value=wx.EmptyString, pos=wx.DefaultPosition, 
+                     size=wx.DefaultSize, style=0, validator=wx.DefaultValidator, name=wx.TextCtrlNameStr,
+                     kill_focus_callback = None, set_focus_callback  = None,
+                     mouse_up_callback   = None, text_enter_callback = None):
+            
+            wx.TextCtrl.__init__(self, parent, id, value, pos, size, style, validator, name)
+            
+            # Bind appropriate events
+            self.Bind(wx.EVT_SET_FOCUS,  parent.onSetFocus \
+                      if set_focus_callback is None else set_focus_callback)
+            self.Bind(wx.EVT_KILL_FOCUS, parent._onparamEnter \
+                      if kill_focus_callback is None else kill_focus_callback)
+            self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
+                      if text_enter_callback is None else text_enter_callback)
+            self.Bind(wx.EVT_LEFT_UP,    parent._highlight_text \
+                      if mouse_up_callback is None else mouse_up_callback)
        
     def onContextMenu(self, event): 
@@ -455 +482 @@
                     item[4].Hide()
         self.Layout()
-        # Get a handle to the TextCtrl
-        widget = evt.GetEventObject()
-        # Select the whole control, after this event resolves
-        wx.CallAfter(widget.SetSelection, -1,-1)
         return
     
+    def _highlight_text(self, event):
+        """
+            Highlight text of a TextCtrl only of no text has be selected
+            @param event: mouse event
+        """
+        control  = event.GetEventObject()
+        # Check that we have a TextCtrl
+        if issubclass(control.__class__, wx.TextCtrl):
+            # Check whether text has been selected, 
+            # if not, select the whole string
+
+            (start, end) = control.GetSelection()
+            if start==end:
+                control.SetSelection(-1,-1)
+                
+        # Make sure the mouse event is available to other listeners
+        event.Skip()
     
     def read_file(self, path):
@@ -1491 +1531 @@
     def _set_range_sizer(self, title, object1=None,object=None):
         """
-            Fill the 
+            TODO: object1 and object are NOT proper parameter names.
+            Please clean up your code.
         """
         self.sizer5.Clear(True)
@@ -1497 +1538 @@
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #--------------------------------------------------------------
-        self.qmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmin    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.qmin.SetValue(str(self.qmin_x))
         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
-        self.qmin.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-        self.qmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
      
-        self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmax    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
-        self.qmax.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-        self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-        self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
      
         sizer_horizontal=wx.BoxSizer(wx.HORIZONTAL)