Changeset 9e11cf5 in sasview

Timestamp:

Feb 14, 2015 10:25:14 AM (9 years ago)

Author:

gonzalezm

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:

827484cf

Parents:

109e50bb

Message:

Bug fix for ticket 320 - NaN errors are now displayed in the error boxes instead of making the box disappear

File:

• src/sas/perspectives/fitting/fitpage.py (modified) (8 diffs)

src/sas/perspectives/fitting/fitpage.py

@@ -1492 +1492 @@
         after fitting
         """
+
         if self.is_mac:
             return
@@ -1500 +1501 @@
             for item in self.parameters:
                 if item[0].IsShown():
-                    #Skip t ifhe angle parameters if 1D data
+                    #Skip the angle parameters if 1D data
                     if self.data.__class__.__name__ != "Data2D" and \
                             not self.enable2D:
@@ -1519 +1520 @@
             for item in self.fittable_param:
                 if item[0].IsShown():
-                    #Skip t ifhe angle parameters if 1D data
+                    #Skip the angle parameters if 1D data
                     if self.data.__class__.__name__ != "Data2D" and \
                             not self.enable2D:
@@ -2076 +2077 @@
    
         """
+        
         # make sure stop button to fit button all the time
         self._on_fit_complete()
@@ -2112 +2114 @@
         i = 0
         #Set the panel when fit result are list
+
         for item in self.param_toFit:
             if len(item) > 5 and item != None:
+
                 if item[0].IsShown():
                     ## reset error value to initial state
@@ -2144 +2148 @@
                                     item[3].Show(True)
                                     item[4].Show(True)
+                                    item[4].SetForegroundColour(wx.BLACK)
+                                item[4].SetValue(val_err)
+                                has_error = True
+                            else:
+                                val_err = 'NaN'
+                                if not self.is_mac:
+                                    item[3].Show(True)
+                                    item[4].Show(True)
+                                    item[4].SetForegroundColour(wx.RED)
                                 item[4].SetValue(val_err)
                                 has_error = True
@@ -2831 +2844 @@
            
         keys = self.model.getParamList()
-        #list of dispersion paramaters
+        
+        #list of dispersion parameters
         self.disp_list = self.model.getDispParamList()
 
@@ -2925 +2939 @@
         CHECK_STATE = self.cb1.GetValue()
         for item in keys:
+            
             if not item in self.disp_list and not item in \
                     self.model.orientation_params: