Changeset 7609f1a in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Mar 26, 2010 3:50:29 PM (14 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:

83ad478

Parents:

c6036f5

Message:

Added two more types of smear selections: Removed kill_focus on param box because it becomes very expensive with extensive model calculation

File:

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

sansview/perspectives/fitting/basepage.py

@@ -172 +172 @@
                       if set_focus_callback is None else set_focus_callback
             self.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
-            self.Bind(wx.EVT_KILL_FOCUS, parent._onparamEnter \
+            self.Bind(wx.EVT_KILL_FOCUS, self._silent_kill_focus \
                       if kill_focus_callback is None else kill_focus_callback)                
             self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
@@ -210 +210 @@
                     if start==end:
                         control.SetSelection(-1,-1)
-                 
+                        
+        def _silent_kill_focus(self,event):
+            """
+               do nothing to kill focus
+            """
+            event.Skip()
+            pass
+    
     def set_page_info(self, page_info):
         """
@@ -318 +325 @@
         self.event_owner = owner    
         self.state.event_owner = owner
-  
+        
     def get_data(self):
         """
             return the current data 
         """
-        return self.data
+        return self.data  
+    
     def set_manager(self, manager):
         """
@@ -664 +672 @@
             self.state.enable_smearer = copy.deepcopy(self.enable_smearer.GetValue())
             self.state.disable_smearer = copy.deepcopy(self.disable_smearer.GetValue())
-            
+
+        self.state.pinhole_smearer = copy.deepcopy(self.pinhole_smearer.GetValue())
+        self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())  
+                  
         if hasattr(self,"disp_box"):
             self.state.disp_box = self.disp_box.GetCurrentSelection()
@@ -744 +755 @@
             self.state.enable_smearer = copy.deepcopy(self.enable_smearer.GetValue())
             self.state.disable_smearer = copy.deepcopy(self.disable_smearer.GetValue())
+            
+        self.state.pinhole_smearer = copy.deepcopy(self.pinhole_smearer.GetValue())
+        self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())  
             
         if hasattr(self,"disp_box"):
@@ -897 +911 @@
             self.disable_smearer.SetValue(state.disable_smearer)
             self.onSmear(event=None)           
+        self.pinhole_smearer.SetValue(state.pinhole_smearer)
+        self.slit_smearer.SetValue(state.slit_smearer)
+        ## we have two more options for smearing
+        if self.pinhole_smearer.GetValue(): self.onPinholeSmear(event=None)
+        elif self.slit_smearer.GetValue(): self.onSlitSmear(event=None)
        
         ## reset state of checkbox,textcrtl  and dispersity parameters value
@@ -1033 +1052 @@
         """
         #flag for qmin qmax check values
-        flag =False
+        flag = True
         is_modified = False
         ##So make sure that update param values on_Fit.
@@ -1054 +1073 @@
                 if tempmax != self.qmax_x:
                     self.qmax_x = tempmax
-                flag = True
-            else:
-                flag = False
-        else:
+                if tempmax == tempmin:
+                    flag = False    
+                temp_smearer = None
+                if not self.disable_smearer.GetValue():
+                    temp_smearer= self.current_smearer
+                    if self.slit_smearer.GetValue():
+                        flag = self.update_slit_smear()
+                    elif self.pinhole_smearer.GetValue():
+                        flag = self.update_pinhole_smear()
+                    else:
+                        self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
+                                                 qmax= float(self.qmax_x))
+                elif self.data.__class__.__name__ !="Data2D":
+                    self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
+                                                 qmax= float(self.qmax_x))
+            else: flag = False
+        else: 
             flag = False
-            msg= "Cannot Fit :Must select a model!!!  "
+        
+        if not flag:
+            msg= "Cannot Fit :Must select a model or Fitting range is not valid!!!  "
             wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-        
+            
+        self.save_current_state()
         return flag                           
                
@@ -1292 +1327 @@
             temp_smear=None
             if hasattr(self, "enable_smearer"):
-                if self.enable_smearer.GetValue():
-                    temp_smear= self.smearer
+                if not self.disable_smearer.GetValue():
+                    temp_smear= self.current_smearer
             
             self.manager.draw_model(self.model, data=self.data,
@@ -1449 +1484 @@
      
         return 0
-    
-    def _onparamEnter(self,event):
+
+    #def _onparamEnter(self,event):
         """ 
-            when enter value on panel redraw model according to changed
+        #when enter value on panel redraw model according to changed
+        """
         """
         tcrtl= event.GetEventObject()
@@ -1476 +1512 @@
             #event.Skip()
             return 
-   
+       """
     def _onQrangeEnter(self, event):
         """
@@ -1599 +1635 @@
             qmin = float(qmin_ctrl.GetValue())
             qmax = float(qmax_ctrl.GetValue())
-            if qmin < qmax:
+            if qmin <= qmax:
                 #Make sure to set both colours white.  
                 qmin_ctrl.SetBackgroundColour(wx.WHITE)
@@ -1946 +1982 @@
 
         self.qmin    = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER,
-                                            kill_focus_callback = self._onQrangeEnter,
-                                            text_enter_callback = self._onQrangeEnter)
+                                            text_enter_callback = self._onparamEnter)
         self.qmin.SetValue(str(self.qmin_x))
         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
      
         self.qmax    = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER,
-                                            kill_focus_callback = self._onQrangeEnter,
-                                            text_enter_callback = self._onQrangeEnter)
+                                            text_enter_callback = self._onparamEnter)
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
@@ -2037 +2071 @@
         #On 'Reset' button  for Q range clicked
         """
+        flag = True
         if self.check_invalid_panel():
             return
@@ -2049 +2084 @@
             self.qmin_x = min(self.data.x)
             self.qmax_x = max(self.data.x)
+            # check smearing
+            if not self.disable_smearer.GetValue():
+                temp_smearer= self.current_smearer
+                ## set smearing value whether or not the data contain the smearing info
+                if self.slit_smearer.GetValue():
+                    flag = self.update_slit_smear()
+                elif self.pinhole_smearer.GetValue():
+                    flag = self.update_pinhole_smear()
+                else:
+                    flag = True
         else:
             self.qmin_x = _QMIN_DEFAULT
@@ -2055 +2100 @@
             self.state.npts = self.num_points
             
-
+        if flag == False:
+            msg= "Cannot Plot :Must enter a number!!!  "
+            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+            
+        self.save_current_state()
         self.state.qmin = self.qmin_x
         self.state.qmax = self.qmax_x