Changeset 504dd9f5 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 15, 2011 9:01:57 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

df22224

Parents:

52d3fd1

Message:

working on fit

File:

• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -931 +931 @@
         Allow to fit
         """
-        #make sure all parameter values are updated.
-        #if self.check_invalid_panel():
-        #    return
-        if self.model ==None:
-            msg="Please select a Model first..."
+        if self.data is None:
+            msg = "Please select a Data first..."
             wx.MessageBox(msg, 'Info')
             wx.PostEvent(self._manager.parent, StatusEvent(status=\
-                            "Fit: %s"%msg))
+                            "Fit: %s" % msg))
+            return
+        if self.model is None:
+            msg = "Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
+            wx.PostEvent(self._manager.parent, StatusEvent(status=\
+                            "Fit: %s" % msg))
             return
 
@@ -963 +966 @@
         self.qmax_x = float( self.qmax.GetValue())
         self._manager._reset_schedule_problem(id=self.id, value=0)
-        self._manager.schedule_for_fit(id=id,value=1,page=self,fitproblem =None) 
+        self._manager.schedule_for_fit(id=id,value=1, fitproblem =None) 
         self._manager.set_fit_range(id=self.id,qmin= self.qmin_x, 
                                    qmax= self.qmax_x)