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

Timestamp:

Nov 9, 2009 3:10:00 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:

ffb838f

Parents:

e2f7b92

Message:

fixed bug on bookmark not recalling errors of param values

File:

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

sansview/perspectives/fitting/basepage.py

@@ -997 +997 @@
                 self.state_change= True
                 self._draw_model() 
-                self.save_current_state() 
+                 
                
     def _is_modified(self, is_modified):
@@ -1489 +1489 @@
                     if hasattr(self,"item[4]")and self.item[4] == None:
                         self.text2_3.Hide()
-                ## check model parameters range
-                ## check minimun value
+                        
+                ## check model parameters range             
                 param_min= None
                 param_max= None
-
+                ## check minimun value
                 if item[5]!= None:
                     if item[5].GetValue().lstrip().rstrip()!="":
                         param_min = float(item[5].GetValue())
+                        is_modified = True
                 ## check maximum value
                 if item[6]!= None:
                     if item[6].GetValue().lstrip().rstrip()!="":
                         param_max = float(item[6].GetValue())
-                        
+                        is_modified = True
                 from sans.guiframe.utils import check_value
                 if param_min != None and param_max !=None:
@@ -1510 +1511 @@
                 if name in self.model.details.keys():   
                     self.model.details[name][1:]= param_min,param_max
+                
                                     
                 ## hide statictext +/-    
@@ -1520 +1522 @@
 
                 value= float(item[2].GetValue())
-                #print "val", value,self.model.getParam(name)
+
                 # If the value of the parameter has changed,
                 # +update the model and set the is_modified flag
@@ -1549 +1551 @@
             self.disp_box.Hide()
             self.sizer4_4.Clear(True)
-      
             return
 
@@ -1579 +1580 @@
         self._draw_model()
         #self.sizer4_4.Layout()
-        #self.sizer4.Layout()
+        #self.sizer5.Layout()
         self.Layout()
         #self.Refresh()
@@ -1643 +1644 @@
                    self.model.set_dispersion(p, disp_model)
                 except:
+
                     pass
                 # Redraw the model
@@ -1652 +1654 @@
         self.Layout()
         #self.SetScrollbars(20,20,25,65)    
-        #self.Refresh()
+        self.Refresh()