Changeset 6e9976b in sasview for sansview/perspectives/fitting

Timestamp:

Dec 14, 2009 2:22:12 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:

d67fc8d

Parents:

fe9c19b4

Message:

Changed font size for linux to normal size and fixed setbackgroundcolor bug in textctrls

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (6 diffs)
• fitpage.py (modified) (1 diff)
• simfitpage.py (modified) (2 diffs)
• sldPanel.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -19 +19 @@
 _NPTS_DEFAULT = 50
 #Control panel width 
-if sys.platform.count("win32")>0:
+if sys.platform.count("darwin")==0:
     PANEL_WIDTH = 450
     FONT_VARIANT = 0
@@ -1420 +1420 @@
             
             self._onparamEnter_helper()
-            event.Skip()
+            #event.Skip()
         else:
             msg= "Cannot Plot :Must enter a number!!!  "
             wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-            event.Skip()
+            #event.Skip()
             return 
    
-   
+    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._undo.Enable(True)
+        self.save_current_state()
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event)
+        self.state_change= False
+        self._sleep4sec()
+        self.Layout()
+        self.Refresh()        
+                   
     def _on_select_model_helper(self): 
         """
@@ -1504 +1563 @@
                             
                             param_min = float(item[5].GetValue())
-                            if check_value(item[2],item[5]):
+                            if not check_value(item[5],item[2]):
                                 if numpy.isfinite(param_min):
                                     item[2].SetValue(format_number(param_min))
-                            item[2].SetBackgroundColour(wx.WHITE)        
+                            
+                            item[5].SetBackgroundColour(wx.WHITE)
+                            item[2].SetBackgroundColour(wx.WHITE)
+                                           
                         except:
                             msg = "Wrong Fit parameter range entered "
@@ -1518 +1580 @@
                         try:                          
                             param_max = float(item[6].GetValue())
-                            if check_value(item[6],item[2]):
+                            if not check_value(item[2],item[6]):
                                 if numpy.isfinite(param_max):
                                     item[2].SetValue(format_number(param_max))  
-                            item[2].SetBackgroundColour(wx.WHITE)               
+                            
+                            item[6].SetBackgroundColour(wx.WHITE)
+                            item[2].SetBackgroundColour(wx.WHITE)
                         except:
                             msg = "Wrong Fit parameter range entered "
@@ -1542 +1606 @@
                         self.model.details [name] = ["",param_min,param_max] 
                         is_modified = True
+            try:     
+                value= float(item[2].GetValue())
+      
+                # If the value of the parameter has changed,
+                # +update the model and set the is_modified flag
+                if value != self.model.getParam(name) and numpy.isfinite(value):
+                    self.model.setParam(name,value)
+                    is_modified = True   
+            except:
+                msg = "Wrong Fit parameter value entered "
+                wx.PostEvent(self.parent.parent, StatusEvent(status = msg))
                 
-            value= float(item[2].GetValue())
-  
-            # If the value of the parameter has changed,
-            # +update the model and set the is_modified flag
-            if value != self.model.getParam(name) and numpy.isfinite(value):
-                self.model.setParam(name,value)
-                is_modified = True   
-
         return is_modified 
         
@@ -1797 +1864 @@
             boxsizer1 = box_sizer
 
-        self.qmin    = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER)
+        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)
         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)
+        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)
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")

sansview/perspectives/fitting/fitpage.py

@@ -728 +728 @@
         self._sleep4sec()
         self.Layout()
-        #self.Refresh()                
+        self.Refresh()                
 
        

sansview/perspectives/fitting/simfitpage.py

@@ -5 +5 @@
    
 #Control panel width 
-if sys.platform.count("win32")>0:
+if sys.platform.count("darwin")==0:
     PANEL_WID = 420
     FONT_VARIANT = 0
@@ -437 +437 @@
         
         
-        self.sizer2.Layout()
+        #self.sizer2.Layout()
         self.SetScrollbars(20,20,25,65)
         

sansview/perspectives/fitting/sldPanel.py

@@ -16 +16 @@
 
 #SLD panel size 
-if sys.platform.count("win32")>0:
+if sys.platform.count("darwin")==0:
     _STATICBOX_WIDTH = 350
     PANEL_SIZE = 400