Changeset acd0bda3 in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Oct 21, 2009 3:46:36 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

40d4b09

Parents:

81bece4

Message:

fixed bugs for mac: 1)crashing when changing param values, 2)textctrl was not receiving enter-key on set-value of q range.

File:

• sansview/perspectives/fitting/basepage.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -944 +944 @@
             is_modified =self._check_value_enter( self.fittable_param ,is_modified)
             is_modified =self._check_value_enter( self.fixed_param ,is_modified)
-            is_modified =self._check_value_enter( self.parameters ,is_modified)        
-            
-            self.sizer3.Layout()
-            self.Layout()
-            self.Refresh()
+            is_modified =self._check_value_enter( self.parameters ,is_modified) 
+                   
+            if is_modified:
+                self.sizer3.Layout()
+                self.Layout()
+                self.Refresh()
             # Here we should check whether the boundaries have been modified.
             # If qmin and qmax have been modified, update qmin and qmax and 
@@ -979 +980 @@
                 self.save_current_state()
                 
-                
+            self._is_modified(is_modified = is_modified) 
+               
+    def _is_modified(self, is_modified = False):
+        """
+            return to self._is_modified
+        """
+        self.is_modified = is_modified
+        return self.is_modified
+                       
     def _reset_parameters_state(self, listtorestore,statelist):
         """
@@ -1218 +1227 @@
         ##For MAC, this should defined here.
         if box_sizer == None:
-                box_description= wx.StaticBox(self, -1,str(title))
-                boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+            box_description= wx.StaticBox(self, -1,str(title))
+            boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         else:
             boxsizer1 = box_sizer
@@ -1766 +1775 @@
         #--------------------------------------------------------------
         if box_sizer == None:
-                box_description= wx.StaticBox(self, -1,str(title))
-                boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+            box_description= wx.StaticBox(self, -1,str(title))
+            boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         else:
             #for MAC
             boxsizer1 = box_sizer
 
-        self.qmin    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmin    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER)
         self.qmin.SetValue(str(self.qmin_x))
         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
@@ -1779 +1788 @@
         #self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
      
-        self.qmax    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        self.qmax    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER)
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")