Changeset 06aa2eeb in sasview for sansview/perspectives/fitting

Timestamp:

Apr 14, 2011 2:58:45 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:

69f9084

Parents:

e9875db

Message:

fixed misbehaviors of reset and chi2 value

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -2390 +2390 @@
         #    return
         ##For 3 different cases: Data2D, Data1D, and theory
-        if self.data.__class__.__name__ == "Data2D":
+        if self.model == None:
+            msg="Please select a model first..."
+            wx.MessageBox(msg, 'Info')
+            flag = False
+            return
+            
+        elif self.data.__class__.__name__ == "Data2D":
             data_min= 0
             x= max(math.fabs(self.data.xmin), math.fabs(self.data.xmax)) 
@@ -2404 +2410 @@
                 else:
                     flag = True
+                    
+        elif self.data == None:
+            self.qmin_x = _QMIN_DEFAULT
+            self.qmax_x = _QMAX_DEFAULT
+            self.num_points = _NPTS_DEFAULT            
+            self.state.npts = self.num_points
+            
         elif self.data.__class__.__name__ != "Data2D":
             self.qmin_x = min(self.data.x)
@@ -2418 +2431 @@
                     flag = True
         else:
-            self.qmin_x = _QMIN_DEFAULT
-            self.qmax_x = _QMAX_DEFAULT
-            self.num_points = _NPTS_DEFAULT            
-            self.state.npts = self.num_points
+            flag = False
             
         if flag == False:

sansview/perspectives/fitting/fitpage.py

@@ -914 +914 @@
             msg="Please select a Model first..."
             wx.MessageBox(msg, 'Info')
-            wx.PostEvent(self.manager.parent, StatusEvent(status=\
-                            "Draw model: %s"%msg))
+
             return
         flag = self._update_paramv_on_fit()         
@@ -2279 +2278 @@
         """
         try:
-            if event ==None:
+            if event == None:
+                output= "-"
+            elif not numpy.isfinite(event.output):
                 output= "-"
             else: