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

Timestamp:

Oct 21, 2009 5: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/fitpage.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -595 +595 @@
         from sans.guiframe.utils import check_value
         flag = check_value( self.qmin, self.qmax) 
-        
+                
         if not flag:
             msg= "Fitting range invalid"
@@ -605 +605 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status= msg ))
             return 
+        
+            
 
         # Remove or do not allow fitting on the Q=0 point, especially when y(q=0)=None at x[0].
@@ -692 +694 @@
         tcrtl= event.GetEventObject()
         if tcrtl.GetValue().lstrip().rstrip()!="":
+
             try:
                 value = float(tcrtl.GetValue())
@@ -705 +708 @@
         self._onparamEnter_helper() 
         
-        ##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()
+        self._is_modified()
+        if self._is_modified == True:
+            ##compute chisqr for range change
             temp_smearer = None
             if self.enable_smearer.GetValue():
-                temp_smearer= self.smearer
-            
-            self.compute_chisqr(smearer= temp_smearer)
+                msg=""
+                temp_smearer= self.smearer   
+             ##Calculate chi2
+           
+            self.compute_chisqr(smearer= temp_smearer)  
             ## new state posted
             if self.state_change:
@@ -740 +724 @@
                 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!!!  "
@@ -765 +772 @@
            tcrtl.Refresh()  
         self._onparamEnter_helper() 
-        
-        ## new state posted
-        if self.state_change:
-            #self._undo.Enable(True)
-            event = PageInfoEvent(page = self)
-            wx.PostEvent(self.parent, event)
-            self.state_change= False
+
+        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