Changeset 35c9d31 in sasview

Timestamp:

Nov 13, 2009 12:12:43 PM (14 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:

c13b8cc

Parents:

c69b6d5

Message:

removed evt_left_up only for mac and added parameter value checking before fitting.

File:

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

sansview/perspectives/fitting/basepage.py

@@ -21 +21 @@
     PANEL_WIDTH = 450
     FONT_VARIANT = 0
+    ON_MAC = False
 else:
     PANEL_WIDTH = 500
     FONT_VARIANT = 1
+    ON_MAC = True
     
 class BasicPage(wx.ScrolledWindow):
@@ -171 +173 @@
             self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
                       if text_enter_callback is None else text_enter_callback)
-            self.Bind(wx.EVT_LEFT_UP,    self._highlight_text \
-                      if mouse_up_callback is None else mouse_up_callback)
+            if not ON_MAC :
+                self.Bind(wx.EVT_LEFT_UP,    self._highlight_text \
+                          if mouse_up_callback is None else mouse_up_callback)
             
         def _on_set_focus(self, event):
@@ -180 +183 @@
                 @param event: mouse event
             """
+            
             event.Skip()
             self.full_selection = True
             return self._on_set_focus_callback(event)
         
+ 
+            
         def _highlight_text(self, event):
             """
@@ -1000 +1006 @@
                 self.state_change= True
                 self._draw_model() 
-                 
+                
+    def _update_paramv_on_fit(self):
+        """
+             make sure that update param values just before the fitting
+        """
+        from sans.guiframe.utils import check_value 
+        #flag for qmin qmax check values
+        flag =False
+        is_modified = False
+        ##So make sure that update param values on_Fit.
+        #self._undo.Enable(True)
+        if self.model !=None:           
+            ##Check the values
+            self._check_value_enter( self.fittable_param ,is_modified)
+            self._check_value_enter( self.fixed_param ,is_modified)
+            self._check_value_enter( self.parameters ,is_modified) 
+
+            # If qmin and qmax have been modified, update qmin and qmax and 
+            if check_value( self.qmin, self.qmax):
+                if float(self.qmin.GetValue()) != self.qmin_x:
+                    self.qmin_x = float(self.qmin.GetValue())
+
+                if float(self.qmax.GetValue()) != self.qmax_x:
+                    self.qmax_x = float(self.qmax.GetValue())
+                flag = True
+                
+            if self.npts != None:
+                if check_float(self.npts):
+                    if float(self.npts.GetValue()) !=  self.num_points:
+                        self.num_points = float(self.npts.GetValue())
+
+        else:
+            msg= "Cannot Fit :Must select a model!!!  "
+            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+        
+        return flag                           
                
     def _is_modified(self, is_modified):
@@ -1515 +1556 @@
                     self.model.details[name][1:]= param_min,param_max
                 
-                                    
-                ## hide statictext +/-    
-                #if item[3]!=None and item[3].IsShown():
-                #    item[3].Hide()
-                ## hide textcrtl  for error after fit
-                #if item[4]!=None and item[4].IsShown():
-                #    item[4].Clear()
-                #    item[4].Hide()
-
                 value= float(item[2].GetValue())