Changeset 12eac73 in sasview

Timestamp:

Dec 15, 2009 11:24:30 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:

383eeaa

Parents:

a6931f5

Message:

fixed not updating chisqr and model-drawing due to the last changes of evt func for qmin qmax textctrls

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -962 +962 @@
                 self.state_change= True
                 self._draw_model() 
-                self._sleep4sec()
-                self.Layout()
                 self.Refresh()
         return is_modified
@@ -1483 +1481 @@
         wx.PostEvent(self.parent, event)
         self.state_change= False
-        self._sleep4sec()
-        self.Layout()
-        self.Refresh()        
+  
                    
     def _on_select_model_helper(self): 
@@ -1941 +1937 @@
         self._sleep4sec()
         self.Layout()
-        self._sleep4sec()
+        #self._sleep4sec()
         return 
     
     def _sleep4sec(self):
         """
-        sleep for 0.5 sec only on Mac
+            sleep for 1 sec only applied on Mac
+            Note: This 1sec helps for Mac not to crash on self.:ayout after self._draw_model
         """
         if ON_MAC == True:
-            time.sleep(0.5)
+            time.sleep(1)
              
     def on_reset_clicked(self,event):

sansview/perspectives/fitting/fitpage.py

@@ -726 +726 @@
         wx.PostEvent(self.parent, event)
         self.state_change= False
-        self._sleep4sec()
-        self.Layout()
-        self.Refresh()                
-
-       
+
+                    
+    def _onQrangeEnter(self, event):
+        """
+            Check validity of value enter in the Q range field
+        """
+        
+        tcrtl= event.GetEventObject()
+        #Clear msg if previously shown.
+        msg= ""
+        wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+        # Flag to register when a parameter has changed.
+        is_modified = False
+        if tcrtl.GetValue().lstrip().rstrip()!="":
+            try:
+                value = float(tcrtl.GetValue())
+                tcrtl.SetBackgroundColour(wx.WHITE)
+
+                # If qmin and qmax have been modified, update qmin and qmax
+                if check_value( 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
+                else:
+                    tcrtl.SetBackgroundColour("pink")
+                    msg= "Model Error:wrong value entered : %s"% sys.exc_value
+                    wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                    return 
+                
+            except:
+                tcrtl.SetBackgroundColour("pink")
+                msg= "Model Error:wrong value entered : %s"% sys.exc_value
+                wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                return 
+            #Check if # of points for theory model are valid(>0).
+            if self.npts != None:
+                if check_float(self.npts):
+                    temp_npts = float(self.npts.GetValue())
+                    if temp_npts !=  self.num_points:
+                        self.num_points = temp_npts
+                        is_modified = True
+                else:
+                    msg= "Cannot Plot :No npts in that Qrange!!!  "
+                    wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+           
+        else:
+           tcrtl.SetBackgroundColour("pink")
+           msg= "Model Error:wrong value entered!!!"
+           wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+        
+        self.compute_chisqr()   
+        #self._undo.Enable(True)
+        self.save_current_state()
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event)
+        self.state_change= False
+
     def _clear_Err_on_Fit(self):
         """
@@ -1013 +1068 @@
 
             self.tcChi.SetLabel(str(format_number(output)))
-           
-            self.sizer5.Layout()
+
             self.state.tcChi =self.tcChi