Changeset 885857e in sasview

Timestamp:

Jan 11, 2010 12:39:38 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:

6939bd4

Parents:

f9a1279

Message:

fixed a bug; not properly updating 2D plot, and removed some fitting stuffs from checkvalue_enter

File:

• theoryview/perspectives/theory/basepage.py (modified) (5 diffs)

theoryview/perspectives/theory/basepage.py

@@ -508 +508 @@
 
         self.state.model.name= self.model.name
-        
-        #Remember fit engine_type for fit panel
-        if self.engine_type == None: 
-            self.engine_type = "scipy"
-        if self.manager !=None:
-            self.manager._on_change_engine(engine=self.engine_type)
-        
-            self.state.engine_type = self.engine_type
 
         new_state = self.state.clone()
@@ -940 +932 @@
                 pass
             #if is_modified:
-
             # Here we should check whether the boundaries have been modified.
             # If qmin and qmax have been modified, update qmin and qmax and 
@@ -973 +964 @@
                 self.Refresh()
         return is_modified
-    
-    def _update_paramv_on_fit(self):
-        """
-             make sure that update param values just before the fitting
-        """
-        #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 
-             # Here we should check whether the boundaries have been modified.
-            # If qmin and qmax have been modified, update qmin and qmax and 
-            # set the is_modified flag to True
-            if self._validate_qrange(self.qmin, self.qmax):
-                tempmin = float(self.qmin.GetValue())
-                if tempmin != self.qmin_x:
-                    self.qmin_x = tempmin
-                tempmax = float(self.qmax.GetValue())
-                if tempmax != self.qmax_x:
-                    self.qmax_x = tempmax
-                flag = True
-            else:
-                flag = False
-        else:
-            flag = False
-            msg= "Cannot Fit :Must select a model!!!  "
-            wx.PostEvent(self.parent, StatusEvent(status = msg ))
-        
-        return flag                           
+                      
                
     def _is_modified(self, is_modified):
@@ -1585 +1541 @@
         for item in list:
             #skip angle parameters for 1D
-            if self.data.__class__.__name__ !="Data2D":
+            if not self.enable2D:
                 if item in self.orientation_params:
                     continue
             #try:
             name = str(item[1])
-            
-            if string.find(name,".npts") ==-1 and string.find(name,".nsigmas")==-1:      
-                ## check model parameters range             
-                param_min= None
-                param_max= None
-               
-                ## check minimun value
-                if item[5]!= None and item[5]!= "":
-                    if item[5].GetValue().lstrip().rstrip()!="":
-                        try:
-                            
-                            param_min = float(item[5].GetValue())
-                            if not self._validate_qrange(item[5],item[2]):
-                                if numpy.isfinite(param_min):
-                                    item[2].SetValue(format_number(param_min))
-                            
-                            item[5].SetBackgroundColour(wx.WHITE)
-                            item[2].SetBackgroundColour(wx.WHITE)
-                                           
-                        except:
-                            msg = "Wrong Fit parameter range entered "
-                            wx.PostEvent(self.parent, StatusEvent(status = msg))
-                            raise ValueError, msg
-                        is_modified = True
-                ## check maximum value
-                if item[6]!= None and item[6]!= "":
-                    if item[6].GetValue().lstrip().rstrip()!="":
-                        try:                          
-                            param_max = float(item[6].GetValue())
-                            if not self._validate_qrange(item[2],item[6]):
-                                if numpy.isfinite(param_max):
-                                    item[2].SetValue(format_number(param_max))  
-                            
-                            item[6].SetBackgroundColour(wx.WHITE)
-                            item[2].SetBackgroundColour(wx.WHITE)
-                        except:
-                            msg = "Wrong Fit parameter range entered "
-                            wx.PostEvent(self.parent, StatusEvent(status = msg))
-                            raise ValueError, msg
-                        is_modified = True
-                
-
-                if param_min != None and param_max !=None:
-                    if not self._validate_qrange(item[5], item[6]):
-                        msg= "Wrong Fit range entered for parameter "
-                        msg+= "name %s of model %s "%(name, self.model.name)
-                        wx.PostEvent(self.parent, StatusEvent(status = msg))
-                
-                if name in self.model.details.keys():   
-                        self.model.details[name][1:3]= param_min,param_max
-                        is_modified = True
-              
-                else:
-                        self.model.details [name] = ["",param_min,param_max] 
-                        is_modified = True
+
             try:     
                 value= float(item[2].GetValue())
-      
                 # If the value of the parameter has changed,
                 # +update the model and set the is_modified flag
@@ -1654 +1555 @@
                     is_modified = True   
             except:
-                msg = "Wrong Fit parameter value entered "
+                msg = "Wrong parameter value entered "
                 wx.PostEvent(self.parent, StatusEvent(status = msg))