Changeset 77f6a8b in sasview for sansview/perspectives

Timestamp:

Oct 30, 2009 10:23:02 AM (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:

425ef040

Parents:

da58fcc

Message:

fixed chisqr updating

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• fitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -980 +980 @@
                 self.save_current_state()
                 
-            self._is_modified(is_modified = is_modified) 
+            self.is_modified = is_modified  
                
-    def _is_modified(self, is_modified = False):
+    def _is_modified(self):
         """
             return to self._is_modified
         """
-        self.is_modified = is_modified
         return self.is_modified
                        
@@ -1462 +1461 @@
             item=[cb state, name, value, "+/-", error of fit, min, max , units]
         """  
-        is_modified =  modified
+        self.is_modified =  modified
         if len(list)==0:
-            return is_modified
+            return self.is_modified
         for item in list:
             try:
@@ -1506 +1505 @@
                 if value != self.model.getParam(name):
                     self.model.setParam(name,value)
-                    is_modified = True   
+                    self.is_modified = True   
             
             except:
@@ -1513 +1512 @@
                 return 
         
-        return is_modified 
+        return self.is_modified 
         
  

sansview/perspectives/fitting/fitpage.py

@@ -707 +707 @@
         self._onparamEnter_helper() 
         
-        self._is_modified()
-        if self._is_modified == True:
-            ##compute chisqr for range change
+        ##compute chisqr for range change
+        temp_smearer = None
+        if self.enable_smearer.GetValue():
+            msg=""
+            temp_smearer= self.smearer   
+         ##Calculate chi2
+       
+        self.compute_chisqr(smearer= temp_smearer)  
+        ## new state posted
+        if self.state_change:
+            #self._undo.Enable(True)
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event)
+            self.state_change= False
+        
+        
+    def _onparamEnter(self,event):
+        """ 
+            when enter value on panel redraw model according to changed
+        """
+        tcrtl= event.GetEventObject()
+       
+        if check_float(tcrtl):
+            self._onparamEnter_helper()
+            
             temp_smearer = None
             if self.enable_smearer.GetValue():
-                msg=""
-                temp_smearer= self.smearer   
-             ##Calculate chi2
-           
-            self.compute_chisqr(smearer= temp_smearer)  
+                temp_smearer= self.smearer
+            
+            self.compute_chisqr(smearer= temp_smearer)
             ## new state posted
             if self.state_change:
@@ -723 +743 @@
                 wx.PostEvent(self.parent, event)
                 self.state_change= False
-        
-        
-    def _onparamEnter(self,event):
-        """ 
-            when enter value on panel redraw model according to changed
-        """
-        tcrtl= event.GetEventObject()
-       
-        if check_float(tcrtl):
-            self._onparamEnter_helper()
-            
-            if self._is_modified == True:
-                temp_smearer = None
-                if self.enable_smearer.GetValue():
-                    temp_smearer= self.smearer
-                
-                self.compute_chisqr(smearer= temp_smearer)
-                ## new state posted
-                if self.state_change:
-                    #self._undo.Enable(True)
-                    event = PageInfoEvent(page = self)
-                    wx.PostEvent(self.parent, event)
-                    self.state_change= False
         else:
             msg= "Cannot Plot :Must enter a number!!!  "
@@ -772 +769 @@
         self._onparamEnter_helper() 
 
-        if self._is_modified == True:
-            ## new state posted
-            if self.state_change:
-                #self._undo.Enable(True)
-                event = PageInfoEvent(page = self)
-                wx.PostEvent(self.parent, event)
-                self.state_change= False
+        ## new state posted
+        if self.state_change:
+            #self._undo.Enable(True)
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event)
+            self.state_change= False