Changeset 269df2b in sasview for fittingview
- Timestamp:
- Oct 20, 2011 6:15:21 PM (13 years ago)
- 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
- Location:
- fittingview/src/sans/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/fitpage.py
r94078a8 r269df2b 1262 1262 try: 1263 1263 # update smearer sizer 1264 if not self.enable_smearer.GetValue(): 1265 self.disable_smearer.SetValue(True) 1264 1266 self.onSmear(None) 1265 1267 temp_smear = None … … 1968 1970 if flag: 1969 1971 #set model view button 1970 self.current_smearer = smear_selection(self.data, self.model) 1972 if not self.enable_smearer.GetValue(): 1973 self.disable_smearer.SetValue(True) 1974 self.onSmear(None) 1975 #self._set_smear(self.data) 1976 1971 1977 if self.data.__class__.__name__ == "Data2D": 1972 1978 self.enable2D = True … … 2206 2212 2207 2213 """ 2208 2209 #if self.check_invalid_panel(): 2210 # return 2211 if self.model ==None: 2214 if self.model == None: 2212 2215 self.disable_smearer.SetValue(True) 2216 if event == None: 2217 return 2213 2218 msg="Please select a Model first..." 2214 2219 wx.MessageBox(msg, 'Info') … … 2388 2393 are compute when fitting 2389 2394 """ 2390 2391 #if self.check_invalid_panel(): 2392 # return 2393 2394 if self.model ==None: 2395 if self.model == None: 2395 2396 self.disable_smearer.SetValue(True) 2396 2397 if event == None: 2398 return 2397 2399 msg="Please select a Model first..." 2398 2400 wx.MessageBox(msg, 'Info') … … 2567 2569 if self.data is None: 2568 2570 return 2569 2571 2570 2572 if self.model == None: 2571 2573 self.disable_smearer.SetValue(True) 2574 if event == None: 2575 return 2572 2576 msg="Please select a Model first..." 2573 2577 wx.MessageBox(msg, 'Info') -
fittingview/src/sans/perspectives/fitting/fitting.py
r2bb37c3 r269df2b 644 644 msg = "set_mearer requires at least data.\n" 645 645 msg += "Got data = %s .\n" % str(data) 646 raise ValueError, msg 646 return 647 #raise ValueError, msg 647 648 model = self.page_finder[uid].get_model(fid=fid) 648 649 if model is None:
Note: See TracChangeset
for help on using the changeset viewer.