Changeset 269df2b in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Oct 20, 2011 6:15:21 PM (13 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:

1dbff4c

Parents:

afac721

Message:

on set data /select model reset smearer to None from custom smearer

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpage.py (modified) (5 diffs)
• fitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -1262 +1262 @@
             try:
                 # update smearer sizer
+                if not self.enable_smearer.GetValue():
+                    self.disable_smearer.SetValue(True)
                 self.onSmear(None)
                 temp_smear = None
@@ -1968 +1970 @@
         if flag:
             #set model view button
-            self.current_smearer = smear_selection(self.data, self.model)
+            if not self.enable_smearer.GetValue():
+                    self.disable_smearer.SetValue(True)
+            self.onSmear(None)
+            #self._set_smear(self.data)
+
             if self.data.__class__.__name__ == "Data2D":
                 self.enable2D = True
@@ -2206 +2212 @@
                      
         """
-
-        #if self.check_invalid_panel():
-        #    return
-        if self.model ==None:
+        if self.model == None:
             self.disable_smearer.SetValue(True)
+            if event == None:
+                return
             msg="Please select a Model first..."
             wx.MessageBox(msg, 'Info')
@@ -2388 +2393 @@
         are compute when fitting
         """
- 
-        #if self.check_invalid_panel():
-        #    return
-
-        if self.model ==None:
+        if self.model == None:
             self.disable_smearer.SetValue(True)
-            
+            if event == None:
+                return
             msg="Please select a Model first..."
             wx.MessageBox(msg, 'Info')
@@ -2567 +2569 @@
         if self.data is None:
             return
-        
+
         if self.model == None:
             self.disable_smearer.SetValue(True)
+            if event == None:
+                return
             msg="Please select a Model first..."
             wx.MessageBox(msg, 'Info')

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -644 +644 @@
                 msg = "set_mearer requires at least data.\n"
                 msg += "Got data = %s .\n" % str(data)
-                raise ValueError, msg
+                return
+                #raise ValueError, msg
             model = self.page_finder[uid].get_model(fid=fid)
             if model is None: